Merge "Fix the Jar vulnerability and licensing"

10 files changed, 40 insertions, 9 deletions

diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml
index 582d1eafe3..51d9092472 100644
--- a/adapters/mso-requests-db-adapter/pom.xml
+++ b/adapters/mso-requests-db-adapter/pom.xml
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>org.jboss.resteasy</groupId>
 			<artifactId>resteasy-jaxrs</artifactId>
-			<version>3.0.19.Final</version>
+			<version>3.5.0.Final</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
diff --git a/adapters/mso-workflow-message-adapter/pom.xml b/adapters/mso-workflow-message-adapter/pom.xml
index 46e4a2bc13..dd17fe87e8 100644
--- a/adapters/mso-workflow-message-adapter/pom.xml
+++ b/adapters/mso-workflow-message-adapter/pom.xml
@@ -55,7 +55,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.5.2</version>
+			<version>4.5.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.onap.so</groupId>
diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index 75896d28bc..66ecbd8a5e 100644
--- a/asdc-controller/pom.xml
+++ b/asdc-controller/pom.xml
@@ -81,7 +81,7 @@
 		<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpclient</artifactId>
-				<version>4.4.1</version>
+				<version>4.5.5</version>
 				<scope>compile</scope>
 				<exclusions>
        		 		<exclusion>  
diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 6067982b99..a0a5a24e3f 100644
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -348,7 +348,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
-			<version>${spring.version}</version>
+			<version>4.3.14.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openecomp.sdc.sdc-tosca</groupId>
diff --git a/bpmn/MSOCoreBPMN/pom.xml b/bpmn/MSOCoreBPMN/pom.xml
index 690dd5414a..2f9d574ae1 100644
--- a/bpmn/MSOCoreBPMN/pom.xml
+++ b/bpmn/MSOCoreBPMN/pom.xml
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.3.2</version>
+            <version>1.3.3</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/bpmn/MSOInfrastructureBPMN/pom.xml b/bpmn/MSOInfrastructureBPMN/pom.xml
index 79d3c4fa72..f7170ff231 100644
--- a/bpmn/MSOInfrastructureBPMN/pom.xml
+++ b/bpmn/MSOInfrastructureBPMN/pom.xml
@@ -342,6 +342,31 @@
 			</exclusions>

 		</dependency>

 

+		<!-- bwj add; Jetty-util -->

+		<dependency>

+			<groupId>org.eclipse.jetty</groupId>

+			<artifactId>jetty-util</artifactId>

+			<version>9.4.8.v20171121</version>

+		</dependency>

+		<!-- bwj add; hibernate-validator -->

+		<dependency>

+			<groupId>org.hibernate</groupId>

+			<artifactId>hibernate-validator</artifactId>

+			<version>5.4.2.Final</version>

+		</dependency>

+		<!-- bwj add; spring-test -->

+		<dependency>

+			<groupId>org.springframework</groupId>

+			<artifactId>spring-test</artifactId>

+			<version>4.3.14.RELEASE</version>

+		</dependency>

+		<!-- bwj add; libphonenumber  -->

+		<dependency>

+			<groupId>com.googlecode.libphonenumber</groupId>

+			<artifactId>libphonenumber</artifactId>

+			<version>8.9.1</version>

+		</dependency>

+

 		<!--for yang tools-->

 <!--		<dependency>

 			<groupId>org.onap.so</groupId>

diff --git a/cloudify-client/pom.xml b/cloudify-client/pom.xml
index f87ee3ccd9..61798c3462 100644
--- a/cloudify-client/pom.xml
+++ b/cloudify-client/pom.xml
@@ -40,7 +40,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.3.1</version>
+			<version>4.5.5</version>
 		</dependency>
         <dependency>
             <groupId>commons-lang</groupId>
diff --git a/common/pom.xml b/common/pom.xml
index 4d2d66a6bf..aeef257d48 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -31,12 +31,12 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.1.1</version>
+            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
-            <version>1.1.1</version>
+            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml
index 6ee9003e77..a88c9b68ea 100644
--- a/mso-api-handlers/mso-api-handler-infra/pom.xml
+++ b/mso-api-handlers/mso-api-handler-infra/pom.xml
@@ -109,6 +109,12 @@
 			<artifactId>scala-library</artifactId>
 			<version>${scala-lang-version}</version>
 		</dependency>
+		<!--bwj added scala-compiler-->
+		<dependency>
+			<groupId>org.scala-lang</groupId>
+			<artifactId>scala-compiler</artifactId>
+			<version>2.12.4</version>
+		</dependency>
 		<dependency>
 			<groupId>org.reflections</groupId>
 			<artifactId>reflections</artifactId>
diff --git a/pom.xml b/pom.xml
index 1383aa1167..77dfe7a49c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -543,7 +543,7 @@
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
-        <version>4.5</version>
+        <version>4.5.5</version>
         <scope>compile</scope>
       </dependency>
       <dependency>