You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2025/10/21 18:40:38 UTC

(cxf) 08/09: Fix compilation issue (post-merge)

This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit b2d329ab2d317ac30c3ee99b85650514d01bab59
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Oct 21 14:40:06 2025 -0400

    Fix compilation issue (post-merge)
---
 .../systest/jaxws/MicrometerMetricsHttpProvider.java    | 17 ++++++++---------
 ...lidationWithoutViolationMetricsClientServerTest.java |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/MicrometerMetricsHttpProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/MicrometerMetricsHttpProvider.java
index b9ac531ae5..e5fec8b92e 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/MicrometerMetricsHttpProvider.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/MicrometerMetricsHttpProvider.java
@@ -20,17 +20,16 @@ package org.apache.cxf.systest.jaxws;
 
 import java.io.StringReader;
 
+import javax.annotation.Resource;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.BindingType;
+import javax.xml.ws.Provider;
+import javax.xml.ws.Service;
+import javax.xml.ws.ServiceMode;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceProvider;
 
-
-import jakarta.annotation.Resource;
-import jakarta.xml.ws.BindingType;
-import jakarta.xml.ws.Provider;
-import jakarta.xml.ws.Service;
-import jakarta.xml.ws.ServiceMode;
-import jakarta.xml.ws.WebServiceContext;
-import jakarta.xml.ws.WebServiceProvider;
 import org.apache.cxf.message.Message;
 
 import io.micrometer.core.instrument.Counter;
@@ -45,7 +44,7 @@ import io.micrometer.core.instrument.Timer;
 
 @WebServiceProvider(serviceName = "MetricsService", portName = "MetricsPort", targetNamespace = "urn:metrics")
 @ServiceMode(Service.Mode.MESSAGE)
-@BindingType(jakarta.xml.ws.http.HTTPBinding.HTTP_BINDING)
+@BindingType(javax.xml.ws.http.HTTPBinding.HTTP_BINDING)
 public class MicrometerMetricsHttpProvider implements Provider<Source> {
 
     @Resource
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationWithoutViolationMetricsClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationWithoutViolationMetricsClientServerTest.java
index 9827969b2b..923be27e66 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationWithoutViolationMetricsClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationWithoutViolationMetricsClientServerTest.java
@@ -30,12 +30,12 @@ import java.util.Map;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.ws.Endpoint;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import jakarta.xml.ws.Endpoint;
 import org.apache.cxf.ext.logging.LoggingInInterceptor;
 import org.apache.cxf.ext.logging.LoggingOutInterceptor;
 import org.apache.cxf.jaxws.EndpointImpl;