Update apache cxf

- reference ${cxf.version} placeholder everywhere to make sure
  that there is only one place where the version is defined
  (this updates cxf in the aai-client module (3.2.5 -> 3.4.1)
- update cxf (3.4.1 -> 3.4.10)

Issue-ID: SO-4197
Change-Id: I88e32532dc286a2c1b94fef14e52aa5ceeda3e5b
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml
index 83fa781..53c9e7e 100644 (file)
--- a/adapters/mso-requests-db-adapter/pom.xml
+++ b/adapters/mso-requests-db-adapter/pom.xml
@@ -100,17 +100,17 @@
       <plugin>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-java2ws-plugin</artifactId>
-        <version>3.3.3</version>
+        <version>${cxf.version}</version>
         <dependencies>
           <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.3.3</version>
+            <version>${cxf.version}</version>
           </dependency>
           <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-simple</artifactId>
-            <version>3.3.3</version>
+            <version>${cxf.version}</version>
           </dependency>
           <dependency>
             <groupId>com.sun.xml.ws</groupId>
@@ -235,7 +235,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.cxf</groupId>
                     <artifactId>cxf-java2ws-plugin</artifactId>
-                    <versionRange>[3.2.5,)</versionRange>
+                    <versionRange>[${cxf.version},)</versionRange>
                     <goals>
                       <goal>java2ws</goal>
                     </goals>

diff --git a/graph-inventory/aai-client/pom.xml b/graph-inventory/aai-client/pom.xml
index 18b2a25..41d041d 100644 (file)
--- a/graph-inventory/aai-client/pom.xml
+++ b/graph-inventory/aai-client/pom.xml
@@ -142,7 +142,7 @@
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-client</artifactId>
-      <version>3.2.5</version>
+      <version>${cxf.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>

diff --git a/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIRestClientTest.java b/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIRestClientTest.java
index 9b34095..ad460fa 100644 (file)
--- a/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIRestClientTest.java
+++ b/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIRestClientTest.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -210,7 +210,7 @@ public class AAIRestClientTest {
         response.readEntity(String.class);
         client.put("wow");
 
-        client.get();
+        response = client.get();
         response.readEntity(String.class);
         verify(2, getRequestedFor(urlEqualTo("/cached/1")));
 

diff --git a/pom.xml b/pom.xml
index a4cc3a8..4cf4f51 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
     <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
     <publicNexusPath>content/repositories/public/</publicNexusPath>
     <siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath>
-    <cxf.version>3.4.1</cxf.version>
+    <cxf.version>3.4.10</cxf.version>
     <jax.ws.rs>2.1</jax.ws.rs>
     <springboot.version>2.4.13</springboot.version>
     <spring-cloud.version>2020.0.6</spring-cloud.version>