From 78bdff741385c31269118a3a0fd2ee9e04d934dc Mon Sep 17 00:00:00 2001
From: Stanislav Riabokon <Stanislav_Riabokon@epam.com>
Date: Fri, 6 Nov 2020 11:32:45 +0400
Subject: [PATCH] GONRG-1056 Updated all poms.
---
.mvn/community-maven.settings.xml | 21 +++++++++++++----
indexer-core/pom.xml | 19 +--------------
pom.xml | 38 +++++++++++++++---------------
provider/indexer-aws/pom.xml | 24 +------------------
provider/indexer-azure/pom.xml | 20 +---------------
provider/indexer-gcp/pom.xml | 16 -------------
provider/indexer-ibm/pom.xml | 19 +--------------
testing/indexer-test-aws/pom.xml | 25 ++++++--------------
testing/indexer-test-azure/pom.xml | 24 ++++++-------------
testing/indexer-test-core/pom.xml | 25 ++++++--------------
testing/indexer-test-gcp/pom.xml | 24 ++++++-------------
testing/indexer-test-ibm/pom.xml | 25 ++++++--------------
testing/pom.xml | 12 +++++-----
13 files changed, 81 insertions(+), 211 deletions(-)
diff --git a/.mvn/community-maven.settings.xml b/.mvn/community-maven.settings.xml
index 3af866cf0..1d20df121 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/25/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/25packages/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/25/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/25/packages/maven</publish.releases.url>
</properties>
</profile>
</profiles>
@@ -62,4 +74,5 @@
</configuration>
</server>
</servers>
+
</settings>
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index 93252e1e0..9242903c9 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -6,6 +6,7 @@
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
<version>1.0.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>indexer-core</artifactId>
@@ -197,7 +198,6 @@
<scope>test</scope>
</dependency>
-
<!-- swagger dependencies -->
<dependency>
<groupId>io.springfox</groupId>
@@ -212,23 +212,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/25/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/25/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
<build>
<defaultGoal>test</defaultGoal>
<plugins>
diff --git a/pom.xml b/pom.xml
index f66651654..9d63d9534 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.16.RELEASE</version>
- <relativePath/> <!-- lookup parent from repository -->
+ <relativePath/>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
@@ -48,24 +48,6 @@
</license>
</licenses>
- <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/25/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/25/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -150,4 +132,22 @@
<module>provider/indexer-ibm</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>
+
</project>
diff --git a/provider/indexer-aws/pom.xml b/provider/indexer-aws/pom.xml
index e126e1c8d..bc756ab12 100644
--- a/provider/indexer-aws/pom.xml
+++ b/provider/indexer-aws/pom.xml
@@ -20,7 +20,7 @@
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
<version>1.0.4-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -173,26 +173,4 @@
</plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
-
- <repository>
- <id>jitpack.io</id>
- <url>https://jitpack.io</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/25/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/25/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
</project>
diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml
index 7f2f93821..62d8f1d15 100644
--- a/provider/indexer-azure/pom.xml
+++ b/provider/indexer-azure/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
<version>1.0.4-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>indexer-azure</artifactId>
@@ -222,24 +222,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/25/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/25/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<plugins>
<plugin>
diff --git a/provider/indexer-gcp/pom.xml b/provider/indexer-gcp/pom.xml
index fe4e902e8..70abe1c66 100644
--- a/provider/indexer-gcp/pom.xml
+++ b/provider/indexer-gcp/pom.xml
@@ -16,23 +16,7 @@
<name>indexer-gcp</name>
<description>Indexer Service GCP App Engine</description>
<packaging>jar</packaging>
- <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/25/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/25/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
diff --git a/provider/indexer-ibm/pom.xml b/provider/indexer-ibm/pom.xml
index 07b269a72..af9c027d8 100644
--- a/provider/indexer-ibm/pom.xml
+++ b/provider/indexer-ibm/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
<version>1.0.4-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>indexer-ibm</artifactId>
@@ -150,23 +150,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/25/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/25/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
<build>
<plugins>
<plugin>
diff --git a/testing/indexer-test-aws/pom.xml b/testing/indexer-test-aws/pom.xml
index e8975829f..b6f709f74 100644
--- a/testing/indexer-test-aws/pom.xml
+++ b/testing/indexer-test-aws/pom.xml
@@ -20,29 +20,18 @@
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>indexer-test</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-aws</artifactId>
<version>0.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <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/25/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/25/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
diff --git a/testing/indexer-test-azure/pom.xml b/testing/indexer-test-azure/pom.xml
index 47465e7b5..40ac0301b 100644
--- a/testing/indexer-test-azure/pom.xml
+++ b/testing/indexer-test-azure/pom.xml
@@ -20,6 +20,13 @@
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>indexer-test</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-azure</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -32,24 +39,7 @@
<azure.keyvault.version>4.1.0</azure.keyvault.version>
<junit.jupiter.version>5.6.0</junit.jupiter.version>
</properties>
- <!-- indexer test core depends on core libraries in OSDU, so the repository needs to be configured -->
- <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/25/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/25/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
<dependencies>
<!-- Internal packages -->
diff --git a/testing/indexer-test-core/pom.xml b/testing/indexer-test-core/pom.xml
index 5b8d0fef0..0052017fa 100644
--- a/testing/indexer-test-core/pom.xml
+++ b/testing/indexer-test-core/pom.xml
@@ -4,6 +4,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</groupId>
+ <artifactId>indexer-test</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
<version>0.0.2-SNAPSHOT</version>
@@ -15,24 +22,6 @@
<os-core-common.version>0.3.6</os-core-common.version>
</properties>
- <!-- testing core depends on core libraries in OSDU, so the repository needs to be configured -->
- <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/25/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/25/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/testing/indexer-test-gcp/pom.xml b/testing/indexer-test-gcp/pom.xml
index 63544ea5c..15ad0ca19 100644
--- a/testing/indexer-test-gcp/pom.xml
+++ b/testing/indexer-test-gcp/pom.xml
@@ -5,6 +5,13 @@
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>indexer-test</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-gcp</artifactId>
<version>0.0.2-SNAPSHOT</version>
@@ -128,21 +135,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/25/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/25/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
</project>
\ No newline at end of file
diff --git a/testing/indexer-test-ibm/pom.xml b/testing/indexer-test-ibm/pom.xml
index 62842b147..110d8aa46 100644
--- a/testing/indexer-test-ibm/pom.xml
+++ b/testing/indexer-test-ibm/pom.xml
@@ -5,6 +5,13 @@
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>indexer-test</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-ibm</artifactId>
<version>0.0.2</version>
@@ -135,22 +142,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/25/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/25/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
</project>
diff --git a/testing/pom.xml b/testing/pom.xml
index 14d9179b9..7b3544dd0 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -41,19 +41,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/19/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/19/packages/maven</url>
+ <id>${publish.snapshots.id}</id>
+ <url>${publish.snapshots.url}</url>
</snapshotRepository>
</distributionManagement>
</project>
--
GitLab