Merge "Migrate from java 8 to java 11"

[vnfsdk/refrepo.git] / vnfmarket-be / vnf-sdk-marketplace / pom.xml

diff --git a/vnfmarket-be/vnf-sdk-marketplace/pom.xml b/vnfmarket-be/vnf-sdk-marketplace/pom.xml
index 875710f..85376cf 100644 (file)
--- a/vnfmarket-be/vnf-sdk-marketplace/pom.xml
+++ b/vnfmarket-be/vnf-sdk-marketplace/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.onap.vnfsdk.refrepo</groupId>
         <artifactId>vnf-sdk-marketplace-core-parent</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -26,6 +26,7 @@
         <maven.test.skip>false</maven.test.skip>
         <maven.test.failure.ignore>false</maven.test.failure.ignore>
         <swagger-ui.version>3.12.0</swagger-ui.version>
+        <jmockit.version>1.43</jmockit.version>
     </properties>
 
 
@@ -35,7 +36,7 @@
           <dependency>
             <groupId>org.onap.cli</groupId>
             <artifactId>oclip-grpc-client</artifactId>
-            <version>5.0.2</version>
+            <version>5.0.3</version>
           </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -82,6 +83,11 @@
             <version>2.1.0</version>
         </dependency>
 
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+            <version>2.10.0</version>
+        </dependency>
         <!--excluded com.fasterxml.jackson.core:jackson-databind:jar:2.9.5
             CVE-2018-11307-->
         <dependency>
@@ -93,8 +99,28 @@
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-databind</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.dataformat</groupId>
+                    <artifactId>jackson-dataformat-yaml</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>2.9.5</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.yaml</groupId>
+                    <artifactId>snakeyaml</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.26</version>
+        </dependency>
         <!-- jersey -->
 <!-- excluded jetty-util and added invulnerable version -->
         <dependency>
@@ -124,7 +150,7 @@
         <dependency>
            <groupId>commons-codec</groupId>
            <artifactId>commons-codec</artifactId>
-           <version>1.13</version>
+           <version>1.14</version>
         </dependency>
         <!-- jetty -->
 <!-- Updated jetty-util,jetty-http,jetty-servlet and jetty-server
@@ -171,13 +197,23 @@ due to Security Issues:- CVE-2019-10241,CVE-2019-10247,CVE-2019-10246
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.5</version>
+            <version>42.2.13</version>
         </dependency>
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
             <version>3.2.7</version>
         </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>javax.activation-api</artifactId>
+            <version>${javax.activation-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-api.version}</version>
+        </dependency>
         <!-- UT -->
         <dependency>
             <groupId>junit</groupId>
@@ -200,7 +236,7 @@ due to Security Issues:- CVE-2019-10241,CVE-2019-10247,CVE-2019-10246
         <dependency>
             <groupId>org.jmockit</groupId>
             <artifactId>jmockit</artifactId>
-            <version>1.19</version>
+            <version>${jmockit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -242,6 +278,12 @@ due to Security Issues:- CVE-2019-10241,CVE-2019-10247,CVE-2019-10246
                 <skip.unit.tests>false</skip.unit.tests>
             </properties>
         </profile>
+        <profile>
+            <id>docker</id>
+            <properties>
+                <maven.test.skip>true</maven.test.skip>
+            </properties>
+        </profile>
     </profiles>
     <build>
         <finalName>ROOT</finalName>
@@ -253,7 +295,10 @@ due to Security Issues:- CVE-2019-10241,CVE-2019-10247,CVE-2019-10246
                 <version>2.20</version>
                 <configuration>
                     <forkMode>always</forkMode>
-                    <argLine>${surefireArgLine}</argLine>
+                    <argLine>
+                        -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
+                        <!--${surefireArgLine}-->
+                    </argLine>
                     <skip>${maven.test.skip}</skip>
                     <testFailureIgnore>${maven.test.failure.ignore}</testFailureIgnore>
                     <!-- Excludes integration tests when unit tests are run. -->