From 3fdb2cd4e76feb67afa1d7ac1ee1981a09d5932e Mon Sep 17 00:00:00 2001
From: "shashikanth.vh@huawei.com" <shashikanth.vh@huawei.com>
Date: Tue, 22 Mar 2022 16:56:58 +0530
Subject: update the pom version for the security issue fix

Issue-ID: VFC-1929

Signed-off-by: shashikanth.vh@huawei.com <shashikanth.vh@huawei.com>
Change-Id: I36d497f95f6fd8a927103f8b46c77626fcffe922
---
 .../vnfmadapter/VnfmadapterService/service/pom.xml | 34 ++++++++++------------
 .../common/restclient/RestHttpContentExchange.java |  2 +-
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
index 6680746f..05100540 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
+++ b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.4</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -72,9 +72,9 @@
             <version>1.1.1</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>com.springsource.org.apache.commons.codec</artifactId>
-            <version>1.6.0</version>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.15</version>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
@@ -108,7 +108,8 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
-            <version>9.4.13.v20181111</version>
+            <!--version>9.4.13.v20181111</version-->
+            <version>11.0.7</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-client -->
         <dependency>
@@ -120,13 +121,15 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>9.4.13.v20181111</version>
+            <!--version>9.4.13.v20181111</version-->
+            <version>11.0.7</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>
+            <!--version>9.4.13.v20181111</version-->
+            <version>11.0.7</version>
         </dependency>
 
 <!--        <dependency>-->
@@ -170,7 +173,7 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
-            <version>3.2.7</version>
+            <version>3.5.7</version>
         </dependency>
 
         <dependency>
@@ -191,7 +194,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>5.2.4.RELEASE</version>
+            <version>5.3.13</version>
         </dependency>
         <!--dependency>
             <groupId>org.springframework</groupId>
@@ -232,7 +235,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.10.0</version>
+            <version>2.13.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -254,11 +257,6 @@
             <artifactId>spring-tx</artifactId>
             <version>3.1.2.RELEASE</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.3</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient-cache</artifactId>
@@ -280,12 +278,12 @@
             <artifactId>commons-httpclient</artifactId>
             <version>3.1</version>
         </dependency>
-		<dependency>
+	<dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.5</version>
+            <version>4.5.13</version>
         </dependency>
-		<dependency>
+	<dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
             <version>4.4.1</version>
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/RestHttpContentExchange.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/RestHttpContentExchange.java
index 2f116f15..d96690b3 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/RestHttpContentExchange.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/RestHttpContentExchange.java
@@ -161,7 +161,7 @@ public class RestHttpContentExchange  {
             final Enumeration<String> names = field.getFieldNames();
             for (final Enumeration<String> e = names; e.hasMoreElements(); ) {
                 final String fieldName = e.nextElement();
-                final String fieldValue = field.getStringField(fieldName);
+                final String fieldValue = field.getField(fieldName).getValue();
                 header.put(fieldName, fieldValue);
             }
 
-- 
cgit 1.2.3-korg