Upgrade Vulnerable Direct Dependencies [many]

[sdc.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 1eb531c..7bbdf53 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ Modifications copyright (c) 2018-2019 Nokia
 
     <groupId>org.openecomp.sdc</groupId>
     <artifactId>sdc-main</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>sdc</name>
 
@@ -49,14 +49,14 @@ Modifications copyright (c) 2018-2019 Nokia
         <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>
+        <netty.version>4.1.48.Final</netty.version>
         <servlet-api.version>3.1.0</servlet-api.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>
         <lombok.version>1.18.12</lombok.version>
-        <commons-beanutils>1.9.3</commons-beanutils>
+        <commons-beanutils>1.9.4</commons-beanutils>
         <commons-configuration>2.3</commons-configuration>
         <apache-poi.version>4.1.0</apache-poi.version>
         <onap.logging.version>1.6.1</onap.logging.version>
@@ -66,12 +66,12 @@ Modifications copyright (c) 2018-2019 Nokia
 
         <jetty.version>9.4.18.v20190429</jetty.version>
 
-        <!-- JSON and YAML Parsing -->
-        <jackson.version>2.10.0</jackson.version>
-        <jackson-annotations.version>${jackson.version}</jackson-annotations.version>
-        <jackson.mapper.version>1.9.13</jackson.mapper.version>
-        <clearspring.version>2.1.1</clearspring.version>
-        <skipYamlJsonValidator>false</skipYamlJsonValidator>
+    <!-- JSON and YAML Parsing -->
+    <jackson.version>2.11.0</jackson.version>
+    <jackson-annotations.version>${jackson.version}</jackson-annotations.version>
+
+    <clearspring.version>2.1.1</clearspring.version>
+    <skipYamlJsonValidator>false</skipYamlJsonValidator>
 
         <!-- Yaml for properties -->
         <snakeyaml.version>1.14</snakeyaml.version>
@@ -115,7 +115,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <junit.platform.version>1.6.0</junit.platform.version>
         <junitJupiter.version>5.6.0</junitJupiter.version>
         <assertj.version>3.16.0</assertj.version>
-        <testng.version>6.14.3</testng.version>
+        <testng.version>7.2.0</testng.version>
         <cucumber.version>5.6.0</cucumber.version>
         <bean-matchers.version>0.11</bean-matchers.version>
         <hamcrest.version>2.1</hamcrest.version>
@@ -146,7 +146,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <nexus.id.snapshot>nexus</nexus.id.snapshot>
 
         <!--nexus-->
-        <npm.registry>https://nexus3.onap.org/repository/npm.public/</npm.registry>
+        <npm.registry>https://registry.npmjs.org/</npm.registry>
         <nexus.proxy>https://nexus.onap.org</nexus.proxy>
         <sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath>
         <staging.profile.id>176c31dfe190a</staging.profile.id>
@@ -155,7 +155,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <!--docker tags-->
         <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
         <!--togglz version-->
-        <togglz.version>2.4.1.Final</togglz.version>
+        <togglz.version>2.6.1.Final</togglz.version>
 
         <joda.time.version>2.9.9</joda.time.version>
 
@@ -163,8 +163,11 @@ Modifications copyright (c) 2018-2019 Nokia
         <security.util.lib.version>1.6.0</security.util.lib.version>
         <!--jacoco-->
         <jacoco.version>0.8.5</jacoco.version>
-
         <java.driver.core.version>4.5.1</java.driver.core.version>
+
+        <!-- Surefire parameters  -->
+        <surefire.forkCount>1C</surefire.forkCount>
+        <surefire.reuseForks>true</surefire.reuseForks>
     </properties>
 
     <dependencyManagement>
@@ -513,6 +516,9 @@ Modifications copyright (c) 2018-2019 Nokia
                     <systemPropertyVariables>
                         <jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
                     </systemPropertyVariables>
+                    <forkCount>${surefire.forkCount}</forkCount>
+                    <reuseForks>${surefire.reuseForks}</reuseForks>
+                    <parallel>methods</parallel>
                 </configuration>
             </plugin>
             <plugin>
@@ -567,6 +573,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <module>catalog-dao</module>
                 <module>catalog-model</module>
                 <module>catalog-be</module>
+                <module>catalog-be-plugins</module>
                 <module>asdctool</module>
                 <module>catalog-ui</module>
                 <module>catalog-fe</module>
@@ -575,6 +582,32 @@ Modifications copyright (c) 2018-2019 Nokia
                 <module>integration-tests</module>
             </modules>
         </profile>
+        <profile>
+            <id>skip-integration-tests</id>
+            <activation>
+                <property>
+                    <name>skipITs</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <properties>
+                <checkstyle.skip>true</checkstyle.skip>
+            </properties>
+            <modules>
+                <module>onboarding</module>
+                <module>common-app-logging</module>
+                <module>common-app-api</module>
+                <module>common-be</module>
+                <module>catalog-dao</module>
+                <module>catalog-model</module>
+                <module>catalog-be</module>
+                <module>asdctool</module>
+                <module>catalog-ui</module>
+                <module>catalog-fe</module>
+                <module>sdc-os-chef</module>
+                <module>utils/webseal-simulator</module>
+            </modules>
+        </profile>
         <profile>
             <id>fast-build</id>
             <activation>
@@ -591,6 +624,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <module>common-app-logging</module>
                 <module>common-app-api</module>
                 <module>common-be</module>
+                <module>catalog-be-plugins</module>
                 <module>catalog-dao</module>
                 <module>catalog-model</module>
                 <module>catalog-be</module>
@@ -611,6 +645,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <skipYamlJsonValidator>true</skipYamlJsonValidator>
                 <checkstyle.skip>true</checkstyle.skip>
                 <jacoco.skip>true</jacoco.skip>
+                <docker.keepRunning>true</docker.keepRunning>
             </properties>
             <modules>
                 <module>integration-tests</module>
@@ -646,7 +681,6 @@ Modifications copyright (c) 2018-2019 Nokia
                 <module>integration-tests</module>
             </modules>
         </profile>
-
     </profiles>
 
     <repositories>