summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--asdctool/pom.xml14
-rw-r--r--catalog-be/pom.xml6
-rw-r--r--common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml13
-rw-r--r--onboarding/pom.xml6
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml6
-rw-r--r--openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml5
-rw-r--r--openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml5
-rw-r--r--openecomp-be/lib/openecomp-common-lib/pom.xml4
-rw-r--r--openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml5
-rw-r--r--openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml5
-rw-r--r--openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml5
-rw-r--r--openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-api/pom.xml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml5
-rw-r--r--openecomp-be/pom.xml38
-rw-r--r--openecomp-be/tools/zusammen-tools/pom.xml5
-rw-r--r--pom.xml5
-rw-r--r--ui-ci/pom.xml2
20 files changed, 36 insertions, 113 deletions
diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 88a372f0df..bcc1331c32 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -492,6 +492,12 @@
<artifactId>testng-junit5</artifactId>
<version>0.0.1</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-engine</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -506,14 +512,6 @@
<version>${bean-matchers.version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>com.github.stefanbirkner</groupId>
- <artifactId>system-rules</artifactId>
- <version>1.19.0</version>
- <scope>test</scope>
- </dependency>
-
<!-- testing end -->
<dependency>
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index cc11b13069..61a40e4ee2 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -27,12 +27,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>3.3.1</version>
- </dependency>
-
<!--JSON and YAML Parsing-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml
index 59e8ed06ed..4efc32fc99 100644
--- a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml
+++ b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml
@@ -60,19 +60,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>${junitJupiter.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
- <version>${mockitoJupiter.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/onboarding/pom.xml b/onboarding/pom.xml
index 8b487407aa..4f3c192c20 100644
--- a/onboarding/pom.xml
+++ b/onboarding/pom.xml
@@ -291,12 +291,6 @@
<artifactId>wiremock</artifactId>
<version>${wire-mock.version}</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml
index c38c7d47ca..df5bcee691 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml
@@ -66,11 +66,7 @@
<artifactId>httpcore</artifactId>
<version>${http.core.version}</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
+
<!-- Java Stuff -->
<dependency>
<groupId>javax.inject</groupId>
diff --git a/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml
index b5f5967d42..0de9b66439 100644
--- a/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml
+++ b/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml
@@ -35,11 +35,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-core</artifactId>
<version>${project.version}</version>
diff --git a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml
index e872f95829..3a6d01c8c3 100644
--- a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml
+++ b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml
@@ -71,11 +71,6 @@
<artifactId>openecomp-sdc-notification-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/openecomp-be/lib/openecomp-common-lib/pom.xml b/openecomp-be/lib/openecomp-common-lib/pom.xml
index 647675f840..041b75899e 100644
--- a/openecomp-be/lib/openecomp-common-lib/pom.xml
+++ b/openecomp-be/lib/openecomp-common-lib/pom.xml
@@ -67,10 +67,6 @@
<version>${zusammen.version}</version>
</dependency>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </dependency>
- <dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml
index 54e50b5952..559e61cd00 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml
@@ -35,11 +35,6 @@
<artifactId>openecomp-nosqldb-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml
index 6b13421925..52c69625da 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml
@@ -62,11 +62,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml
index c19c10dc14..3893aa86ef 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml
@@ -29,11 +29,6 @@
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml
index 53694d85a8..32beb98afb 100644
--- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml
+++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml
@@ -22,10 +22,5 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml
index bbb3cccc49..dc2c568f88 100644
--- a/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml
@@ -58,10 +58,5 @@
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-api/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-api/pom.xml
index d378eb57fe..2385e88ac2 100644
--- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-api/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-api/pom.xml
@@ -33,11 +33,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml
index 8798968f46..aea5b398af 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml
@@ -74,11 +74,6 @@
<artifactId>openecomp-heat-lib</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml
index a990c15e4b..4ab5f39626 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml
@@ -20,11 +20,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-validation-api</artifactId>
<version>${project.version}</version>
diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml
index b08ede41da..723d8d23f2 100644
--- a/openecomp-be/pom.xml
+++ b/openecomp-be/pom.xml
@@ -34,10 +34,36 @@
<dependencies>
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>${testng.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.github.testng-team</groupId>
<artifactId>testng-junit5</artifactId>
<version>0.0.1</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-engine</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -62,18 +88,6 @@
<version>${togglz.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>${junitJupiter.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
- <version>${mockitoJupiter.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml
index b5414ed0e5..331ebb9815 100644
--- a/openecomp-be/tools/zusammen-tools/pom.xml
+++ b/openecomp-be/tools/zusammen-tools/pom.xml
@@ -90,11 +90,6 @@
<artifactId>commons-cli</artifactId>
<version>1.4</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index fb28bbcec5..9bbb733c71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,6 @@ Modifications copyright (c) 2018-2019 Nokia
<jackson.mapper.version>1.9.13</jackson.mapper.version>
<clearspring.version>2.1.1</clearspring.version>
<skipYamlJsonValidator>false</skipYamlJsonValidator>
- <skipCheckstyle>false</skipCheckstyle>
<!-- Yaml for properties -->
<snakeyaml.version>1.14</snakeyaml.version>
@@ -406,7 +405,7 @@ Modifications copyright (c) 2018-2019 Nokia
<configuration>
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
- <skip>${skipCheckstyle}</skip>
+ <skip>${checkstyle.skip}</skip>
</configuration>
</plugin>
<!-- plugin for parsing the project version -->
@@ -629,7 +628,7 @@ Modifications copyright (c) 2018-2019 Nokia
<properties>
<maven.test.skip>true</maven.test.skip>
<skipYamlJsonValidator>true</skipYamlJsonValidator>
- <skipCheckstyle>true</skipCheckstyle>
+ <checkstyle.skip>true</checkstyle.skip>
<jacoco.skip>true</jacoco.skip>
</properties>
<modules>
diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index 75d91ce436..54933dc019 100644
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -218,7 +218,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.11</version>
+ <version>${testng.version}</version>
<scope>compile</scope>
</dependency>