diff --git a/.mvn/community-maven.settings.xml b/.mvn/community-maven.settings.xml
index 262e3ddf77201d2e36e0caadb6bd1e6336f7114c..6c83ff4bd013bd48b335ba3fb4db4ccbac995fc9 100644
--- a/.mvn/community-maven.settings.xml
+++ b/.mvn/community-maven.settings.xml
@@ -7,22 +7,38 @@
<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/221/packages/maven
+ </publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/221/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/221/packages/maven
+ </publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/221/packages/maven
+ </publish.releases.url>
</properties>
</profile>
</profiles>
@@ -52,15 +68,16 @@
</configuration>
</server>
- <server>
- <id>azure-auth</id>
- <configuration>
- <tenant>${env.AZURE_TENANT_ID}</tenant>
- <client>${env.AZURE_CLIENT_ID}</client>
- <key>${env.AZURE_CLIENT_SECRET}</key>
- <environment>AZURE</environment>
- </configuration>
- </server>
+ <server>
+ <id>azure-auth</id>
+ <configuration>
+ <tenant>${env.AZURE_TENANT_ID}</tenant>
+ <client>${env.AZURE_CLIENT_ID}</client>
+ <key>${env.AZURE_CLIENT_SECRET}</key>
+ <environment>AZURE</environment>
+ </configuration>
+ </server>
</servers>
</settings>
+
diff --git a/pom.xml b/pom.xml
index af61b5909ef872ec1723ea74b318fbb6ef8f8ca7..bffbca15c89ccea52d4713d304697b047c221cad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,31 +88,12 @@
</pluginManagement>
</build>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
-
<modules>
<module>partition-core</module>
<module>provider/partition-azure</module>
<module>provider/partition-aws</module>
</modules>
- <distributionManagement>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/221/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/221/packages/maven</url>
- </snapshotRepository>
-
- </distributionManagement>
-
<profiles>
<profile>
<id>partition-core</id>
@@ -153,5 +134,39 @@
<module>provider/partition-aws</module>
</modules>
</profile>
+ <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/221/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/221/packages/maven</publish.releases.url>
+ </properties>
+ </profile>
</profiles>
+
+ <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>
</project>
diff --git a/provider/partition-aws/pom.xml b/provider/partition-aws/pom.xml
index f6b201832f9ff2e9c56a48f4e6f5b12ebd29411b..b88bf7b95586a88e8d3e209d8278623bafdc4c51 100644
--- a/provider/partition-aws/pom.xml
+++ b/provider/partition-aws/pom.xml
@@ -22,7 +22,7 @@
<artifactId>partition</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>1.0.0</version>
- <relativePath>../../</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/provider/partition-azure/pom.xml b/provider/partition-azure/pom.xml
index 6e8d259f2bbeb842aa42bc4c83efda4c9f1d54c7..f92bf2c8458be6e77c01c569795aa45af9319261 100644
--- a/provider/partition-azure/pom.xml
+++ b/provider/partition-azure/pom.xml
@@ -6,7 +6,7 @@
<artifactId>partition</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>1.0.0</version>
- <relativePath>../../</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testing/.mvn/community-maven.settings.xml b/testing/.mvn/community-maven.settings.xml
index 262e3ddf77201d2e36e0caadb6bd1e6336f7114c..6c83ff4bd013bd48b335ba3fb4db4ccbac995fc9 100644
--- a/testing/.mvn/community-maven.settings.xml
+++ b/testing/.mvn/community-maven.settings.xml
@@ -7,22 +7,38 @@
<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/221/packages/maven
+ </publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/221/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/221/packages/maven
+ </publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/221/packages/maven
+ </publish.releases.url>
</properties>
</profile>
</profiles>
@@ -52,15 +68,16 @@
</configuration>
</server>
- <server>
- <id>azure-auth</id>
- <configuration>
- <tenant>${env.AZURE_TENANT_ID}</tenant>
- <client>${env.AZURE_CLIENT_ID}</client>
- <key>${env.AZURE_CLIENT_SECRET}</key>
- <environment>AZURE</environment>
- </configuration>
- </server>
+ <server>
+ <id>azure-auth</id>
+ <configuration>
+ <tenant>${env.AZURE_TENANT_ID}</tenant>
+ <client>${env.AZURE_CLIENT_ID}</client>
+ <key>${env.AZURE_CLIENT_SECRET}</key>
+ <environment>AZURE</environment>
+ </configuration>
+ </server>
</servers>
</settings>
+
diff --git a/testing/partition-test-aws/pom.xml b/testing/partition-test-aws/pom.xml
index ebded165caa62ec08f396723195b989aa3b33223..836fec1116886c13e55ee60faaf69e4c0ef8a637 100644
--- a/testing/partition-test-aws/pom.xml
+++ b/testing/partition-test-aws/pom.xml
@@ -17,6 +17,14 @@
<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">
+
+ <parent>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-partition-testing</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.opengroup.osdu.partition</groupId>
<artifactId>partition-test-aws</artifactId>
@@ -87,22 +95,5 @@
</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/221/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/221/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
</project>
diff --git a/testing/partition-test-azure/pom.xml b/testing/partition-test-azure/pom.xml
index 4e20627fa1b9f369d95803ed786ca6a3fbeda758..9c6bce0d643880902ef707fe0b5cec9871eb2493 100644
--- a/testing/partition-test-azure/pom.xml
+++ b/testing/partition-test-azure/pom.xml
@@ -18,6 +18,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-partition-testing</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.partition</groupId>
<artifactId>partition-test-azure</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -69,22 +77,4 @@
</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/221/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/221/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
</project>
diff --git a/testing/partition-test-core/pom.xml b/testing/partition-test-core/pom.xml
index 597abd317893c89db49bd95ac8be4f6b7b4db12f..654cea6c396012a620b64687274e57e6a0e1f2ec 100644
--- a/testing/partition-test-core/pom.xml
+++ b/testing/partition-test-core/pom.xml
@@ -18,6 +18,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-partition-testing</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.partition</groupId>
<artifactId>partition-test-core</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -63,22 +71,5 @@
</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/221/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/221/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
</project>
diff --git a/testing/pom.xml b/testing/pom.xml
index 22ac051d00b642ccbc00258262e9649b2e5041ae..21f1a5c40fabd23e23c807be8e659af29ed87173 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -39,20 +39,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/221/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/221/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/221/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/221/packages/maven</publish.releases.url>
+ </properties>
+ </profile>
+ </profiles>
</project>