Merge branch 'master' into solxget/java_17_test

# Conflicts: # pom.xml # provider/notification-azure/pom.xml # provider/notification-gc/pom.xml # testing/notification-test-azure/pom.xml # testing/notification-test-core/pom.xml

Merge branch 'master' into solxget/java_17_test
3cdc2d76 · Rustam Lotsmanenko (EPAM) · de697c5d · e52e9cbb · 3cdc2d76 · 3cdc2d76
Commit 3cdc2d76 authored 1 year ago by Rustam Lotsmanenko (EPAM)
--- a/notification-core/pom.xml
+++ b/notification-core/pom.xml
@@ -19,7 +19,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.opengroup.osdu</groupId>
    <artifactId>notification-core</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.25.0-SNAPSHOT</version>
    <name>notification-core</name>
    <description>Core module for the notification service</description>
    <packaging>jar</packaging>
@@ -27,7 +27,7 @@
    <parent>
 		<groupId>org.opengroup.osdu</groupId>
 		<artifactId>os-notification</artifactId>
-		<version>0.24.0-SNAPSHOT</version>
+		<version>0.25.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>


--- a/pom.xml
+++ b/pom.xml
@@ -18,14 +18,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.opengroup.osdu</groupId>
 	<artifactId>os-notification</artifactId>
-	<version>0.24.0-SNAPSHOT</version>
+	<version>0.25.0-SNAPSHOT</version>
 	<description>Root Notification Service project</description>

 	<properties>
 		<java.version>17</java.version>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
-		<os-core-common.version>0.24.0-rc6</os-core-common.version>
+		<os-core-common.version>0.23.3</os-core-common.version>
 		<log4j2.version>2.17.1</log4j2.version>
 		<json-smart.version>2.4.7</json-smart.version>
 		<openapi.version>1.6.14</openapi.version>

--- a/provider/notification-aws/pom.xml
+++ b/provider/notification-aws/pom.xml
@@ -19,7 +19,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.opengroup.osdu</groupId>
    <artifactId>notification-aws</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.25.0-SNAPSHOT</version>
    <name>notification-aws</name>
    <description>AWS implementation for Notification service</description>
    <packaging>jar</packaging>
@@ -27,7 +27,7 @@
    <parent>
        <groupId>org.opengroup.osdu</groupId>
        <artifactId>os-notification</artifactId>
-        <version>0.24.0-SNAPSHOT</version>
+        <version>0.25.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -76,7 +76,7 @@
        <dependency>
            <groupId>org.opengroup.osdu.core.aws</groupId>
            <artifactId>os-core-lib-aws</artifactId>
-            <version>0.24.0-SNAPSHOT</version>
+            <version>0.24.0</version>
        </dependency>
        <dependency>
            <groupId>commons-io</groupId>
@@ -95,7 +95,7 @@
        <dependency>
            <groupId>org.opengroup.osdu</groupId>
            <artifactId>notification-core</artifactId>
-            <version>0.24.0-SNAPSHOT</version>
+            <version>0.25.0-SNAPSHOT</version>
        </dependency>

        <dependency>

--- a/provider/notification-azure/pom.xml
+++ b/provider/notification-azure/pom.xml
@@ -18,7 +18,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>notification-azure</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.25.0-SNAPSHOT</version>
    <name>notification-azure</name>
    <description>Azure implementation for Notification service</description>
    <packaging>jar</packaging>
@@ -26,7 +26,7 @@
  <parent>
    <groupId>org.opengroup.osdu</groupId>
    <artifactId>os-notification</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.25.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

@@ -35,12 +35,12 @@
    <maven.compiler.target>${java.version}</maven.compiler.target>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
-    <osdu.notification-core.version>0.24.0-SNAPSHOT</osdu.notification-core.version>
+    <osdu.notification-core.version>0.25.0-SNAPSHOT</osdu.notification-core.version>
    <springframework.version>4.3.0.RELEASE</springframework.version>
    <reactor.netty.version>0.11.0.RELEASE</reactor.netty.version>
    <reactor.core.version>3.3.0.RELEASE</reactor.core.version>
-    <osdu.corelibazure.version>0.21.0</osdu.corelibazure.version>
-    <osdu.oscorecommon.version>0.24.0-rc6</osdu.oscorecommon.version>
+    <osdu.corelibazure.version>0.23.2</osdu.corelibazure.version>
+    <osdu.oscorecommon.version>0.23.3</osdu.oscorecommon.version>
    <junit.version>5.6.0</junit.version>
    <jjwt.version>3.8.1</jjwt.version>
    <mockito.version>2.23.0</mockito.version>
@@ -326,7 +326,6 @@
          </reportSet>
        </reportSets>
      </plugin>
-
    </plugins>
  </reporting>
 </project>
--- a/provider/notification-gc/pom.xml
+++ b/provider/notification-gc/pom.xml
@@ -17,7 +17,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>notification-gc</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.25.0-SNAPSHOT</version>
    <name>notification-gc</name>
    <description>Google Cloud implementation for Notification service</description>
    <packaging>jar</packaging>
@@ -25,7 +25,7 @@
    <parent>
        <groupId>org.opengroup.osdu</groupId>
        <artifactId>os-notification</artifactId>
-        <version>0.24.0-SNAPSHOT</version>
+        <version>0.25.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -51,13 +51,19 @@
    <dependencies>
        <dependency>
            <groupId>org.opengroup.osdu</groupId>
-            <artifactId>core-lib-gc</artifactId>
+            <artifactId>os-core-common</artifactId>
            <version>0.21.0</version>
        </dependency>
+        <dependency>
+            <groupId>org.opengroup.osdu</groupId>
+            <artifactId>core-lib-gc</artifactId>
+            <version>0.23.1</version>
+        </dependency>
+
        <dependency>
            <groupId>org.opengroup.osdu</groupId>
            <artifactId>notification-core</artifactId>
-            <version>0.24.0-SNAPSHOT</version>
+            <version>0.25.0-SNAPSHOT</version>
            <exclusions>
                <exclusion>
                    <groupId>com.google.apis</groupId>
@@ -104,7 +110,7 @@
        <dependency>
            <groupId>org.opengroup.osdu</groupId>
            <artifactId>oqm</artifactId>
-            <version>0.21.0</version>
+            <version>0.23.0</version>
        </dependency>
    </dependencies>


--- a/provider/notification-ibm/pom.xml
+++ b/provider/notification-ibm/pom.xml
@@ -16,7 +16,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.opengroup.osdu</groupId>
    <artifactId>notification-ibm</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.25.0-SNAPSHOT</version>
    <name>notification-ibm</name>
    <description>IBM implementation for Notification service</description>
    <packaging>jar</packaging>
@@ -24,7 +24,7 @@
    <parent>
        <groupId>org.opengroup.osdu</groupId>
        <artifactId>os-notification</artifactId>
-        <version>0.24.0-SNAPSHOT</version>
+        <version>0.25.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -61,7 +61,7 @@
        <dependency>
            <groupId>org.opengroup.osdu</groupId>
            <artifactId>os-core-lib-ibm</artifactId>
-            <version>0.16.0-rc1</version>
+            <version>0.23.0</version>
            <exclusions>
            	<exclusion>
            		<groupId>org.apache.lucene</groupId>
@@ -114,7 +114,7 @@
        <dependency>
            <groupId>org.opengroup.osdu</groupId>
            <artifactId>notification-core</artifactId>
-            <version>0.24.0-SNAPSHOT</version>
+            <version>0.25.0-SNAPSHOT</version>
            <exclusions>
            	<exclusion>
            		<groupId>io.netty</groupId>

--- a/testing/notification-test-aws/pom.xml
+++ b/testing/notification-test-aws/pom.xml
@@ -21,13 +21,13 @@
    <parent>
        <groupId>org.opengroup.osdu</groupId>
        <artifactId>os-notification-testing</artifactId>
-        <version>0.24.0-SNAPSHOT</version>
+        <version>0.25.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <groupId>org.opengroup.osdu</groupId>
    <artifactId>notification-test-aws</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.25.0-SNAPSHOT</version>
    <name>notification-test-aws</name>
    <description>AWS Integration tests for Notification Service</description>
    <packaging>jar</packaging>
@@ -54,12 +54,12 @@
        <dependency>
            <groupId>org.opengroup.osdu.notification</groupId>
            <artifactId>notification-test-core</artifactId>
-            <version>0.24.0-SNAPSHOT</version>
+            <version>0.25.0-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.opengroup.osdu</groupId>
            <artifactId>os-core-common</artifactId>
-            <version>0.22.0-rc4</version>
+            <version>0.23.3</version>
        </dependency>

        <dependency>

--- a/testing/notification-test-azure/pom.xml
+++ b/testing/notification-test-azure/pom.xml
@@ -21,13 +21,13 @@
    <parent>
        <groupId>org.opengroup.osdu</groupId>
        <artifactId>os-notification-testing</artifactId>
-        <version>0.24.0-SNAPSHOT</version>
+        <version>0.25.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <groupId>org.opengroup.osdu</groupId>
    <artifactId>notification-test-azure</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.25.0-SNAPSHOT</version>
    <name>notification-test-azure</name>
    <description>Integration tests Azure for notification</description>
    <packaging>jar</packaging>
@@ -42,13 +42,13 @@
        <dependency>
            <groupId>org.opengroup.osdu.notification</groupId>
            <artifactId>notification-test-core</artifactId>
-            <version>0.24.0-SNAPSHOT</version>
+            <version>0.25.0-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>org.opengroup.osdu</groupId>
            <artifactId>core-lib-azure</artifactId>
-            <version>0.12.0-rc10</version>
+            <version>0.23.2</version>
            <exclusions>

                <exclusion>
@@ -64,23 +64,23 @@
        <dependency>
            <groupId>io.netty</groupId>
            <artifactId>netty-all</artifactId>
-            <version>4.1.50.Final</version>
-        </dependency> 
-	    <dependency>
-	      <groupId>org.projectlombok</groupId>
-	      <artifactId>lombok</artifactId>
-	      <version>1.18.26</version>
-	      <optional>true</optional>
-	    </dependency>
+            <version>4.1.90.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.26</version>
+            <optional>true</optional>
+        </dependency>
        <dependency>
            <groupId>io.netty</groupId>
            <artifactId>netty-transport</artifactId>
-            <version>4.1.15.Final</version>
+            <version>4.1.90.Final</version>
        </dependency>
        <dependency>
            <groupId>com.azure</groupId>
            <artifactId>azure-core-http-netty</artifactId>
-            <version>1.2.0</version>
+            <version>1.13.1</version>
        </dependency>
        <dependency>
            <groupId>junit</groupId>

--- a/testing/notification-test-baremetal/pom.xml
+++ b/testing/notification-test-baremetal/pom.xml
@@ -21,12 +21,12 @@
    <parent>
        <groupId>org.opengroup.osdu</groupId>
        <artifactId>os-notification-testing</artifactId>
-        <version>0.24.0-SNAPSHOT</version>
+        <version>0.25.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <artifactId>notification-test-baremetal</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.25.0-SNAPSHOT</version>
    <name>notification-test-baremetal</name>
    <description>Integration tests Baremetal for notification</description>
    <packaging>jar</packaging>
@@ -41,12 +41,12 @@
        <dependency>
            <groupId>org.opengroup.osdu.notification</groupId>
            <artifactId>notification-test-core</artifactId>
-            <version>0.24.0-SNAPSHOT</version>
+            <version>0.25.0-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.opengroup.osdu</groupId>
            <artifactId>os-core-common</artifactId>
-            <version>0.3.6</version>
+            <version>0.23.3</version>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>

--- a/testing/notification-test-core/pom.xml
+++ b/testing/notification-test-core/pom.xml
@@ -21,13 +21,13 @@
    <parent>
        <groupId>org.opengroup.osdu</groupId>
        <artifactId>os-notification-testing</artifactId>
-        <version>0.24.0-SNAPSHOT</version>
+        <version>0.25.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <groupId>org.opengroup.osdu.notification</groupId>
    <artifactId>notification-test-core</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.25.0-SNAPSHOT</version>
    <name>notification-test-core</name>
    <description>Integration tests core for notification</description>
    <packaging>jar</packaging>
@@ -61,7 +61,7 @@
        <dependency>
            <groupId>org.opengroup.osdu</groupId>
            <artifactId>os-core-common</artifactId>
-            <version>0.23.0-rc1</version>
+            <version>0.23.3</version>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>

--- a/testing/notification-test-gc/pom.xml
+++ b/testing/notification-test-gc/pom.xml
@@ -21,12 +21,12 @@
    <parent>
        <groupId>org.opengroup.osdu</groupId>
        <artifactId>os-notification-testing</artifactId>
-        <version>0.24.0-SNAPSHOT</version>
+        <version>0.25.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <artifactId>notification-test-gc</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.25.0-SNAPSHOT</version>
    <name>notification-test-gc</name>
    <description>Integration tests Google Cloud for notification</description>
    <packaging>jar</packaging>
@@ -41,12 +41,12 @@
        <dependency>
            <groupId>org.opengroup.osdu.notification</groupId>
            <artifactId>notification-test-core</artifactId>
-            <version>0.24.0-SNAPSHOT</version>
+            <version>0.25.0-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.opengroup.osdu</groupId>
            <artifactId>os-core-common</artifactId>
-            <version>0.3.6</version>
+            <version>0.23.3</version>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>

--- a/testing/notification-test-ibm/pom.xml
+++ b/testing/notification-test-ibm/pom.xml
@@ -18,13 +18,13 @@
    <parent>
        <groupId>org.opengroup.osdu</groupId>
        <artifactId>os-notification-testing</artifactId>
-        <version>0.24.0-SNAPSHOT</version>
+        <version>0.25.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <groupId>org.opengroup.osdu</groupId>
    <artifactId>notification-test-ibm</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.25.0-SNAPSHOT</version>
    <name>notification-test-ibm</name>
    <description>Integration tests IBM for notification</description>
    <packaging>jar</packaging>
@@ -33,7 +33,7 @@
        <java.version>17</java.version>
        <maven.compiler.target>${java.version}</maven.compiler.target>
        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <os-core-lib-ibm.version>0.15.2</os-core-lib-ibm.version>
+        <os-core-lib-ibm.version>0.23.0</os-core-lib-ibm.version>
    </properties>

    <dependencies>
@@ -45,12 +45,12 @@
        <dependency>
            <groupId>org.opengroup.osdu.notification</groupId>
            <artifactId>notification-test-core</artifactId>
-            <version>0.24.0-SNAPSHOT</version>
+            <version>0.25.0-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.opengroup.osdu</groupId>
            <artifactId>os-core-common</artifactId>
-            <version>0.3.6</version>
+            <version>0.23.3</version>
        </dependency>



--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -18,7 +18,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.opengroup.osdu</groupId>
 	<artifactId>os-notification-testing</artifactId>
-	<version>0.24.0-SNAPSHOT</version>
+	<version>0.25.0-SNAPSHOT</version>
 	<description>Root Notification Service project</description>
 	<packaging>pom</packaging>