From b37d16c6ab73af9b83aacbf5ee739b9420e3e1f2 Mon Sep 17 00:00:00 2001
From: "Riabokon Stanislav(EPAM)" <stanislav_riabokon@epam.com>
Date: Mon, 9 Nov 2020 07:48:15 -0500
Subject: [PATCH] GONRG-1035 *Logs for Subscription exception response *Docs
improvement
---
.mvn/community-maven.settings.xml | 26 +++++++++++-----
notification-core/pom.xml | 18 -----------
pom.xml | 41 ++++++++++++++++++-------
provider/notification-aws/pom.xml | 18 -----------
provider/notification-azure/pom.xml | 18 -----------
provider/notification-gcp/pom.xml | 18 -----------
provider/notification-ibm/pom.xml | 18 -----------
testing/notification-test-aws/pom.xml | 26 +++++-----------
testing/notification-test-azure/pom.xml | 26 +++++-----------
testing/notification-test-core/pom.xml | 26 +++++-----------
testing/notification-test-gcp/pom.xml | 26 +++++-----------
testing/notification-test-ibm/pom.xml | 26 +++++-----------
testing/pom.xml | 30 ++++++++++++++----
13 files changed, 113 insertions(+), 204 deletions(-)
diff --git a/.mvn/community-maven.settings.xml b/.mvn/community-maven.settings.xml
index 75718a6d5..aaaed9f20 100644
--- a/.mvn/community-maven.settings.xml
+++ b/.mvn/community-maven.settings.xml
@@ -7,22 +7,34 @@
<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/143/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/143/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/143/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.releases.url>
</properties>
</profile>
</profiles>
diff --git a/notification-core/pom.xml b/notification-core/pom.xml
index 771a747ec..e696ef2a5 100644
--- a/notification-core/pom.xml
+++ b/notification-core/pom.xml
@@ -40,24 +40,6 @@
<springfox-version>2.7.0</springfox-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/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/pom.xml b/pom.xml
index 1140ba250..8f09827e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,13 +67,6 @@
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
-
<modules>
<module>notification-core</module>
<module>provider/notification-gcp</module>
@@ -82,15 +75,41 @@
<module>provider/notification-aws</module>
</modules>
+ <repositories>
+ <repository>
+ <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/143/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/143/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/143/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.releases.url>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
diff --git a/provider/notification-aws/pom.xml b/provider/notification-aws/pom.xml
index 4d2061660..85ddaf9fc 100644
--- a/provider/notification-aws/pom.xml
+++ b/provider/notification-aws/pom.xml
@@ -40,24 +40,6 @@
<aws.version>1.11.637</aws.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/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<!-- <dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/provider/notification-azure/pom.xml b/provider/notification-azure/pom.xml
index 1fb7c1787..bf1bbd055 100644
--- a/provider/notification-azure/pom.xml
+++ b/provider/notification-azure/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/44/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/44/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<plugins>
<plugin>
diff --git a/provider/notification-gcp/pom.xml b/provider/notification-gcp/pom.xml
index 50409e65f..c8fa69b63 100644
--- a/provider/notification-gcp/pom.xml
+++ b/provider/notification-gcp/pom.xml
@@ -38,24 +38,6 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
</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/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/provider/notification-ibm/pom.xml b/provider/notification-ibm/pom.xml
index 4785cb376..6d626fe2c 100644
--- a/provider/notification-ibm/pom.xml
+++ b/provider/notification-ibm/pom.xml
@@ -36,24 +36,6 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
</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/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<!-- <dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/testing/notification-test-aws/pom.xml b/testing/notification-test-aws/pom.xml
index cd41c5328..fa94003e2 100644
--- a/testing/notification-test-aws/pom.xml
+++ b/testing/notification-test-aws/pom.xml
@@ -19,6 +19,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-notification-testing</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu</groupId>
<artifactId>notification-test-aws</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -33,24 +41,6 @@
<os-core-lib-aws.version>0.3.11</os-core-lib-aws.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/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
diff --git a/testing/notification-test-azure/pom.xml b/testing/notification-test-azure/pom.xml
index 0083132f3..f39a6580a 100644
--- a/testing/notification-test-azure/pom.xml
+++ b/testing/notification-test-azure/pom.xml
@@ -19,6 +19,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-notification-testing</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu</groupId>
<artifactId>notification-test-azure</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -32,24 +40,6 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
</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/157/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/157/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.opengroup.osdu.notification</groupId>
diff --git a/testing/notification-test-core/pom.xml b/testing/notification-test-core/pom.xml
index 5d4a558b6..85e44ef78 100644
--- a/testing/notification-test-core/pom.xml
+++ b/testing/notification-test-core/pom.xml
@@ -19,6 +19,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-notification-testing</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu.notification</groupId>
<artifactId>notification-test-core</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -32,24 +40,6 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
</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/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
diff --git a/testing/notification-test-gcp/pom.xml b/testing/notification-test-gcp/pom.xml
index 08c9e8f7d..ef6c4b850 100644
--- a/testing/notification-test-gcp/pom.xml
+++ b/testing/notification-test-gcp/pom.xml
@@ -19,6 +19,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-notification-testing</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu</groupId>
<artifactId>notification-test-gcp</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -32,24 +40,6 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
</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/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.opengroup.osdu.notification</groupId>
diff --git a/testing/notification-test-ibm/pom.xml b/testing/notification-test-ibm/pom.xml
index c34117e97..22d30efd0 100644
--- a/testing/notification-test-ibm/pom.xml
+++ b/testing/notification-test-ibm/pom.xml
@@ -16,6 +16,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-notification-testing</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.opengroup.osdu</groupId>
<artifactId>notification-test-ibm</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -30,24 +38,6 @@
<os-core-lib-ibm.version>0.3.8-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/143/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/143/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/testing/pom.xml b/testing/pom.xml
index 386c93cf7..35c137eed 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -41,20 +41,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/44/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/44/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/143/packages/maven</publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.releases.url>
+ </properties>
+ </profile>
+ </profiles>
</project>
--
GitLab