Upgrade Quarkus CXF to 3.15.0

apache · Sep 19, 2024 · f8763b0 · f8763b0
1 parent 3a6b64b
commit f8763b0
Show file tree

Hide file tree

Showing 6 changed files with 622 additions and 645 deletions.
diff --git a/...ain/java/org/apache/camel/quarkus/component/cxf/soap/it/metrics/CxfSoapMetricsRoutes.java b/...ain/java/org/apache/camel/quarkus/component/cxf/soap/it/metrics/CxfSoapMetricsRoutes.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.quarkus.component.cxf.soap.it.metrics;
 
+import java.util.Optional;
+
 import io.quarkiverse.cxf.metrics.QuarkusCxfMetricsFeature;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.context.SessionScoped;
@@ -61,7 +63,7 @@ CxfEndpoint clientMetricsEndpoint() {
         result.setServiceClass(HelloService.class);
         result.setAddress("http://localhost:" + port + "/soapservice/hello-metrics");
         result.setWsdlURL("wsdl/MetricsHelloService.wsdl");
-        result.getFeatures().add(new QuarkusCxfMetricsFeature());
+        result.getFeatures().add(new QuarkusCxfMetricsFeature(Optional.empty()));
         return result;
     }
 
@@ -73,7 +75,7 @@ CxfEndpoint metricsServiceEndpoint() {
         result.setServiceClass(HelloService.class);
         result.setAddress("/hello-metrics");
         result.setWsdlURL("wsdl/MetricsHelloService.wsdl");
-        result.getFeatures().add(new QuarkusCxfMetricsFeature());
+        result.getFeatures().add(new QuarkusCxfMetricsFeature(Optional.empty()));
         return result;
     }
 

diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,7 @@
         <optaplanner.version>9.37.0.Final</optaplanner.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ -->
         <quarkiverse-amazonservices.version>2.16.2</quarkiverse-amazonservices.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/io/quarkiverse/amazonservices/quarkus-amazon-services-parent/ -->
         <quarkiverse-artemis.version>3.4.2</quarkiverse-artemis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/artemis/quarkus-artemis-parent/ -->
-        <quarkiverse-cxf.version>3.14.0</quarkiverse-cxf.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/io/quarkiverse/cxf/quarkus-cxf-parent/ -->
+        <quarkiverse-cxf.version>3.15.0</quarkiverse-cxf.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/io/quarkiverse/cxf/quarkus-cxf-parent/ -->
         <quarkiverse-freemarker.version>1.1.0</quarkiverse-freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ -->
         <quarkiverse-groovy.version>3.14.1</quarkiverse-groovy.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/groovy/quarkus-groovy-parent/ -->
         <quarkiverse-jackson-jq.version>2.0.2</quarkiverse-jackson-jq.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jackson-jq/quarkus-jackson-jq-parent/ -->

diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
@@ -7120,16 +7120,6 @@
                 <artifactId>httpclient5</artifactId>
                 <version>${httpclient5.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents.core5</groupId>
-                <artifactId>httpcore5</artifactId>
-                <version>${httpclient5.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents.core5</groupId>
-                <artifactId>httpcore5-h2</artifactId>
-                <version>${httpclient5.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.jackrabbit</groupId>
                 <artifactId>oak-jackrabbit-api</artifactId>