X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=huawei%2Fvnfmadapter%2FVnfmadapterService%2Fservice%2Fpom.xml;h=94164607a22984ff0ba987965535d9cd097c0d52;hb=588272759296eaa280a42b175dc2ff7af76b9009;hp=51db3044975d0dff784319119450356570524240;hpb=f7fa0ad4ea341b198b038c8bac1a4ee19a367f99;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
index 51db3044..94164607 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
+++ b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
@@ -20,13 +20,15 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId>
         <artifactId>vnfmadapter-service-root</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>vnfmadapter-service</artifactId>
     <name>vfc/nfvo/drivers/vnfm/svnfm/huawei/vnfmadapter/VnfmadapterService/service</name>
     <packaging>war</packaging>
-
+    <properties>
+        <java.version>11</java.version>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.powermock</groupId>
@@ -71,7 +73,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>com.springsource.org.apache.commons.codec</artifactId>
-            <version>1.3.0</version>
+            <version>1.6.0</version>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
@@ -101,11 +103,36 @@
             <version>3.0.0.v201112011016</version>
             <scope>provided</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-http -->
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-http</artifactId>
+            <version>9.4.13.v20181111</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-client -->
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-client</artifactId>
+            <version>9.4.13.v20181111</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-util -->
         <dependency>
-            <groupId>org.eclipse.jetty.aggregate</groupId>
-            <artifactId>jetty-all</artifactId>
-            <version>8.1.16.v20140903</version>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>9.4.13.v20181111</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-io -->
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-io</artifactId>
+            <version>9.4.13.v20181111</version>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>org.eclipse.jetty.aggregate</groupId>-->
+<!--            <artifactId>jetty-all</artifactId>-->
+<!--            <version>8.1.16.v20140903</version>-->
+<!--        </dependency>-->
         <!--
         <dependency>
             <groupId>mysql</groupId>
@@ -118,7 +145,7 @@
             <artifactId>mariadb-java-client</artifactId>
             <version>2.2.2</version>
         </dependency>
-		<dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
             <version>3.1.17</version>
@@ -127,7 +154,7 @@
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
             <version>3.1.17</version>
-			<exclusions>
+            <exclusions>
                 <exclusion>
                     <groupId>org.apache.cxf</groupId>
                     <artifactId>cxf-rt-transports-http</artifactId>
@@ -163,7 +190,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>5.1.5.RELEASE</version>
+            <version>5.2.4.RELEASE</version>
         </dependency>
         <!--dependency>
             <groupId>org.springframework</groupId>
@@ -194,12 +221,12 @@
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-jaxrs</artifactId>
             <version>1.9.13</version>
-            <exclusions>
+            <!--exclusions>
                 <exclusion>
                     <groupId>org.codehaus.jackson</groupId>
                     <artifactId>jackson-mapper-asl</artifactId>
                 </exclusion>
-            </exclusions>
+            </exclusions-->
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -292,9 +319,29 @@
             <artifactId>junit</artifactId>
             <version>4.9</version>
             <scope>test</scope>
-        </dependency>
-        <!-- UT coverage dependency end -->
-
+	    </dependency>
+	    
+		<!-- UT coverage dependency end -->
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>2.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<version>2.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+			<version>1.1.1</version>
+		</dependency>
 
     </dependencies>
 </project>