From a1bd235fffc7c0685800b6f3d8289d143baa87d6 Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Wed, 6 May 2020 23:57:53 +0100
Subject: [PATCH] Reduce scope from 'compile' to 'test' for
 'junit-vintage-engine'

Change-Id: I39b0be6ba6650c9a7215acf359f3d74e0a24e553
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-2844
Issue-ID: SDC-2983
---
 asdctool/pom.xml                                        |  1 +
 catalog-be/pom.xml                                      |  7 +------
 catalog-dao/pom.xml                                     |  1 +
 catalog-fe/pom.xml                                      |  1 +
 catalog-model/pom.xml                                   |  1 +
 common-app-api/pom.xml                                  |  1 +
 common-app-logging/pom.xml                              |  1 +
 common-be/pom.xml                                       |  1 +
 .../onap-configuration-management-api/pom.xml           |  1 +
 .../onap-configuration-management-core/pom.xml          |  1 +
 .../pom.xml                                             |  1 +
 .../onap-generic-artifact-browser-service/pom.xml       |  1 +
 common/onap-tosca-datatype/pom.xml                      |  1 +
 .../item-rest/item-rest-services/pom.xml                |  2 +-
 .../vnf-repository-rest-services/pom.xml                |  2 +-
 openecomp-be/pom.xml                                    |  1 +
 pom.xml                                                 | 17 ++++++++---------
 ui-ci/pom.xml                                           |  1 +
 utils/DmaapPublisher/pom.xml                            |  1 +
 utils/webseal-simulator/pom.xml                         |  1 +
 20 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index d512cfdca7..e6ff5c6221 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -25,6 +25,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 6325f6cef7..27c48498dd 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -33,6 +33,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <!--JSON and YAML Parsing-->
@@ -566,12 +567,6 @@
       <version>${jersey-bom.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-standalone</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index 8293a53e68..ba2ec97c3b 100644
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -46,6 +46,7 @@ Modifications copyright (c) 2018 Nokia
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <!-- Common of SDC -->
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 777766b43f..3781bb59e3 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -25,6 +25,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index f7d5b34dc0..5fd10f7316 100644
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -26,6 +26,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <!-- Common of SDC -->
diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml
index 86a334749a..210a9b25a6 100644
--- a/common-app-api/pom.xml
+++ b/common-app-api/pom.xml
@@ -25,6 +25,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
diff --git a/common-app-logging/pom.xml b/common-app-logging/pom.xml
index 201158abfc..19dc8bb4d0 100644
--- a/common-app-logging/pom.xml
+++ b/common-app-logging/pom.xml
@@ -25,6 +25,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
diff --git a/common-be/pom.xml b/common-be/pom.xml
index 672d0a211b..f08154f707 100644
--- a/common-be/pom.xml
+++ b/common-be/pom.xml
@@ -25,6 +25,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <!-- Common of SD&C -->
diff --git a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml
index 10d0614375..2981a6bdc4 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml
@@ -26,6 +26,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml
index 22e858149a..eed797829e 100755
--- a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml
@@ -42,6 +42,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
diff --git a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml
index 2ce32b8c66..bdfa1507c5 100644
--- a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml
+++ b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml
@@ -25,6 +25,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <!--tested packages-->
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 2e880295f7..5056341e29 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
@@ -31,6 +31,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
diff --git a/common/onap-tosca-datatype/pom.xml b/common/onap-tosca-datatype/pom.xml
index 5d3e55a56b..6292c561c1 100644
--- a/common/onap-tosca-datatype/pom.xml
+++ b/common/onap-tosca-datatype/pom.xml
@@ -41,6 +41,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml
index c222c2f7f8..205f92502c 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock-standalone</artifactId>
-      <version>2.6.0</version>
+      <version>${wire-mock.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml
index ffb2a7cdf0..44ea11c091 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock-standalone</artifactId>
-      <version>2.6.0</version>
+      <version>${wire-mock.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml
index 2202ee308a..e2bb0bc818 100644
--- a/openecomp-be/pom.xml
+++ b/openecomp-be/pom.xml
@@ -45,6 +45,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index fad19f74f9..c7e972ac53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,14 +44,14 @@ Modifications copyright (c) 2018-2019 Nokia
 
     <!-- 3rd parties versions -->
     <bean-matcher.version>0.11</bean-matcher.version>
-    <lang3.version>3.3.2</lang3.version>
+    <lang3.version>3.10</lang3.version>
     <guava.version>18.0</guava.version>
     <janusgraph.version>0.3.1</janusgraph.version>
     <spring.version>4.3.18.RELEASE</spring.version>
     <jersey-bom.version>2.27</jersey-bom.version>
     <netty.version>4.1.36.Final</netty.version>
     <servlet-api.version>3.1.0</servlet-api.version>
-    <wire-mock.version>2.18.0</wire-mock.version>
+    <wire-mock.version>2.26.3</wire-mock.version>
     <ecomp.version>2.6.0</ecomp.version>
     <cassandra.unit.version>4.3.1.0</cassandra.unit.version>
     <cadi.version>2.1.8</cadi.version>
@@ -113,7 +113,7 @@ Modifications copyright (c) 2018-2019 Nokia
     <junit.version>4.12</junit.version>
     <junit.platform.version>1.6.0</junit.platform.version>
     <junitJupiter.version>5.6.0</junitJupiter.version>
-    <assertj.version>3.10.0</assertj.version>
+    <assertj.version>3.16.0</assertj.version>
     <testng.version>6.14.3</testng.version>
     <cucumber.version>5.6.0</cucumber.version>
     <bean-matchers.version>0.11</bean-matchers.version>
@@ -206,7 +206,6 @@ Modifications copyright (c) 2018-2019 Nokia
         <version>${jmockit.version}</version>
       </dependency>
 
-
       <dependency>
         <groupId>com.github.tomakehurst</groupId>
         <artifactId>wiremock-standalone</artifactId>
@@ -465,12 +464,12 @@ Modifications copyright (c) 2018-2019 Nokia
             <configuration>
               <source>
                 pom.properties['deploy.url'] =
-                pom.version.contains('-SNAPSHOT') ?
-                project.distributionManagement.snapshotRepository.url :
-                project.distributionManagement.repository.url;
+                  pom.version.contains('-SNAPSHOT') ?
+                    project.distributionManagement.snapshotRepository.url :
+                    project.distributionManagement.repository.url;
                 pom.properties['repo.id'] = pom.version.contains('-SNAPSHOT') ?
-                project.distributionManagement.snapshotRepository.id :
-                project.distributionManagement.repository.id;
+                  project.distributionManagement.snapshotRepository.id :
+                  project.distributionManagement.repository.id;
               </source>
             </configuration>
           </execution>
diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index 56c8de92e2..da09985cca 100644
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -32,6 +32,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
diff --git a/utils/DmaapPublisher/pom.xml b/utils/DmaapPublisher/pom.xml
index 45db7443f5..b2b013e2a2 100644
--- a/utils/DmaapPublisher/pom.xml
+++ b/utils/DmaapPublisher/pom.xml
@@ -24,6 +24,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <!--spock testing-->
diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index f446e28afe..0c7bd25594 100644
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -36,6 +36,7 @@
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
       <version>${junitJupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
-- 
2.16.6