diff --git a/.mvn/community-maven.settings.xml b/.mvn/community-maven.settings.xml
index 3af866cf08df445892d0239db6d6d35235a153df..3df2f1bd83455385ecc6d050dad2cc32ab63d717 100644
--- a/.mvn/community-maven.settings.xml
+++ b/.mvn/community-maven.settings.xml
@@ -7,14 +7,20 @@
<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/146/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/146/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>
@@ -22,7 +28,13 @@
</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/146/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/146/packages/maven</publish.releases.url>
</properties>
</profile>
</profiles>
diff --git a/README.md b/README.md
index 4faa9e0d0def11927898a4277cd957902d3969ee..23590dc29ef593acb652262603987e803d8b3871 100644
--- a/README.md
+++ b/README.md
@@ -30,4 +30,4 @@ 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.
\ No newline at end of file
+limitations under the License.
diff --git a/legal-core/pom.xml b/legal-core/pom.xml
index 44558fe4c2e9f1cac3494c381762280b5227838f..a624d9b4f13c693016394bcbbabb1f559d72f296 100644
--- a/legal-core/pom.xml
+++ b/legal-core/pom.xml
@@ -189,23 +189,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/74/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
<build>
<defaultGoal>test</defaultGoal>
<plugins>
diff --git a/pom.xml b/pom.xml
index 6ce75cef67692fc5c238c53092cf1ca80e93d5c4..22f6d1a103051c8d12e574fed97cc44a74b56208 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,19 +45,19 @@
<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/74/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/74/packages/maven</url>
+ <id>${publish.snapshots.id}</id>
+ <url>${publish.snapshots.url}</url>
</snapshotRepository>
</distributionManagement>
@@ -71,4 +71,23 @@
</dependencies>
</dependencyManagement>
+ <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/146/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/146/packages/maven</publish.releases.url>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml
index 96b6c55257788b372b8a9a5688f431010c560b45..f3a2e080b674fbeb41a8577db85431d4232eaade 100644
--- a/provider/legal-aws/pom.xml
+++ b/provider/legal-aws/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/74/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<plugins>
<plugin>
diff --git a/provider/legal-azure/pom.xml b/provider/legal-azure/pom.xml
index b87a229855593f18dc3c8f12082289d0617d802c..8487918e7fa5b02f908eab75f22bbce2d2544d13 100644
--- a/provider/legal-azure/pom.xml
+++ b/provider/legal-azure/pom.xml
@@ -22,7 +22,7 @@
<artifactId>legal-service</artifactId>
<groupId>org.opengroup.osdu.legal</groupId>
<version>0.0.5-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -140,24 +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/74/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<plugins>
<plugin>
diff --git a/provider/legal-byoc/pom.xml b/provider/legal-byoc/pom.xml
index 15cec91a5154d5cbbe97ba363b773ecf8ffe1614..d745e3173dc847bbbb6953669c2b1d6f8b6e5226 100644
--- a/provider/legal-byoc/pom.xml
+++ b/provider/legal-byoc/pom.xml
@@ -6,7 +6,7 @@
<artifactId>legal-service</artifactId>
<groupId>org.opengroup.osdu.legal</groupId>
<version>0.0.5-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -64,24 +64,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/74/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<plugins>
<plugin>
diff --git a/provider/legal-gcp/README.md b/provider/legal-gcp/README.md
index 7e9519743c3def3c63645539c6b7ed7001a7e3af..c128bf16c89146f31005f72eeade221d3d6a3da5 100644
--- a/provider/legal-gcp/README.md
+++ b/provider/legal-gcp/README.md
@@ -138,6 +138,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/legal-test-core/ && mvn clean install)
$ (cd testing/legal-test-gcp/ && mvn clean test)
```
diff --git a/provider/legal-gcp/pom.xml b/provider/legal-gcp/pom.xml
index e48735275c9c5070c445889e0037a49bf205ed64..07c3e156ea08aaa078f040fcc4b86e6d1e0ee488 100644
--- a/provider/legal-gcp/pom.xml
+++ b/provider/legal-gcp/pom.xml
@@ -3,11 +3,12 @@
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.legal</groupId>
- <artifactId>legal-service</artifactId>
- <version>0.0.5-SNAPSHOT</version>
- </parent>
+ <parent>
+ <artifactId>legal-service</artifactId>
+ <groupId>org.opengroup.osdu.legal</groupId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-gcp</artifactId>
@@ -16,24 +17,6 @@
<name>legal-gcp</name>
<description>Legal service Google App Engine flex</description>
- <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/74/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml
index 1ba91705c3691d33684f0717b158598478b8263e..e9b8c1fbac4e1095ac1deea841e069271206558e 100644
--- a/provider/legal-ibm/pom.xml
+++ b/provider/legal-ibm/pom.xml
@@ -16,25 +16,6 @@
<os-core-lib-ibm.version>0.3.6-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/74/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.opengroup.osdu.legal</groupId>
diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml
index 9fe713b0c882d0dd4d69c89ff164691ddf890b30..bccc5442e1ed218d16ae6e21fba8ecd5391f36f0 100644
--- a/testing/legal-test-aws/pom.xml
+++ b/testing/legal-test-aws/pom.xml
@@ -19,6 +19,13 @@
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.legal</groupId>
+ <artifactId>os-legal-testing</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-aws</artifactId>
<version>0.0.2-SNAPSHOT</version>
@@ -114,24 +121,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/74/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<plugins>
<plugin>
diff --git a/testing/legal-test-azure/pom.xml b/testing/legal-test-azure/pom.xml
index eb7d0cd74467aedc6cc6d34be0f9b5df0828704c..a52f842c52a677b5f1aecda8268a8145e4fc7165 100644
--- a/testing/legal-test-azure/pom.xml
+++ b/testing/legal-test-azure/pom.xml
@@ -20,6 +20,13 @@
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.legal</groupId>
+ <artifactId>os-legal-testing</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-azure</artifactId>
<version>0.0.2-SNAPSHOT</version>
@@ -85,24 +92,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/74/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<plugins>
<plugin>
diff --git a/testing/legal-test-core/pom.xml b/testing/legal-test-core/pom.xml
index 969651efa533300ddf0a0202579659675293be18..1951a2b566768b750d137ec3908a281afd56e313 100644
--- a/testing/legal-test-core/pom.xml
+++ b/testing/legal-test-core/pom.xml
@@ -18,6 +18,14 @@
xmlns="http://maven.apache.org/POM/4.0.0"
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.legal</groupId>
+ <artifactId>os-legal-testing</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-core</artifactId>
<version>0.0.2-SNAPSHOT</version>
@@ -53,24 +61,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/74/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<plugins>
<plugin>
diff --git a/testing/legal-test-gcp/pom.xml b/testing/legal-test-gcp/pom.xml
index a8c42dc0b3a6f4f93a8aeeac551536b1e3b43681..846f1ca5f5d9bad86812a84ea2e124fd1fb2c274 100644
--- a/testing/legal-test-gcp/pom.xml
+++ b/testing/legal-test-gcp/pom.xml
@@ -20,6 +20,13 @@
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.legal</groupId>
+ <artifactId>os-legal-testing</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-gcp</artifactId>
<version>0.0.2-SNAPSHOT</version>
@@ -145,26 +152,6 @@
</dependency>
</dependencies>
-
- <!-- can remove this? -->
- <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/74/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<defaultGoal>test</defaultGoal>
<plugins>
diff --git a/testing/legal-test-ibm/pom.xml b/testing/legal-test-ibm/pom.xml
index 52b36a2fa716bcbd391f32af598e5f69ba0a9153..07ffe7ee1dce50ea884bb0e2cc85266d7424f460 100644
--- a/testing/legal-test-ibm/pom.xml
+++ b/testing/legal-test-ibm/pom.xml
@@ -12,6 +12,14 @@
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.legal</groupId>
+ <artifactId>os-legal-testing</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-ibm</artifactId>
<version>0.0.2-SNAPSHOT</version>
@@ -46,24 +54,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/74/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<plugins>
<plugin>
diff --git a/testing/pom.xml b/testing/pom.xml
index 0299f5e71c65c621e972fcb0254b4609854a2353..c6fe71db1274f0c19bedcd27b72e70c1669dce24 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -41,20 +41,39 @@
<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/74/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/74/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/146/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/146/packages/maven</publish.releases.url>
+ </properties>
+ </profile>
+ </profiles>
+
</project>