From ffa1f2ea61f4c4a19c137261abdd0884f7983441 Mon Sep 17 00:00:00 2001
From: "Smokowski, Steve (ss835w)" <ss835w@us.att.com>
Date: Tue, 7 Aug 2018 08:37:49 -0400
Subject: Upgrade CXF

Upgrade to latest version of CXF for Security Report


Issue-ID: SO-807
Change-Id: I7f61fa3fd5f8a41c0654dd03314f0b6f4835b100


Change-Id: I7f61fa3fd5f8a41c0654dd03314f0b6f4835b100
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
---
 adapters/mso-openstack-adapters/pom.xml    |  6 +++---
 adapters/mso-requests-db-adapter/pom.xml   | 14 +++++++-------
 adapters/mso-sdnc-adapter/pom.xml          |  6 +++---
 adapters/mso-vfc-adapter/pom.xml           |  6 +++---
 bpmn/so-bpmn-infrastructure-common/pom.xml |  6 +++---
 bpmn/so-bpmn-infrastructure-flows/pom.xml  |  6 +++---
 common/pom.xml                             |  2 +-
 pom.xml                                    |  4 ++--
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml
index 5f5da85a88..47b65a11de 100644
--- a/adapters/mso-openstack-adapters/pom.xml
+++ b/adapters/mso-openstack-adapters/pom.xml
@@ -194,17 +194,17 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
-   		 	<version>3.1.12</version>
+   		 	<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
-			<version>3.1.12</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
     		<groupId>org.apache.cxf</groupId>
     		<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-    		<version>3.1.11</version>
+    		<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
             <groupId>org.webjars</groupId>
diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml
index 175e7fbd19..934e2a544f 100644
--- a/adapters/mso-requests-db-adapter/pom.xml
+++ b/adapters/mso-requests-db-adapter/pom.xml
@@ -35,17 +35,17 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
-			<version>3.1.12</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
-			<version>3.1.12</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-			<version>3.1.11</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -118,17 +118,17 @@
 			<plugin>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-java2ws-plugin</artifactId>
-				<version>3.1.12</version>
+				<version>${cxf.version}</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.apache.cxf</groupId>
 						<artifactId>cxf-rt-frontend-jaxws</artifactId>
-						<version>3.1.12</version>
+						<version>${cxf.version}</version>
 					</dependency>
 					<dependency>
 						<groupId>org.apache.cxf</groupId>
 						<artifactId>cxf-rt-frontend-simple</artifactId>
-						<version>3.1.12</version>
+						<version>${cxf.version}</version>
 					</dependency>
 				</dependencies>
 				<executions>
@@ -213,7 +213,7 @@
 											cxf-java2ws-plugin
 										</artifactId>
 										<versionRange>
-											[3.1.12,)
+											[3.2.5,)
 										</versionRange>
 										<goals>
 											<goal>java2ws</goal>
diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml
index 7a051990bf..0337c2613e 100644
--- a/adapters/mso-sdnc-adapter/pom.xml
+++ b/adapters/mso-sdnc-adapter/pom.xml
@@ -121,17 +121,17 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
-			<version>3.1.12</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
-			<version>3.1.12</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-			<version>3.1.11</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/adapters/mso-vfc-adapter/pom.xml b/adapters/mso-vfc-adapter/pom.xml
index 9392db2a2a..d416c8e1e2 100644
--- a/adapters/mso-vfc-adapter/pom.xml
+++ b/adapters/mso-vfc-adapter/pom.xml
@@ -70,17 +70,17 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
-			<version>3.1.12</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
-			<version>3.1.12</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-			<version>3.1.11</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/bpmn/so-bpmn-infrastructure-common/pom.xml b/bpmn/so-bpmn-infrastructure-common/pom.xml
index aa7f118673..cef811b71d 100644
--- a/bpmn/so-bpmn-infrastructure-common/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-common/pom.xml
@@ -134,17 +134,17 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
-			<version>3.1.12</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
-			<version>3.1.12</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-			<version>3.1.11</version>
+			<version>${cxf.version}</version>
 		</dependency>	
 		<dependency>
 			<groupId>com.h2database</groupId>
diff --git a/bpmn/so-bpmn-infrastructure-flows/pom.xml b/bpmn/so-bpmn-infrastructure-flows/pom.xml
index ee51ecd66e..529364f7d2 100644
--- a/bpmn/so-bpmn-infrastructure-flows/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-flows/pom.xml
@@ -145,17 +145,17 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
-			<version>3.1.12</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
-			<version>3.1.12</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-			<version>3.1.11</version>
+			<version>${cxf.version}</version>
 		</dependency>	
 		<dependency>
 			<groupId>com.h2database</groupId>
diff --git a/common/pom.xml b/common/pom.xml
index 8a5f5a2e37..4729510640 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -102,7 +102,7 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-client</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.1.12</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 9e90883498..a052c6df02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,8 +47,7 @@
 		<org.apache.maven.user-settings></org.apache.maven.user-settings>
 		<openstack.version>1.2.2</openstack.version>
 		<maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
-		<springboot.version>1.5.13.RELEASE</springboot.version>
-		<cxf.version>3.1.12</cxf.version>
+		<springboot.version>1.5.13.RELEASE</springboot.version>	
 		<originalClassifier>original</originalClassifier>
 		<docker.skip>true</docker.skip>
 		<docker.skip.build>true</docker.skip.build>
@@ -63,6 +62,7 @@
 		<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
 		<publicNexusPath>content/repositories/public/</publicNexusPath>
 		<siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath>
+		<cxf.version>3.2.5</cxf.version>
 	</properties>
 	<distributionManagement>
 		<repository>
-- 
cgit 1.2.3-korg