SMHE-1748 SF jw to shared

fix merge conflicts

Signed-off-by: Natasja Nortier <natasja.nortier@alliander.com>

Author: natasja-n

integration-tests/cucumber-tests-platform-smartmetering/src/test/java/org/opensmartgridplatform/cucumber/platform/smartmetering/AcceptanceTests.java

@@ -16,7 +16,7 @@
       "classpath:features/osgp-adapter-ws-core",
       "classpath:features/osgp-adapter-ws-smartmetering"
     },
-    tags = {"@blahgxf"},
+    tags = {"not @Skip", "not @NightlyBuildOnly"},
     glue = {
       "classpath:org.opensmartgridplatform.cucumber.platform.glue",
       "classpath:org.opensmartgridplatform.cucumber.platform.common.glue",

osgp/shared/osgp-jasper-interface-shared/pom.xml

@@ -6,7 +6,7 @@
   <parent>
       <groupId>org.opensmartgridplatform</groupId>
       <artifactId>parent-shared</artifactId>
-      <version>5.48.0-SNAPSHOT</version>
+      <version>5.49.0-SNAPSHOT</version>
       <relativePath>../parent-shared/pom.xml</relativePath>
   </parent>
 

osgp/shared/pom.xml

@@ -11,15 +11,8 @@ SPDX-License-Identifier: Apache-2.0
 
   <groupId>org.opensmartgridplatform</groupId>
   <artifactId>shared-components</artifactId>
-  <version>5.48.0-SNAPSHOT</version>
-  <dependencies>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <version>1.18.24</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
+  <version>5.49.0-SNAPSHOT</version>
+
   <packaging>pom</packaging>
   <name>shared</name>
   <properties>