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>

diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml
index 5f5da85..47b65a1 100644 (file)
--- 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 175e7fb..934e2a5 100644 (file)
--- 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 7a05199..0337c26 100644 (file)
--- 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 9392db2..d416c8e 100644 (file)
--- 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 aa7f118..cef811b 100644 (file)
--- 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 ee51ecd..529364f 100644 (file)
--- 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 8a5f5a2..4729510 100644 (file)
--- 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 9e90883..a052c6d 100644 (file)
--- 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>