diff --git a/notification-core/pom.xml b/notification-core/pom.xml index 0d9a9623db3e4047b186e3bb771d486b2acbd7b4..7541b26115dede2a0f525147793904042853566f 100644 --- 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> diff --git a/pom.xml b/pom.xml index 1b645f99a5a4c9d4e424a392886f687f0e324c96..f9b909cbbfcd1492a5cde25a942d197741e997f9 100644 --- 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> diff --git a/provider/notification-aws/pom.xml b/provider/notification-aws/pom.xml index 2be707a21b30d81a1032ce95ae0808523eaeadf8..8e3a0b0cc1cc8d6815d2fa3ad4708f6c30297e8d 100644 --- 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> diff --git a/provider/notification-azure/pom.xml b/provider/notification-azure/pom.xml index 6bc1fe137098e3156ad587ae632a106fe5b19628..9ca94108c774048ebfc6c6fb3ea89fd3a65da461 100644 --- 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> diff --git a/provider/notification-gc/pom.xml b/provider/notification-gc/pom.xml index c232166bdb8437936b11e527101794f87b54667d..2456045a773c51554d4575e231d878ae7ce72913 100644 --- 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> diff --git a/provider/notification-ibm/pom.xml b/provider/notification-ibm/pom.xml index 68eba000b96c3df9c50254e1005019b853bac3d8..24d91cf9fbc7dbc8e169abb7beedb3974ae05a73 100644 --- 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> diff --git a/testing/notification-test-aws/pom.xml b/testing/notification-test-aws/pom.xml index cf02513dd95cabb46eda612f34c9710b7fe86bc0..8a440ddead1b46b791726527128d38351f6907f2 100644 --- 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> diff --git a/testing/notification-test-azure/pom.xml b/testing/notification-test-azure/pom.xml index eca8a8834260b45cae02417f0e14602e2255a3e4..4f233bfebf6b037cbf0dfba115304263ded342ea 100644 --- 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> diff --git a/testing/notification-test-baremetal/pom.xml b/testing/notification-test-baremetal/pom.xml index 65529fe85c873125c3db62df435bceea090c27b0..52ca15ebf698f55396c9059aa65c0ae9140c36cb 100644 --- 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> diff --git a/testing/notification-test-core/pom.xml b/testing/notification-test-core/pom.xml index 153631c38923874d5d16e8d6c4745d3b30528822..d113d44c2bb171cb123a2442fddf2fdf4646a887 100644 --- 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> diff --git a/testing/notification-test-gc/pom.xml b/testing/notification-test-gc/pom.xml index e30b9a67267aed1a7d24f0f41b8dbf0e7d575411..cbeb13630b0ce9cf572b6094489730d9a2933bea 100644 --- 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> diff --git a/testing/notification-test-ibm/pom.xml b/testing/notification-test-ibm/pom.xml index 1f14b4d452879038ac468a888fc7e9d346088227..208581c574586f3bc52280ed32716f5c141dac7e 100644 --- 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> diff --git a/testing/pom.xml b/testing/pom.xml index a766e7e3898cef072c26736d00fe0e9807afac1d..3787ed5ba2af802884573e736a3b32cfa023448c 100644 --- 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>