Skip to content
Snippets Groups Projects
Commit f7ff5a44 authored by Rostislav Dublin (EPAM)'s avatar Rostislav Dublin (EPAM)
Browse files

Merge branch 'poms' into 'master' 

Removed unhardcode repositories and distribution management from all poms (GONRG-1192)

See merge request !21
parents 4f544383 cb97bbc0
No related branches found
No related tags found
1 merge request!21Removed unhardcode repositories and distribution management from all poms (GONRG-1192)
Pipeline #16685 passed
Stage: build
Stage: containerize
Stage: scan
Stage: deploy
Stage: integration
Stage: attribution
Hide whitespace changes
Inline Side-by-side
Showing
with 150 additions and 111 deletions
.mvn/community-maven.settings.xml
+ 33
− 16
View file @ f7ff5a44
...@@ -7,22 +7,38 @@ ...@@ -7,22 +7,38 @@
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<properties> <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> </properties>
</profile> </profile>
<profile> <profile>
<!-- This profile uses a personal token to authenticate, which is useful for local or manual runs. The <!-- 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 presence of the COMMUNITY_MAVEN_TOKEN variable triggers this and overrides the CI Token
based authentication --> based authentication -->
<id>GitLab-Authenticate-With-Private-Token</id> <id>GitLab-Authenticate-With-Private-Token</id>
<activation> <activation>
<property> <property>
<name>env.COMMUNITY_MAVEN_TOKEN</name> <name>env.COMMUNITY_MAVEN_TOKEN</name>
</property> </property>
</activation> </activation>
<properties> <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> </properties>
</profile> </profile>
</profiles> </profiles>
...@@ -52,15 +68,16 @@ ...@@ -52,15 +68,16 @@
</configuration> </configuration>
</server> </server>
<server> <server>
<id>azure-auth</id> <id>azure-auth</id>
<configuration> <configuration>
<tenant>${env.AZURE_TENANT_ID}</tenant> <tenant>${env.AZURE_TENANT_ID}</tenant>
<client>${env.AZURE_CLIENT_ID}</client> <client>${env.AZURE_CLIENT_ID}</client>
<key>${env.AZURE_CLIENT_SECRET}</key> <key>${env.AZURE_CLIENT_SECRET}</key>
<environment>AZURE</environment> <environment>AZURE</environment>
</configuration> </configuration>
</server> </server>
</servers> </servers>
</settings> </settings>
pom.xml
+ 34
− 19
View file @ f7ff5a44
...@@ -88,31 +88,12 @@ ...@@ -88,31 +88,12 @@
</pluginManagement> </pluginManagement>
</build> </build>
<repositories>
<repository>
<id>${gitlab-server}</id>
<url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
</repository>
</repositories>
<modules> <modules>
<module>partition-core</module> <module>partition-core</module>
<module>provider/partition-azure</module> <module>provider/partition-azure</module>
<module>provider/partition-aws</module> <module>provider/partition-aws</module>
</modules> </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> <profiles>
<profile> <profile>
<id>partition-core</id> <id>partition-core</id>
...@@ -153,5 +134,39 @@ ...@@ -153,5 +134,39 @@
<module>provider/partition-aws</module> <module>provider/partition-aws</module>
</modules> </modules>
</profile> </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> </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> </project>
provider/partition-aws/pom.xml
+ 1
− 1
View file @ f7ff5a44
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<artifactId>partition</artifactId> <artifactId>partition</artifactId>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<version>1.0.0</version> <version>1.0.0</version>
<relativePath>../../</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
provider/partition-azure/pom.xml
+ 1
− 1
View file @ f7ff5a44
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<artifactId>partition</artifactId> <artifactId>partition</artifactId>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<version>1.0.0</version> <version>1.0.0</version>
<relativePath>../../</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
testing/.mvn/community-maven.settings.xml
+ 33
− 16
View file @ f7ff5a44
...@@ -7,22 +7,38 @@ ...@@ -7,22 +7,38 @@
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<properties> <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> </properties>
</profile> </profile>
<profile> <profile>
<!-- This profile uses a personal token to authenticate, which is useful for local or manual runs. The <!-- 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 presence of the COMMUNITY_MAVEN_TOKEN variable triggers this and overrides the CI Token
based authentication --> based authentication -->
<id>GitLab-Authenticate-With-Private-Token</id> <id>GitLab-Authenticate-With-Private-Token</id>
<activation> <activation>
<property> <property>
<name>env.COMMUNITY_MAVEN_TOKEN</name> <name>env.COMMUNITY_MAVEN_TOKEN</name>
</property> </property>
</activation> </activation>
<properties> <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> </properties>
</profile> </profile>
</profiles> </profiles>
...@@ -52,15 +68,16 @@ ...@@ -52,15 +68,16 @@
</configuration> </configuration>
</server> </server>
<server> <server>
<id>azure-auth</id> <id>azure-auth</id>
<configuration> <configuration>
<tenant>${env.AZURE_TENANT_ID}</tenant> <tenant>${env.AZURE_TENANT_ID}</tenant>
<client>${env.AZURE_CLIENT_ID}</client> <client>${env.AZURE_CLIENT_ID}</client>
<key>${env.AZURE_CLIENT_SECRET}</key> <key>${env.AZURE_CLIENT_SECRET}</key>
<environment>AZURE</environment> <environment>AZURE</environment>
</configuration> </configuration>
</server> </server>
</servers> </servers>
</settings> </settings>
testing/partition-test-aws/pom.xml
+ 8
− 17
View file @ f7ff5a44
...@@ -17,6 +17,14 @@ ...@@ -17,6 +17,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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> <modelVersion>4.0.0</modelVersion>
<groupId>org.opengroup.osdu.partition</groupId> <groupId>org.opengroup.osdu.partition</groupId>
<artifactId>partition-test-aws</artifactId> <artifactId>partition-test-aws</artifactId>
...@@ -87,22 +95,5 @@ ...@@ -87,22 +95,5 @@
</dependency> </dependency>
</dependencies> </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> </project>
testing/partition-test-azure/pom.xml
+ 8
− 18
View file @ f7ff5a44
...@@ -18,6 +18,14 @@ ...@@ -18,6 +18,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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> <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> <groupId>org.opengroup.osdu.partition</groupId>
<artifactId>partition-test-azure</artifactId> <artifactId>partition-test-azure</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
...@@ -69,22 +77,4 @@ ...@@ -69,22 +77,4 @@
</dependency> </dependency>
</dependencies> </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> </project>
testing/partition-test-core/pom.xml
+ 8
− 17
View file @ f7ff5a44
...@@ -18,6 +18,14 @@ ...@@ -18,6 +18,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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> <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> <groupId>org.opengroup.osdu.partition</groupId>
<artifactId>partition-test-core</artifactId> <artifactId>partition-test-core</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
...@@ -63,22 +71,5 @@ ...@@ -63,22 +71,5 @@
</dependency> </dependency>
</dependencies> </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> </project>
testing/pom.xml
+ 24
− 6
View file @ f7ff5a44
...@@ -39,20 +39,38 @@ ...@@ -39,20 +39,38 @@
<repositories> <repositories>
<repository> <repository>
<id>${gitlab-server}</id> <id>${repo.releases.id}</id>
<url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url> <url>${repo.releases.url}</url>
</repository> </repository>
</repositories> </repositories>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>${gitlab-server}</id> <id>${publish.releases.id}</id>
<url>https://community.opengroup.org/api/v4/projects/221/packages/maven</url> <url>${publish.releases.url}</url>
</repository> </repository>
<snapshotRepository> <snapshotRepository>
<id>${gitlab-server}</id> <id>${publish.snapshots.id}</id>
<url>https://community.opengroup.org/api/v4/projects/221/packages/maven</url> <url>${publish.snapshots.url}</url>
</snapshotRepository> </snapshotRepository>
</distributionManagement> </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> </project>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment