diff --git a/.mvn/community-maven.settings.xml b/.mvn/community-maven.settings.xml
index 75718a6d51b789d04f859ab8906b094bfb76b825..2a063bb251657112444b42f41e63a3f66ad3b73d 100644
--- a/.mvn/community-maven.settings.xml
+++ b/.mvn/community-maven.settings.xml
@@ -7,7 +7,13 @@
<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/157/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/157/packages/maven</publish.releases.url>
</properties>
</profile>
@@ -17,12 +23,18 @@
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/157/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/157/packages/maven</publish.releases.url>
</properties>
</profile>
</profiles>
diff --git a/pom.xml b/pom.xml
index f5de14bf902ddb5d449eef435611d2831cb7438a..1f2d4c97e6f2c01a91748886b97d3c67fd57730a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,12 +80,6 @@
</pluginManagement>
</build>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
<modules>
<module>register-core</module>
@@ -95,14 +89,42 @@
<module>provider/register-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/157/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/157/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/157/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/157/packages/maven</publish.releases.url>
+ </properties>
+ </profile>
+ </profiles>
+
+
</project>
diff --git a/provider/register-aws/pom.xml b/provider/register-aws/pom.xml
index 14c96c7880e9b59e6f02e797a448bd83c5f7fe0e..dd67b3216323ee08ce61ff17da2a1d607872a696 100644
--- a/provider/register-aws/pom.xml
+++ b/provider/register-aws/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-register</artifactId>
<version>1.0.0</version>
- <relativePath>../../</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<properties>
<aws.version>1.11.637</aws.version>
@@ -131,24 +131,6 @@
</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/157/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/157/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<plugins>
<plugin>
diff --git a/provider/register-azure/pom.xml b/provider/register-azure/pom.xml
index 87da292fc42bbc69c6e577313a0890fce760e542..959fd70b3e02efa8c686589c5efa08c9d536190e 100644
--- a/provider/register-azure/pom.xml
+++ b/provider/register-azure/pom.xml
@@ -21,7 +21,7 @@
<artifactId>os-register</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>1.0.0</version>
- <relativePath>../../</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>register-azure</artifactId>
@@ -140,23 +140,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/register-gcp/README.md b/provider/register-gcp/README.md
index 8fb32f87e230d7644398a80e586d21390a6e1e8c..9ac06a411e626aaa22698e2933c916396924eb88 100644
--- a/provider/register-gcp/README.md
+++ b/provider/register-gcp/README.md
@@ -160,6 +160,7 @@ Execute following command to build code and run all the integration tests:
```bash
# Note: this assumes that the environment variables for integration tests as outlined
# above are already exported in your environment.
+$ (cd testing/register-test-core/ && mvn clean test)
$ (cd testing/register-test-gcp/ && mvn clean test)
```
diff --git a/provider/register-gcp/pom.xml b/provider/register-gcp/pom.xml
index 7449aa2fab2083ecf30171d2e3b093c059674ad7..a724f0f5d076d3e9707e59a52c544cff60fb1289 100644
--- a/provider/register-gcp/pom.xml
+++ b/provider/register-gcp/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-register</artifactId>
<version>1.0.0</version>
- <relativePath>../../</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
@@ -78,24 +78,6 @@
</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/157/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/157/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<plugins>
<plugin>
diff --git a/provider/register-ibm/pom.xml b/provider/register-ibm/pom.xml
index c8b9bd76adf5de9327ce771b67eec983e0dfedd9..76f3a6ef68cd771d559523eaaa7b847eb85f6925 100644
--- a/provider/register-ibm/pom.xml
+++ b/provider/register-ibm/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-register</artifactId>
<version>1.0.0</version>
- <relativePath>../../</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
@@ -58,27 +58,8 @@
<version>2.0.2</version>
<scope>test</scope>
</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/157/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/157/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<plugins>
<plugin>
diff --git a/register-core/pom.xml b/register-core/pom.xml
index f960cc6ef190503c78bce62eaca48ebc330ce5d7..ffdf43601db3a27028fef5d61e413c94e81ba535 100644
--- a/register-core/pom.xml
+++ b/register-core/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-register</artifactId>
<version>1.0.0</version>
- <relativePath>../</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
@@ -214,22 +214,4 @@
<scope>test</scope>
</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/157/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/157/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
</project>
diff --git a/testing/pom.xml b/testing/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3f349c1dc817ea7174cf4f64beb563b5f02ff5a7
--- /dev/null
+++ b/testing/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2017-2019, Schlumberger
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<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>
+ <groupId>org.opengroup.osdu.register</groupId>
+ <artifactId>os-register-testing</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <description>Root Register Service project</description>
+ <packaging>pom</packaging>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <modules>
+ <module>register-test-core</module>
+ <module>register-test-azure</module>
+ <module>register-test-ibm</module>
+ <module>register-test-gcp</module>
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>${repo.releases.id}</id>
+ <url>${repo.releases.url}</url>
+ </repository>
+ </repositories>
+
+ <distributionManagement>
+ <repository>
+ <id>${publish.releases.id}</id>
+ <url>${publish.releases.url}</url>
+ </repository>
+ <snapshotRepository>
+ <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/157/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/157/packages/maven</publish.releases.url>
+ </properties>
+ </profile>
+ </profiles>
+
+
+</project>
diff --git a/testing/register-test-aws/pom.xml b/testing/register-test-aws/pom.xml
index 389defcc5e4fcbf7af0a4543f706bb29a71ca556..2af11650533bcf2e9ae344e1bcb67ed5ba32bfe9 100644
--- a/testing/register-test-aws/pom.xml
+++ b/testing/register-test-aws/pom.xml
@@ -20,6 +20,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.opengroup.osdu.register</groupId>
+ <artifactId>os-register-testing</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.register</groupId>
<artifactId>register-test-aws</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -131,22 +138,5 @@
<version>1.11.676</version>
</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/157/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/157/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
+
</project>
diff --git a/testing/register-test-azure/pom.xml b/testing/register-test-azure/pom.xml
index facfdf872021041bd848fa2ef6d3be1823802193..c9a8b6700caeaa36938165dc3ddd68f59bda8add 100644
--- a/testing/register-test-azure/pom.xml
+++ b/testing/register-test-azure/pom.xml
@@ -20,6 +20,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.opengroup.osdu.register</groupId>
+ <artifactId>os-register-testing</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.register</groupId>
<artifactId>register-test-azure</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -126,22 +133,4 @@
<scope>test</scope>
</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/157/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/157/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
</project>
diff --git a/testing/register-test-core/pom.xml b/testing/register-test-core/pom.xml
index ff446e8f6a806e46f545563eab1423f448103a9c..a81c7b63bcd49e861324e29c1903c6b503a7655b 100644
--- a/testing/register-test-core/pom.xml
+++ b/testing/register-test-core/pom.xml
@@ -20,6 +20,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.opengroup.osdu.register</groupId>
+ <artifactId>os-register-testing</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.register</groupId>
<artifactId>register-test-core</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -125,22 +132,4 @@
<scope>compile</scope>
</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/157/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/157/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
</project>
diff --git a/testing/register-test-gcp/pom.xml b/testing/register-test-gcp/pom.xml
index 2feaf305fbb3be2486866024e86cd55e667a4675..b1eaac572f4dbeaf2535b1152c27fb9f4983162c 100644
--- a/testing/register-test-gcp/pom.xml
+++ b/testing/register-test-gcp/pom.xml
@@ -20,6 +20,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.opengroup.osdu.register</groupId>
+ <artifactId>os-register-testing</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.register</groupId>
<artifactId>register-test-gcp</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -125,22 +132,4 @@
<scope>test</scope>
</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/157/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/157/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
</project>
diff --git a/testing/register-test-ibm/pom.xml b/testing/register-test-ibm/pom.xml
index 657d4773f8f97a74569121654464c7f954be84f3..66a526fb2fcf4153ea941dd792b9edd066af4ef5 100644
--- a/testing/register-test-ibm/pom.xml
+++ b/testing/register-test-ibm/pom.xml
@@ -17,6 +17,13 @@ Copyright 2020 IBM Corp. All Rights Reserved.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.opengroup.osdu.register</groupId>
+ <artifactId>os-register-testing</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.register</groupId>
<artifactId>register-test-ibm</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -129,22 +136,4 @@ Copyright 2020 IBM Corp. All Rights Reserved.
<scope>test</scope>
</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/157/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/157/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
</project>