Skip to content
Snippets Groups Projects
Commit 8b298eb8 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-993)

See merge request !71
parents 243e5996 60640557
No related branches found
No related tags found
1 merge request!71Removed unhardcode repositories and distribution management from all poms (GONRG-993)
Pipeline #14454 failed
...@@ -7,14 +7,20 @@ ...@@ -7,14 +7,20 @@
<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/146/packages/maven</publish.snapshots.url>
<publish.releases.url>https://community.opengroup.org/api/v4/projects/146/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>
...@@ -22,7 +28,13 @@ ...@@ -22,7 +28,13 @@
</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/146/packages/maven</publish.snapshots.url>
<publish.releases.url>https://community.opengroup.org/api/v4/projects/146/packages/maven</publish.releases.url>
</properties> </properties>
</profile> </profile>
</profiles> </profiles>
......
...@@ -30,4 +30,4 @@ Unless required by applicable law or agreed to in writing, software ...@@ -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, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
\ No newline at end of file
...@@ -189,23 +189,6 @@ ...@@ -189,23 +189,6 @@
</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/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> <build>
<defaultGoal>test</defaultGoal> <defaultGoal>test</defaultGoal>
<plugins> <plugins>
......
...@@ -45,19 +45,19 @@ ...@@ -45,19 +45,19 @@
<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/74/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/74/packages/maven</url> <url>${publish.snapshots.url}</url>
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
...@@ -71,4 +71,23 @@ ...@@ -71,4 +71,23 @@
</dependencies> </dependencies>
</dependencyManagement> </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> </project>
...@@ -134,24 +134,6 @@ ...@@ -134,24 +134,6 @@
</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/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> <build>
<plugins> <plugins>
<plugin> <plugin>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<artifactId>legal-service</artifactId> <artifactId>legal-service</artifactId>
<groupId>org.opengroup.osdu.legal</groupId> <groupId>org.opengroup.osdu.legal</groupId>
<version>0.0.5-SNAPSHOT</version> <version>0.0.5-SNAPSHOT</version>
<relativePath>../..</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
...@@ -140,24 +140,6 @@ ...@@ -140,24 +140,6 @@
</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/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> <build>
<plugins> <plugins>
<plugin> <plugin>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<artifactId>legal-service</artifactId> <artifactId>legal-service</artifactId>
<groupId>org.opengroup.osdu.legal</groupId> <groupId>org.opengroup.osdu.legal</groupId>
<version>0.0.5-SNAPSHOT</version> <version>0.0.5-SNAPSHOT</version>
<relativePath>../..</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
...@@ -64,24 +64,6 @@ ...@@ -64,24 +64,6 @@
</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/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> <build>
<plugins> <plugins>
<plugin> <plugin>
......
...@@ -138,6 +138,7 @@ Execute following command to build code and run all the integration tests: ...@@ -138,6 +138,7 @@ Execute following command to build code and run all the integration tests:
```bash ```bash
# Note: this assumes that the environment variables for integration tests as outlined # Note: this assumes that the environment variables for integration tests as outlined
# above are already exported in your environment. # above are already exported in your environment.
$ (cd testing/legal-test-core/ && mvn clean install)
$ (cd testing/legal-test-gcp/ && mvn clean test) $ (cd testing/legal-test-gcp/ && mvn clean test)
``` ```
......
...@@ -3,11 +3,12 @@ ...@@ -3,11 +3,12 @@
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> <parent>
<groupId>org.opengroup.osdu.legal</groupId> <artifactId>legal-service</artifactId>
<artifactId>legal-service</artifactId> <groupId>org.opengroup.osdu.legal</groupId>
<version>0.0.5-SNAPSHOT</version> <version>0.0.5-SNAPSHOT</version>
</parent> <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId> <groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-gcp</artifactId> <artifactId>legal-gcp</artifactId>
...@@ -16,24 +17,6 @@ ...@@ -16,24 +17,6 @@
<name>legal-gcp</name> <name>legal-gcp</name>
<description>Legal service Google App Engine flex</description> <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> <dependencies>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
......
...@@ -16,25 +16,6 @@ ...@@ -16,25 +16,6 @@
<os-core-lib-ibm.version>0.3.6-SNAPSHOT</os-core-lib-ibm.version> <os-core-lib-ibm.version>0.3.6-SNAPSHOT</os-core-lib-ibm.version>
</properties> </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> <dependencies>
<dependency> <dependency>
<groupId>org.opengroup.osdu.legal</groupId> <groupId>org.opengroup.osdu.legal</groupId>
......
...@@ -19,6 +19,13 @@ ...@@ -19,6 +19,13 @@
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.legal</groupId>
<artifactId>os-legal-testing</artifactId>
<version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId> <groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-aws</artifactId> <artifactId>legal-test-aws</artifactId>
<version>0.0.2-SNAPSHOT</version> <version>0.0.2-SNAPSHOT</version>
...@@ -114,24 +121,6 @@ ...@@ -114,24 +121,6 @@
</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/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> <build>
<plugins> <plugins>
<plugin> <plugin>
......
...@@ -20,6 +20,13 @@ ...@@ -20,6 +20,13 @@
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.legal</groupId>
<artifactId>os-legal-testing</artifactId>
<version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId> <groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-azure</artifactId> <artifactId>legal-test-azure</artifactId>
<version>0.0.2-SNAPSHOT</version> <version>0.0.2-SNAPSHOT</version>
...@@ -85,24 +92,6 @@ ...@@ -85,24 +92,6 @@
</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/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> <build>
<plugins> <plugins>
<plugin> <plugin>
......
...@@ -18,6 +18,14 @@ ...@@ -18,6 +18,14 @@
xmlns="http://maven.apache.org/POM/4.0.0" 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"> 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.legal</groupId>
<artifactId>os-legal-testing</artifactId>
<version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId> <groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-core</artifactId> <artifactId>legal-test-core</artifactId>
<version>0.0.2-SNAPSHOT</version> <version>0.0.2-SNAPSHOT</version>
...@@ -53,24 +61,6 @@ ...@@ -53,24 +61,6 @@
</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/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> <build>
<plugins> <plugins>
<plugin> <plugin>
......
...@@ -20,6 +20,13 @@ ...@@ -20,6 +20,13 @@
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.legal</groupId>
<artifactId>os-legal-testing</artifactId>
<version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId> <groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-gcp</artifactId> <artifactId>legal-test-gcp</artifactId>
<version>0.0.2-SNAPSHOT</version> <version>0.0.2-SNAPSHOT</version>
...@@ -145,26 +152,6 @@ ...@@ -145,26 +152,6 @@
</dependency> </dependency>
</dependencies> </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> <build>
<defaultGoal>test</defaultGoal> <defaultGoal>test</defaultGoal>
<plugins> <plugins>
......
...@@ -12,6 +12,14 @@ ...@@ -12,6 +12,14 @@
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.legal</groupId>
<artifactId>os-legal-testing</artifactId>
<version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId> <groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-ibm</artifactId> <artifactId>legal-test-ibm</artifactId>
<version>0.0.2-SNAPSHOT</version> <version>0.0.2-SNAPSHOT</version>
...@@ -46,24 +54,6 @@ ...@@ -46,24 +54,6 @@
</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/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> <build>
<plugins> <plugins>
<plugin> <plugin>
......
...@@ -41,20 +41,39 @@ ...@@ -41,20 +41,39 @@
<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/74/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/74/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/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> </project>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment