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 b24ccebd900e2b23f92c1d055ae316778f6648cd Author: Andriy Redko <[email protected]> AuthorDate: Sat Jan 24 11:27:27 2026 -0500 Fix post-merge issues (usage of jakarta.* packages) Signed-off-by: Andriy Redko <[email protected]> --- .../test/java/org/apache/cxf/systest/hc5/https/sni/ClientSniTest.java | 3 ++- .../org/apache/cxf/systest/hc5/https/sni/client-sni-server.xml | 2 +- .../test/resources/org/apache/cxf/systest/hc5/https/sni/client-sni.xml | 2 +- .../src/test/java/org/apache/cxf/systest/https/sni/ClientSniTest.java | 3 ++- .../resources/org/apache/cxf/systest/https/sni/client-sni-server.xml | 2 +- .../src/test/resources/org/apache/cxf/systest/https/sni/client-sni.xml | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/https/sni/ClientSniTest.java b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/https/sni/ClientSniTest.java index 8a390bd46c..4021702eea 100644 --- a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/https/sni/ClientSniTest.java +++ b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/https/sni/ClientSniTest.java @@ -23,7 +23,8 @@ import java.net.URL; import java.util.Arrays; import java.util.Collection; -import jakarta.xml.ws.BindingProvider; +import javax.xml.ws.BindingProvider; + import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/sni/client-sni-server.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/sni/client-sni-server.xml index 378aa31a7f..e3184e9aec 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/sni/client-sni-server.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/sni/client-sni-server.xml @@ -29,7 +29,7 @@ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/> <cxf:bus> <cxf:features> - <bean class="org.apache.cxf.ext.logging.LoggingFeature"/> + <cxf:logging/> </cxf:features> </cxf:bus> diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/sni/client-sni.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/sni/client-sni.xml index cca43394e7..7540d2723d 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/sni/client-sni.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/sni/client-sni.xml @@ -28,7 +28,7 @@ <cxf:bus> <cxf:features> - <bean class="org.apache.cxf.ext.logging.LoggingFeature"/> + <cxf:logging/> </cxf:features> </cxf:bus> <http:conduit name="https://localhost:.*";> diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/sni/ClientSniTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/sni/ClientSniTest.java index f6d1cfb180..1dc427f306 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/https/sni/ClientSniTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/sni/ClientSniTest.java @@ -23,7 +23,8 @@ import java.net.URL; import java.util.Arrays; import java.util.Collection; -import jakarta.xml.ws.BindingProvider; +import javax.xml.ws.BindingProvider; + import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/sni/client-sni-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/sni/client-sni-server.xml index da1ed372fb..ded4b4b047 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/sni/client-sni-server.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/sni/client-sni-server.xml @@ -29,7 +29,7 @@ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/> <cxf:bus> <cxf:features> - <bean class="org.apache.cxf.ext.logging.LoggingFeature"/> + <cxf:logging/> </cxf:features> </cxf:bus> diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/sni/client-sni.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/sni/client-sni.xml index cca43394e7..7540d2723d 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/sni/client-sni.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/sni/client-sni.xml @@ -28,7 +28,7 @@ <cxf:bus> <cxf:features> - <bean class="org.apache.cxf.ext.logging.LoggingFeature"/> + <cxf:logging/> </cxf:features> </cxf:bus> <http:conduit name="https://localhost:.*";>
