diff --git a/.mvn/community-maven.settings.xml b/.mvn/community-maven.settings.xml
index 75718a6d51b789d04f859ab8906b094bfb76b825..aaaed9f20ed3cd32482bb317c6bee483668258b7 100644
--- a/.mvn/community-maven.settings.xml
+++ b/.mvn/community-maven.settings.xml
@@ -7,22 +7,34 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <gitlab-server>community-maven-via-job-token</gitlab-server>
+ <repo.releases.id>community-maven-repo</repo.releases.id>
+ <publish.snapshots.id>community-maven-via-job-token</publish.snapshots.id>
+ <publish.releases.id>community-maven-via-job-token</publish.releases.id>
+
+ <repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
+ <publish.snapshots.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.releases.url>
</properties>
</profile>
<profile>
<!-- This profile uses a personal token to authenticate, which is useful for local or manual runs. The
- presence of the COMMUNITY_MAVEN_TOKEN variable triggers this and overrides the CI Token
- based authentication -->
+ presence of the COMMUNITY_MAVEN_TOKEN variable triggers this and overrides the CI Token
+ based authentication -->
<id>GitLab-Authenticate-With-Private-Token</id>
<activation>
- <property>
- <name>env.COMMUNITY_MAVEN_TOKEN</name>
- </property>
+ <property>
+ <name>env.COMMUNITY_MAVEN_TOKEN</name>
+ </property>
</activation>
<properties>
- <gitlab-server>community-maven-via-private-token</gitlab-server>
+ <repo.releases.id>community-maven-repo</repo.releases.id>
+ <publish.snapshots.id>community-maven-via-private-token</publish.snapshots.id>
+ <publish.releases.id>community-maven-via-private-token</publish.releases.id>
+
+ <repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
+ <publish.snapshots.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.releases.url>
</properties>
</profile>
</profiles>
diff --git a/notification-core/pom.xml b/notification-core/pom.xml
index 771a747ec5b5b3a52898463f7cc61d2a99345cc3..e696ef2a56b77b8ab341b93176a1e659524fa359 100644
--- a/notification-core/pom.xml
+++ b/notification-core/pom.xml
@@ -40,24 +40,6 @@
<springfox-version>2.7.0</springfox-version>
</properties>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/pom.xml b/pom.xml
index 1140ba2500687002d32d5d6dc584269d93c10845..8f09827e780de212346f8ba4fd8af71ee4bbd0e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,13 +67,6 @@
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
-
<modules>
<module>notification-core</module>
<module>provider/notification-gcp</module>
@@ -82,15 +75,41 @@
<module>provider/notification-aws</module>
</modules>
+ <repositories>
+ <repository>
+ <id>${repo.releases.id}</id>
+ <url>${repo.releases.url}</url>
+ </repository>
+ </repositories>
+
<distributionManagement>
<repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
+ <id>${publish.releases.id}</id>
+ <url>${publish.releases.url}</url>
</repository>
<snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
+ <id>${publish.snapshots.id}</id>
+ <url>${publish.snapshots.url}</url>
</snapshotRepository>
</distributionManagement>
+ <profiles>
+ <profile>
+ <id>Default</id>
+ <activation>
+ <property>
+ <name>!repo.releases.id</name>
+ </property>
+ </activation>
+ <properties>
+ <repo.releases.id>community-maven-repo</repo.releases.id>
+ <publish.snapshots.id>community-maven-via-job-token</publish.snapshots.id>
+ <publish.releases.id>community-maven-via-job-token</publish.releases.id>
+ <repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
+ <publish.snapshots.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.releases.url>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
diff --git a/provider/notification-aws/pom.xml b/provider/notification-aws/pom.xml
index 4d2061660ae01f8bd3d5ca55224069b4135da17d..85ddaf9fc1cdef0b1118882288ac4cf9e76c54e5 100644
--- a/provider/notification-aws/pom.xml
+++ b/provider/notification-aws/pom.xml
@@ -40,24 +40,6 @@
<aws.version>1.11.637</aws.version>
</properties>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<!-- <dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/provider/notification-azure/pom.xml b/provider/notification-azure/pom.xml
index 1fb7c1787c85187c79dd87aeac92b55f7397e721..bf1bbd055d2d7c779a9d3ed059dd357d5ed18d4b 100644
--- a/provider/notification-azure/pom.xml
+++ b/provider/notification-azure/pom.xml
@@ -134,24 +134,6 @@
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/44/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/44/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<plugins>
<plugin>
diff --git a/provider/notification-gcp/pom.xml b/provider/notification-gcp/pom.xml
index 50409e65f6b4d4ccaa85ee7f3190b69e02e2d7df..c8fa69b632036d2f8a20b7dc2bb53044cf6323f3 100644
--- a/provider/notification-gcp/pom.xml
+++ b/provider/notification-gcp/pom.xml
@@ -38,24 +38,6 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
</properties>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/provider/notification-ibm/pom.xml b/provider/notification-ibm/pom.xml
index 4785cb376bf118e52fb830a03b4a24af12d4e628..6d626fe2c425b1cc496c0d985545855f51d389ed 100644
--- a/provider/notification-ibm/pom.xml
+++ b/provider/notification-ibm/pom.xml
@@ -36,24 +36,6 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
</properties>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<!-- <dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/testing/notification-test-aws/pom.xml b/testing/notification-test-aws/pom.xml
index cd41c53282f5f82c04b6015cef0df56248a837ea..fa94003e20ef3933df797aad9d91a073fd5076b4 100644
--- a/testing/notification-test-aws/pom.xml
+++ b/testing/notification-test-aws/pom.xml
@@ -19,6 +19,14 @@
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>
+
+ <parent>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-notification-testing</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu</groupId>
<artifactId>notification-test-aws</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -33,24 +41,6 @@
<os-core-lib-aws.version>0.3.11</os-core-lib-aws.version>
</properties>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
diff --git a/testing/notification-test-azure/pom.xml b/testing/notification-test-azure/pom.xml
index 0083132f3c26fc22a3784edaf142f80f5be34f0b..f39a6580afc7a422a45d2160bb6401e7e5e2fb9c 100644
--- a/testing/notification-test-azure/pom.xml
+++ b/testing/notification-test-azure/pom.xml
@@ -19,6 +19,14 @@
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>
+
+ <parent>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-notification-testing</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu</groupId>
<artifactId>notification-test-azure</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -32,24 +40,6 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
</properties>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/157/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/157/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.opengroup.osdu.notification</groupId>
diff --git a/testing/notification-test-core/pom.xml b/testing/notification-test-core/pom.xml
index 5d4a558b6cf6684600daa6a91a6e2afb015be62a..85e44ef781f14d1cb5dad2c5b608e7f87c385b16 100644
--- a/testing/notification-test-core/pom.xml
+++ b/testing/notification-test-core/pom.xml
@@ -19,6 +19,14 @@
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>
+
+ <parent>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-notification-testing</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.notification</groupId>
<artifactId>notification-test-core</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -32,24 +40,6 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
</properties>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
diff --git a/testing/notification-test-gcp/pom.xml b/testing/notification-test-gcp/pom.xml
index 08c9e8f7d985338bb5bd5d7201f7fb5e8f72324c..ef6c4b850d626340c7532f2abe11ddd50655678c 100644
--- a/testing/notification-test-gcp/pom.xml
+++ b/testing/notification-test-gcp/pom.xml
@@ -19,6 +19,14 @@
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>
+
+ <parent>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-notification-testing</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu</groupId>
<artifactId>notification-test-gcp</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -32,24 +40,6 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
</properties>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.opengroup.osdu.notification</groupId>
diff --git a/testing/notification-test-ibm/pom.xml b/testing/notification-test-ibm/pom.xml
index c34117e9775c4592cbc327398016eb9edc2418c5..22d30efd0a944818ab9cf2d21ecfc9145fd18ed4 100644
--- a/testing/notification-test-ibm/pom.xml
+++ b/testing/notification-test-ibm/pom.xml
@@ -16,6 +16,14 @@
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>
+
+ <parent>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-notification-testing</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu</groupId>
<artifactId>notification-test-ibm</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -30,24 +38,6 @@
<os-core-lib-ibm.version>0.3.8-SNAPSHOT</os-core-lib-ibm.version>
</properties>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/testing/pom.xml b/testing/pom.xml
index 386c93cf7ab36f6ec7dd5f1f6de4513ac43e6a71..35c137eedcc86348a80697d4a3632942540a06d5 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -41,20 +41,38 @@
<repositories>
<repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
+ <id>${repo.releases.id}</id>
+ <url>${repo.releases.url}</url>
</repository>
</repositories>
<distributionManagement>
<repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/44/packages/maven</url>
+ <id>${publish.releases.id}</id>
+ <url>${publish.releases.url}</url>
</repository>
<snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/44/packages/maven</url>
+ <id>${publish.snapshots.id}</id>
+ <url>${publish.snapshots.url}</url>
</snapshotRepository>
</distributionManagement>
+ <profiles>
+ <profile>
+ <id>Default</id>
+ <activation>
+ <property>
+ <name>!repo.releases.id</name>
+ </property>
+ </activation>
+ <properties>
+ <repo.releases.id>community-maven-repo</repo.releases.id>
+ <publish.snapshots.id>community-maven-via-job-token</publish.snapshots.id>
+ <publish.releases.id>community-maven-via-job-token</publish.releases.id>
+ <repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
+ <publish.snapshots.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.releases.url>
+ </properties>
+ </profile>
+ </profiles>
</project>