You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2022/04/14 04:32:38 UTC
[cxf] branch master updated: Start getting rid of the "java9" profiles in the build since we require java11 now
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new ba839e6b1f Start getting rid of the "java9" profiles in the build since we require java11 now
ba839e6b1f is described below
commit ba839e6b1f3ee5c26fd600834ea10227dd4cc317
Author: Daniel Kulp <da...@kulp.com>
AuthorDate: Thu Apr 14 00:31:11 2022 -0400
Start getting rid of the "java9" profiles in the build since we require java11 now
---
core/pom.xml | 15 +++
.../endpoint/ListenerRegistrationException.java | 2 +
.../cxf/common/util/CollectionUtilsTest.java | 6 +-
distribution/javadoc/pom.xml | 20 +---
integration/jca/pom.xml | 28 +++---
integration/tracing/tracing-brave/pom.xml | 5 +
integration/tracing/tracing-opentracing/pom.xml | 5 +
parent/pom.xml | 108 +++------------------
rt/bindings/coloc/pom.xml | 4 +
rt/bindings/corba/pom.xml | 42 ++++----
rt/bindings/soap/pom.xml | 18 ++++
.../apache/cxf/aegis/type/AbstractTypeCreator.java | 8 +-
.../org/apache/cxf/aegis/type/basic/BeanType.java | 6 +-
.../cxf/aegis/type/basic/XMLBeanTypeInfo.java | 7 +-
.../cxf/aegis/type/collection/CollectionType.java | 2 +-
rt/databinding/jaxb/pom.xml | 5 +
.../apache/cxf/jaxb/JAXBContextInitializer.java | 2 +-
.../java/org/apache/cxf/jaxb/JAXBDataBase.java | 8 +-
.../src/main/java/org/apache/cxf/jaxb/Utils.java | 6 +-
.../cxf/jaxb/WrapperHelperClassGenerator.java | 4 +-
rt/features/clustering/pom.xml | 4 +
rt/features/logging/pom.xml | 4 +
.../ext/logging/AbstractLoggingInterceptor.java | 2 +-
.../cxf/ext/logging/MaskSensitiveHelperTest.java | 2 +-
rt/features/metrics/pom.xml | 6 +-
rt/features/throttling/pom.xml | 6 +-
rt/frontend/jaxrs/pom.xml | 5 +
.../apache/cxf/jaxrs/impl/AsyncResponseImpl.java | 2 +-
.../apache/cxf/jaxrs/impl/ConfigurationImpl.java | 2 +-
.../java/org/apache/cxf/jaxrs/utils/JAXBUtils.java | 2 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 2 +-
.../cxf/jaxrs/impl/ConfigurationImplTest.java | 2 +-
rt/frontend/jaxws/pom.xml | 6 ++
.../org/apache/cxf/jaxws/JaxWsClientProxy.java | 1 +
.../jaxws/interceptors/WebFaultOutInterceptor.java | 8 +-
.../java/org/apache/cxf/frontend/ClientProxy.java | 1 +
rt/management/pom.xml | 5 +
rt/rs/client/pom.xml | 5 +
.../jaxrs/client/cache/CXFCacheControlFeature.java | 2 +-
.../cxf/jaxrs/client/cache/ClientCacheTest.java | 42 ++------
.../jaxrs/client/spec/ClientBuilderImplTest.java | 6 +-
rt/rs/description-microprofile-openapi/pom.xml | 5 +
rt/rs/description-openapi-v3/pom.xml | 5 +
rt/rs/description-swagger/pom.xml | 5 +
.../rs/security/saml/sso/SPStateManagerTest.java | 6 +-
.../rs/security/saml/sso/TokenReplayCacheTest.java | 8 +-
rt/rs/sse/pom.xml | 5 +
.../cxf/rt/security/utils/SecurityUtils.java | 6 +-
rt/transports/http/pom.xml | 5 +
.../http/osgi/HttpConduitConfigApplier.java | 7 +-
.../spring/HttpConduitBeanDefinitionParser.java | 8 +-
rt/transports/jms/pom.xml | 5 +
.../org/apache/cxf/transport/jms/JMSConduit.java | 1 +
rt/transports/udp/pom.xml | 5 +
.../AtmosphereWebSocketJettyDestination.java | 7 +-
rt/ws/eventing/pom.xml | 4 +
rt/ws/policy/pom.xml | 5 +
rt/ws/security/pom.xml | 4 +
.../ws/security/wss4j/WSS4JStaxInInterceptor.java | 2 +-
rt/ws/transfer/pom.xml | 4 +
rt/wsdl/pom.xml | 20 ----
.../factory/ReflectionServiceFactoryBean.java | 2 +-
services/sts/sts-core/pom.xml | 33 ++-----
services/sts/systests/advanced/pom.xml | 8 ++
services/sts/systests/basic/pom.xml | 8 ++
.../apache/cxf/ws/discovery/WSDiscoveryClient.java | 1 +
services/wsn/wsn-core/pom.xml | 40 +++-----
.../src/test/java/org/apache/cxf/wsn/RiTest.java | 40 --------
services/xkms/xkms-common/pom.xml | 4 +
systests/cdi/cdi-owb/pom.xml | 8 ++
systests/cdi/cdi-weld/pom.xml | 8 ++
systests/container-integration/grizzly/pom.xml | 5 +
systests/forked/pom.xml | 4 +
systests/jaxrs/pom.xml | 4 +
systests/jaxws/pom.xml | 14 +++
systests/rs-sse/rs-sse-base/pom.xml | 8 ++
systests/spring-boot/pom.xml | 4 +
systests/tracing/pom.xml | 4 +
systests/transports/pom.xml | 36 +++----
systests/uncategorized/pom.xml | 26 +++--
.../apache/cxf/systest/ws/addressing/Server.java | 2 +-
testutils/pom.xml | 18 ++++
.../apache/cxf/testutil/common/ServerLauncher.java | 2 +-
tools/common/pom.xml | 19 ++++
.../apache/cxf/tools/common/toolspec/ToolSpec.java | 2 +-
.../toolspec/parser/CommandLineParserTest.java | 2 +-
tools/corba/pom.xml | 6 +-
tools/javato/ws/pom.xml | 52 ----------
tools/wadlto/jaxrs/pom.xml | 5 +
.../wsdlto/javascript/JavaScriptContainer.java | 2 +-
90 files changed, 462 insertions(+), 438 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 2efe1a3a9f..fbcf62aa3c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -81,6 +81,15 @@
</cxf.export.service>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -214,6 +223,12 @@
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
<plugins>
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ListenerRegistrationException.java b/core/src/main/java/org/apache/cxf/endpoint/ListenerRegistrationException.java
index 296cd4abb6..dd99ad3404 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ListenerRegistrationException.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ListenerRegistrationException.java
@@ -20,6 +20,8 @@
package org.apache.cxf.endpoint;
public class ListenerRegistrationException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+
public ListenerRegistrationException(String message) {
super(message);
}
diff --git a/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
index f2d7a8e154..fb82a3a057 100644
--- a/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
@@ -53,8 +53,10 @@ public class CollectionUtilsTest {
@Test
public void testIsEmpty() throws Exception {
- assertTrue(CollectionUtils.isEmpty((Collection) null));
- assertTrue(CollectionUtils.isEmpty((Map) null));
+ Collection<String> c = null;
+ Map<String, String> m = null;
+ assertTrue(CollectionUtils.isEmpty(c));
+ assertTrue(CollectionUtils.isEmpty(m));
Collection<String> l = Arrays.asList(null, null);
assertTrue(CollectionUtils.isEmpty(l));
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 2b6b9396cc..acb1a3df8b 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -581,6 +581,11 @@
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ <version>1.0.6.Final</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -734,19 +739,4 @@
</plugins>
</pluginManagement>
</build>
- <profiles>
- <profile>
- <id>java9-plus</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.spec.javax.rmi</groupId>
- <artifactId>jboss-rmi-api_1.0_spec</artifactId>
- <version>1.0.6.Final</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/integration/jca/pom.xml b/integration/jca/pom.xml
index a7bde5ba2b..a774560b0d 100644
--- a/integration/jca/pom.xml
+++ b/integration/jca/pom.xml
@@ -112,21 +112,17 @@
<artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ <version>1.0.6.Final</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb</artifactId>
+ <version>${cxf.jacorb.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <profiles>
- <profile>
- <id>java9-plus</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.spec.javax.rmi</groupId>
- <artifactId>jboss-rmi-api_1.0_spec</artifactId>
- <version>1.0.6.Final</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/integration/tracing/tracing-brave/pom.xml b/integration/tracing/tracing-brave/pom.xml
index 1b93680df2..6b351b7416 100644
--- a/integration/tracing/tracing-brave/pom.xml
+++ b/integration/tracing/tracing-brave/pom.xml
@@ -41,6 +41,11 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/integration/tracing/tracing-opentracing/pom.xml b/integration/tracing/tracing-opentracing/pom.xml
index faf4921eef..5701755bda 100644
--- a/integration/tracing/tracing-opentracing/pom.xml
+++ b/integration/tracing/tracing-opentracing/pom.xml
@@ -41,6 +41,11 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index b6248e4fdf..7e810c7df5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -99,7 +99,7 @@
<cxf.commons-lang3.version>3.12.0</cxf.commons-lang3.version>
<cxf.commons-logging.version>1.2</cxf.commons-logging.version>
<cxf.commons-text.version>1.9</cxf.commons-text.version>
- <cxf.derby.version>10.14.2.0</cxf.derby.version>
+ <cxf.derby.version>10.15.2.0</cxf.derby.version>
<cxf.dom4j.version>2.1.3</cxf.dom4j.version>
<cxf.dropwizard3.version>3.2.6</cxf.dropwizard3.version>
<cxf.dropwizard4.version>4.2.9</cxf.dropwizard4.version>
@@ -1653,6 +1653,11 @@
<artifactId>${cxf.servlet-api.artifact}</artifactId>
<version>${cxf.servlet-api.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>${cxf.saaj-impl.version}</version>
+ </dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
@@ -1749,6 +1754,12 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${cxf.xerces.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- if we use the new woodstox artifact, we're using the new version -->
<dependency>
@@ -1924,12 +1935,6 @@
<invoker.skip>true</invoker.skip>
</properties>
</profile>
- <profile>
- <id>jetty9</id>
- <properties>
- <cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
- </properties>
- </profile>
<profile>
<!-- Profile for testing with EclipseLink MOXy based JAXB implementation -->
<id>eclipse.moxy</id>
@@ -2190,95 +2195,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>java9-plus</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <properties>
- <cxf.derby.version>10.15.2.0</cxf.derby.version>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <showDeprecation>${cxf.compile.show.deprecation}</showDeprecation>
- <showWarnings>true</showWarnings>
- <compilerArgs>
- <arg>${cxf.compile.flags}</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- <version>${cxf.jakarta.wsapi.version}</version>
- </dependency>
- <dependency>
- <groupId>jakarta.jws</groupId>
- <artifactId>jakarta.jws-api</artifactId>
- <version>${cxf.jakarta.jwsapi.version}</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.soap</groupId>
- <artifactId>jakarta.xml.soap-api</artifactId>
- <version>${cxf.jakarta.soapapi.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <version>${cxf.jakarta.activation.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>${cxf.saaj-impl.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jacorb</groupId>
- <artifactId>jacorb</artifactId>
- <version>${cxf.jacorb.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${cxf.xerces.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
<profile>
<id>jdk13</id>
<activation>
diff --git a/rt/bindings/coloc/pom.xml b/rt/bindings/coloc/pom.xml
index 1c04ba3df0..ac1c89a1db 100644
--- a/rt/bindings/coloc/pom.xml
+++ b/rt/bindings/coloc/pom.xml
@@ -44,6 +44,10 @@
</cxf.export.service>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
diff --git a/rt/bindings/corba/pom.xml b/rt/bindings/corba/pom.xml
index 8c879746fd..9adbc726ce 100644
--- a/rt/bindings/corba/pom.xml
+++ b/rt/bindings/corba/pom.xml
@@ -81,6 +81,24 @@
<artifactId>spring-context</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb-omgapi</artifactId>
+ <version>${cxf.jacorb.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ <version>1.0.6.Final</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb</artifactId>
+ <version>${cxf.jacorb.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -122,28 +140,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>java9-plus</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <!-- This artifact needs to be included in compile scope since the corba module has been removed from jdk 11 -->
- <dependency>
- <groupId>org.jacorb</groupId>
- <artifactId>jacorb-omgapi</artifactId>
- <version>${cxf.jacorb.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.rmi</groupId>
- <artifactId>jboss-rmi-api_1.0_spec</artifactId>
- <version>1.0.6.Final</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/rt/bindings/soap/pom.xml b/rt/bindings/soap/pom.xml
index 691d8594fa..0cf6de910e 100644
--- a/rt/bindings/soap/pom.xml
+++ b/rt/bindings/soap/pom.xml
@@ -47,6 +47,18 @@
</cxf.export.service>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
@@ -56,6 +68,12 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <scope>runtime</scope>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
index 33a59efee3..03b0715391 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
@@ -20,6 +20,7 @@ package org.apache.cxf.aegis.type;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
@@ -179,7 +180,7 @@ public abstract class AbstractTypeCreator implements TypeCreator {
protected AegisType createUserType(TypeClassInfo info) {
try {
- AegisType type = info.getAegisTypeClass().newInstance();
+ AegisType type = info.getAegisTypeClass().getDeclaredConstructor().newInstance();
QName name = info.getTypeName();
if (name == null) {
@@ -203,10 +204,11 @@ public abstract class AbstractTypeCreator implements TypeCreator {
type.setTypeMapping(getTypeMapping());
return type;
- } catch (InstantiationException e) {
+ } catch (InstantiationException | IllegalArgumentException | InvocationTargetException
+ | NoSuchMethodException e) {
throw new DatabindingException("Couldn't instantiate type classs "
+ info.getAegisTypeClass().getName(), e);
- } catch (IllegalAccessException e) {
+ } catch (IllegalAccessException | SecurityException e) {
throw new DatabindingException("Couldn't access type classs "
+ info.getAegisTypeClass().getName(), e);
}
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
index 4ca69a3f6c..14074c2b2f 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
@@ -202,7 +202,7 @@ public class BeanType extends AegisType {
throw new DatabindingException("Illegal access. " + e.getMessage(), e);
} catch (IllegalArgumentException e) {
throw new DatabindingException("Illegal argument. " + e.getMessage(), e);
- } catch (InvocationTargetException e) {
+ } catch (InvocationTargetException | NoSuchMethodException e) {
throw new DatabindingException("Could not create class: " + e.getMessage(), e);
}
}
@@ -226,7 +226,7 @@ public class BeanType extends AegisType {
* it exists).
*/
protected Object createFromFault(Context context) throws SecurityException, InstantiationException,
- IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+ IllegalAccessException, InvocationTargetException, NoSuchMethodException {
Class<?> clazz = getTypeClass();
Constructor<?> ctr;
Object o;
@@ -257,7 +257,7 @@ public class BeanType extends AegisType {
fault.getMessage()
});
} catch (NoSuchMethodException e2) {
- return clazz.newInstance();
+ return clazz.getDeclaredConstructor().newInstance();
}
}
}
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
index 8492b4e43d..b413236711 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
@@ -19,6 +19,7 @@
package org.apache.cxf.aegis.type.basic;
import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -126,7 +127,7 @@ public class XMLBeanTypeInfo extends BeanTypeInfo {
try {
Class<?> typeClass =
ClassLoaderUtils.loadClass(explicitTypeName, XMLBeanTypeInfo.class);
- AegisType customTypeObject = (AegisType) typeClass.newInstance();
+ AegisType customTypeObject = (AegisType) typeClass.getDeclaredConstructor().newInstance();
mapType(mappedName, customTypeObject);
QName schemaType = mappedType;
if (schemaType == null) {
@@ -134,7 +135,9 @@ public class XMLBeanTypeInfo extends BeanTypeInfo {
}
customTypeObject.setTypeClass(typeClass);
customTypeObject.setSchemaType(schemaType);
- } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e1) {
+ } catch (ClassNotFoundException | InstantiationException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException
+ | NoSuchMethodException | SecurityException e1) {
//
}
}
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
index 16e2fa3b51..52d35a2027 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
@@ -83,7 +83,7 @@ public class CollectionType extends ArrayType {
values = new ArrayList<>();
} else {
try {
- values = (Collection<Object>)userTypeClass.newInstance();
+ values = (Collection<Object>)userTypeClass.getDeclaredConstructor().newInstance();
} catch (Exception e) {
throw new DatabindingException("Could not create map implementation: "
+ userTypeClass.getName(), e);
diff --git a/rt/databinding/jaxb/pom.xml b/rt/databinding/jaxb/pom.xml
index 32372e4d35..2fab0e7cd4 100644
--- a/rt/databinding/jaxb/pom.xml
+++ b/rt/databinding/jaxb/pom.xml
@@ -85,6 +85,11 @@
</plugins>
</build>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
index 0dd420ba55..2f39712aba 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
@@ -558,7 +558,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
Class<?> factoryClass = creator.createFactory(cls);
try {
- return factoryClass.newInstance();
+ return factoryClass.getDeclaredConstructor().newInstance();
} catch (Exception e) {
//ignore
}
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
index 55ac0cf166..5df92b7f5b 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
@@ -20,6 +20,7 @@
package org.apache.cxf.jaxb;
import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -162,8 +163,11 @@ public abstract class JAXBDataBase {
protected ValidationEventHandler getValidationEventHandler(String cn) {
try {
- return (ValidationEventHandler)ClassLoaderUtils.loadClass(cn, getClass()).newInstance();
- } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+ return (ValidationEventHandler)ClassLoaderUtils.loadClass(cn, getClass())
+ .getDeclaredConstructor().newInstance();
+ } catch (InstantiationException | IllegalAccessException | ClassNotFoundException
+ | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
+ | SecurityException e) {
LOG.log(Level.INFO, "Could not create validation event handler", e);
}
return null;
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
index 05e4da90ed..b8a0d57dbf 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
@@ -20,6 +20,7 @@
package org.apache.cxf.jaxb;
import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
@@ -256,8 +257,9 @@ final class Utils {
@SuppressWarnings("rawtypes")
static XmlAdapter getXmlAdapter(XmlJavaTypeAdapter adapterAnnotation)
- throws InstantiationException, IllegalAccessException {
- return adapterAnnotation != null ? adapterAnnotation.value().newInstance() : null;
+ throws InstantiationException, IllegalAccessException, InvocationTargetException,
+ NoSuchMethodException, SecurityException {
+ return adapterAnnotation != null ? adapterAnnotation.value().getDeclaredConstructor().newInstance() : null;
}
static XmlJavaTypeAdapter getFieldXJTA(final Field f) {
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperClassGenerator.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperClassGenerator.java
index c01d6c4137..6bcc414b66 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperClassGenerator.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperClassGenerator.java
@@ -54,7 +54,7 @@ public final class WrapperHelperClassGenerator extends ClassGeneratorClassLoader
Class<?> cls = findClass(StringUtils.slashesToPeriod(newClassName), wrapperType);
while (cls != null) {
try {
- WrapperHelper helper = WrapperHelper.class.cast(cls.newInstance());
+ WrapperHelper helper = WrapperHelper.class.cast(cls.getDeclaredConstructor().newInstance());
if (!helper.getSignature().equals(computeSignature(setMethods, getMethods))) {
count++;
newClassName = wrapperType.getName() + "_WrapperTypeHelper" + count;
@@ -94,7 +94,7 @@ public final class WrapperHelperClassGenerator extends ClassGeneratorClassLoader
cw.visitEnd();
byte[] bt = cw.toByteArray();
Class<?> cl = loadClass(StringUtils.slashesToPeriod(newClassName), wrapperType, bt);
- Object o = cl.newInstance();
+ Object o = cl.getDeclaredConstructor().newInstance();
return WrapperHelper.class.cast(o);
}
} catch (Throwable e) {
diff --git a/rt/features/clustering/pom.xml b/rt/features/clustering/pom.xml
index 4dc7e4adac..d187801a3f 100644
--- a/rt/features/clustering/pom.xml
+++ b/rt/features/clustering/pom.xml
@@ -43,6 +43,10 @@
</cxf.export.service>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/rt/features/logging/pom.xml b/rt/features/logging/pom.xml
index e86e69cff4..1c8e63b850 100644
--- a/rt/features/logging/pom.xml
+++ b/rt/features/logging/pom.xml
@@ -18,6 +18,10 @@
<description>Apache CXF Advanced Logging Feature</description>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/AbstractLoggingInterceptor.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/AbstractLoggingInterceptor.java
index e823bbadc8..f6b48fd045 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/AbstractLoggingInterceptor.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/AbstractLoggingInterceptor.java
@@ -54,7 +54,7 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
protected final MaskSensitiveHelper maskSensitiveHelper = new MaskSensitiveHelper();
- protected Set<String> sensitiveProtocolHeaderNames = new HashSet();
+ protected Set<String> sensitiveProtocolHeaderNames = new HashSet<>();
public AbstractLoggingInterceptor(String phase, LogEventSender sender) {
super(phase);
diff --git a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java
index fae7bfca2b..44ebede0c1 100644
--- a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java
+++ b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java
@@ -67,7 +67,7 @@ public class MaskSensitiveHelperTest {
"<item><user>testUser1</user><password myAttribute=\"test\">XXX</password></item>"
+ "<item><user>testUser2</user><password>XXX</password></item>";
- private static final Set<String> SENSITIVE_ELEMENTS = new HashSet(Arrays.asList("password"));
+ private static final Set<String> SENSITIVE_ELEMENTS = new HashSet<>(Arrays.asList("password"));
private static final String APPLICATION_XML = "application/xml";
private static final String APPLICATION_JSON = "application/json";
diff --git a/rt/features/metrics/pom.xml b/rt/features/metrics/pom.xml
index 234b59b3d2..e7c48128a7 100644
--- a/rt/features/metrics/pom.xml
+++ b/rt/features/metrics/pom.xml
@@ -16,6 +16,10 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
@@ -57,4 +61,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/rt/features/throttling/pom.xml b/rt/features/throttling/pom.xml
index a6e0f3c9b0..43cacb9159 100644
--- a/rt/features/throttling/pom.xml
+++ b/rt/features/throttling/pom.xml
@@ -16,6 +16,10 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
@@ -44,4 +48,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index 983b9dee7d..6373921d53 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -53,6 +53,11 @@
</cxf.export.service>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
index 718b357992..9c7a1955fb 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
@@ -189,7 +189,7 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
for (int i = 0; i < callbacks.length; i++) {
extraCallbacks[i] = callbacks[i].getDeclaredConstructor().newInstance();
}
- return register(callback.newInstance(), extraCallbacks);
+ return register(callback.getDeclaredConstructor().newInstance(), extraCallbacks);
} catch (NullPointerException e) {
throw e;
} catch (Throwable t) {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
index 6a7f1ce848..313e2ce3c6 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
@@ -235,7 +235,7 @@ public class ConfigurationImpl implements Configuration {
public static Object createProvider(Class<?> cls) {
try {
- return cls.newInstance();
+ return cls.getDeclaredConstructor().newInstance();
} catch (Throwable ex) {
throw new RuntimeException(ex);
}
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
index 357e477da1..2e00bcea73 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
@@ -150,7 +150,7 @@ public final class JAXBUtils {
if (typeAdapter != null) {
try {
@SuppressWarnings("rawtypes")
- XmlAdapter xmlAdapter = typeAdapter.value().newInstance();
+ XmlAdapter xmlAdapter = typeAdapter.value().getDeclaredConstructor().newInstance();
if (marshal) {
return xmlAdapter.marshal(obj);
}
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index 15d00fe51e..177efdf071 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -1269,7 +1269,7 @@ public final class JAXRSUtils {
}
Object instance;
try {
- instance = clazz.newInstance();
+ instance = clazz.getDeclaredConstructor().newInstance();
} catch (Throwable t) {
throw ExceptionUtils.toInternalServerErrorException(t, null);
}
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
index 600a4cd265..eef99222ce 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
@@ -85,7 +85,7 @@ public class ConfigurationImplTest {
assertTrue(c.register(provider,
Collections.<Class<?>, Integer>singletonMap(ContainerResponseFilter.class, 1000)));
assertTrue(c.isRegistered(provider));
- assertFalse(c.isRegistered(providerClass.newInstance()));
+ assertFalse(c.isRegistered(providerClass.getDeclaredConstructor().newInstance()));
assertTrue(c.isRegistered(providerClass));
assertFalse(c.isRegistered(ContainerResponseFilter.class));
assertFalse(c.register(provider,
diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml
index 087ed5cb7c..dd2db62859 100644
--- a/rt/frontend/jaxws/pom.xml
+++ b/rt/frontend/jaxws/pom.xml
@@ -157,6 +157,12 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
index 8e23617371..5c2737c04e 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
@@ -200,6 +200,7 @@ public class JaxWsClientProxy extends org.apache.cxf.frontend.ClientProxy implem
}
return exception;
} catch (SOAPException e) {
+ e.printStackTrace();
return new WebServiceException(ex);
}
}
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
index c334118ae3..ca60f78d3d 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
@@ -134,6 +134,7 @@ public class WebFaultOutInterceptor extends FaultOutInterceptor {
}
}
}
+
if (cause instanceof Exception && fault != null) {
Exception ex = (Exception)cause;
Object faultInfo;
@@ -142,7 +143,6 @@ public class WebFaultOutInterceptor extends FaultOutInterceptor {
faultInfo = method.invoke(cause, new Object[0]);
} catch (NoSuchMethodException e) {
faultInfo = createFaultInfoBean(fault, cause);
-
} catch (InvocationTargetException e) {
throw new Fault(new org.apache.cxf.common.i18n.Message("INVOCATION_TARGET_EXC", BUNDLE), e);
} catch (IllegalAccessException | IllegalArgumentException e) {
@@ -207,7 +207,7 @@ public class WebFaultOutInterceptor extends FaultOutInterceptor {
Class<?> cls = ClassLoaderUtils.loadClass(fault.faultBean(),
cause.getClass());
if (cls != null) {
- Object ret = cls.newInstance();
+ Object ret = cls.getDeclaredConstructor().newInstance();
//copy props
Method[] meth = cause.getClass().getMethods();
for (Method m : meth) {
@@ -230,7 +230,9 @@ public class WebFaultOutInterceptor extends FaultOutInterceptor {
}
return ret;
}
- } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e1) {
+ } catch (ClassNotFoundException | InstantiationException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
+ | SecurityException e1) {
//ignore
}
}
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java
index 4f5ad54e5e..80dac37e66 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java
@@ -117,6 +117,7 @@ public class ClientProxy implements InvocationHandler, Closeable {
return client;
}
+ @SuppressWarnings("deprecation")
@Override
protected void finalize() throws Throwable {
close();
diff --git a/rt/management/pom.xml b/rt/management/pom.xml
index e2f9e3f791..ccbcc7caa8 100644
--- a/rt/management/pom.xml
+++ b/rt/management/pom.xml
@@ -48,6 +48,11 @@
<artifactId>cxf-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml
index f131d92ffb..5cdea7e789 100644
--- a/rt/rs/client/pom.xml
+++ b/rt/rs/client/pom.xml
@@ -44,6 +44,11 @@
<cxf.bundle.activator>org.apache.cxf.jaxrs.client.blueprint.Activator</cxf.bundle.activator>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/CXFCacheControlFeature.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/CXFCacheControlFeature.java
index 31354f02af..9c835d0c10 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/CXFCacheControlFeature.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/CXFCacheControlFeature.java
@@ -44,7 +44,7 @@ import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.interceptor.InterceptorProvider;
-public class CXFCacheControlFeature extends AbstractFeature {
+public class CXFCacheControlFeature extends AbstractFeature implements AutoCloseable {
private static final String BUS_PROVIDERS = "org.apache.cxf.jaxrs.bus.providers";
private CachingProvider provider;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
index 5fc4be6dd1..5b823832b8 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/ClientCacheTest.java
@@ -74,8 +74,7 @@ public class ClientCacheTest {
@Test
public void testGetTimeString() {
- CacheControlFeature feature = new CacheControlFeature();
- try {
+ try (CacheControlFeature feature = new CacheControlFeature()) {
final WebTarget base = ClientBuilder.newBuilder().register(feature).build().target(ADDRESS);
final Invocation.Builder cached = base.request("text/plain").header(HttpHeaders.CACHE_CONTROL, "public");
final Response r = cached.get();
@@ -83,15 +82,12 @@ public class ClientCacheTest {
final String r1 = r.readEntity(String.class);
waitABit();
assertEquals(r1, cached.get().readEntity(String.class));
- } finally {
- feature.close();
}
}
@Test
public void testGetTimeStringUsingClientFactory() {
- CacheControlFeature feature = new CacheControlFeature();
- try {
+ try (CacheControlFeature feature = new CacheControlFeature()) {
JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean();
bean.setAddress(ADDRESS);
bean.setProviders(Collections.singletonList(feature));
@@ -106,15 +102,12 @@ public class ClientCacheTest {
final String r1 = r.readEntity(String.class);
waitABit();
assertEquals(r1, cached.get().readEntity(String.class));
- } finally {
- feature.close();
}
}
@Test
public void testGetTimeStringAsInputStream() throws Exception {
- CacheControlFeature feature = new CacheControlFeature();
- try {
+ try (CacheControlFeature feature = new CacheControlFeature()) {
final WebTarget base = ClientBuilder.newBuilder().register(feature).build().target(ADDRESS);
final Invocation.Builder cached = base.request("text/plain").header(HttpHeaders.CACHE_CONTROL, "public");
final Response r = cached.get();
@@ -125,15 +118,12 @@ public class ClientCacheTest {
is = cached.get().readEntity(InputStream.class);
final String r2 = IOUtils.readStringFromStream(is);
assertEquals(r1, r2);
- } finally {
- feature.close();
}
}
@Test
public void testGetTimeStringAsInputStreamAndString() throws Exception {
- CacheControlFeature feature = new CacheControlFeature();
- try {
+ try (CacheControlFeature feature = new CacheControlFeature()) {
feature.setCacheResponseInputStream(true);
final WebTarget base = ClientBuilder.newBuilder().register(feature).build().target(ADDRESS);
final Invocation.Builder cached = base.request("text/plain").header(HttpHeaders.CACHE_CONTROL, "public");
@@ -145,14 +135,11 @@ public class ClientCacheTest {
// CassCastException would occur without a cached stream support
final String r2 = cached.get().readEntity(String.class);
assertEquals(r1, r2);
- } finally {
- feature.close();
}
}
@Test
public void testGetTimeStringAsStringAndInputStream() throws Exception {
- CacheControlFeature feature = new CacheControlFeature();
- try {
+ try (CacheControlFeature feature = new CacheControlFeature()) {
feature.setCacheResponseInputStream(true);
final WebTarget base = ClientBuilder.newBuilder().register(feature).build().target(ADDRESS);
final Invocation.Builder cached = base.request("text/plain").header(HttpHeaders.CACHE_CONTROL, "public");
@@ -164,15 +151,12 @@ public class ClientCacheTest {
InputStream is = cached.get().readEntity(InputStream.class);
final String r2 = IOUtils.readStringFromStream(is);
assertEquals(r1, r2);
- } finally {
- feature.close();
}
}
@Test
public void testGetTimeStringAsStringAndInputStreamWithJAXRSClientFactoryBean() throws Exception {
- CXFCacheControlFeature feature = new CXFCacheControlFeature(true);
- try {
+ try (CXFCacheControlFeature feature = new CXFCacheControlFeature(true)) {
WebClient client = createClient(feature);
final Response r = client.get();
assertEquals(Response.Status.OK.getStatusCode(), r.getStatus());
@@ -181,15 +165,12 @@ public class ClientCacheTest {
InputStream is = client.get(InputStream.class);
final String r2 = IOUtils.readStringFromStream(is);
assertEquals(r1, r2);
- } finally {
- feature.close();
}
}
@Test
public void testGetJaxbBookCache() {
- CacheControlFeature feature = new CacheControlFeature();
- try {
+ try (CacheControlFeature feature = new CacheControlFeature()) {
final WebTarget base = ClientBuilder.newBuilder().register(feature).build().target(ADDRESS);
final Invocation.Builder cached =
setAsLocal(base.request("application/xml")).header(HttpHeaders.CACHE_CONTROL, "public");
@@ -200,8 +181,6 @@ public class ClientCacheTest {
assertNotNull(b1.getId());
waitABit();
assertEquals(b1, cached.get().readEntity(Book.class));
- } finally {
- feature.close();
}
}
@@ -209,8 +188,7 @@ public class ClientCacheTest {
@Test
public void testGetJaxbBookCacheByValue() {
// org.apache.cxf.jaxrs.client.cache.CacheControlFeature.storeByValue
- CacheControlFeature feature = new CacheControlFeature();
- try {
+ try (CacheControlFeature feature = new CacheControlFeature()) {
final WebTarget base = ClientBuilder.newBuilder()
.property("org.apache.cxf.jaxrs.client.cache.CacheControlFeature.storeByValue", "true")
.register(feature).build().target(ADDRESS);
@@ -223,8 +201,6 @@ public class ClientCacheTest {
assertNotNull(b1.getId());
waitABit();
assertEquals(b1, cached.get().readEntity(Book.class));
- } finally {
- feature.close();
}
}
@@ -311,4 +287,4 @@ public class ClientCacheTest {
return bean.createWebClient().accept("text/plain").header(HttpHeaders.CACHE_CONTROL, "public");
}
-}
\ No newline at end of file
+}
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientBuilderImplTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientBuilderImplTest.java
index da45a0eb2b..dcdeb8b00d 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientBuilderImplTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientBuilderImplTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.jaxrs.client.spec;
+import java.lang.reflect.InvocationTargetException;
import java.util.concurrent.atomic.AtomicInteger;
import javax.ws.rs.client.Client;
@@ -40,8 +41,9 @@ public class ClientBuilderImplTest {
public <T> Object create(final Class<T> cls) {
try {
create.incrementAndGet();
- return cls.newInstance();
- } catch (final InstantiationException | IllegalAccessException e) {
+ return cls.getDeclaredConstructor().newInstance();
+ } catch (final InstantiationException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {
fail(e.getMessage());
}
return null;
diff --git a/rt/rs/description-microprofile-openapi/pom.xml b/rt/rs/description-microprofile-openapi/pom.xml
index c94a867b32..42414fdb02 100644
--- a/rt/rs/description-microprofile-openapi/pom.xml
+++ b/rt/rs/description-microprofile-openapi/pom.xml
@@ -34,6 +34,11 @@
<cxf.module.name>org.apache.cxf.rs.openapi.microprofile</cxf.module.name>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/rt/rs/description-openapi-v3/pom.xml b/rt/rs/description-openapi-v3/pom.xml
index 36f6e09603..5860616862 100644
--- a/rt/rs/description-openapi-v3/pom.xml
+++ b/rt/rs/description-openapi-v3/pom.xml
@@ -38,6 +38,11 @@
</cxf.osgi.import>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/rt/rs/description-swagger/pom.xml b/rt/rs/description-swagger/pom.xml
index ba828a1251..3afa5addc0 100644
--- a/rt/rs/description-swagger/pom.xml
+++ b/rt/rs/description-swagger/pom.xml
@@ -39,6 +39,11 @@
</cxf.osgi.import>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SPStateManagerTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SPStateManagerTest.java
index 3e8867da29..a771631e12 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SPStateManagerTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SPStateManagerTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.rs.security.saml.sso;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.time.Instant;
import java.util.Arrays;
import java.util.Collection;
@@ -58,8 +59,9 @@ public class SPStateManagerTest {
}
@Before
- public void setUp() throws IllegalAccessException, InstantiationException {
- stateManager = stateManagerClass.newInstance();
+ public void setUp() throws IllegalAccessException, InstantiationException,
+ InvocationTargetException, NoSuchMethodException, SecurityException {
+ stateManager = stateManagerClass.getDeclaredConstructor().newInstance();
}
@After
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/TokenReplayCacheTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/TokenReplayCacheTest.java
index 0283d48edd..66c8d9ced8 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/TokenReplayCacheTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/TokenReplayCacheTest.java
@@ -45,7 +45,7 @@ public class TokenReplayCacheTest {
@Test
public void testEhCacheCloseCacheTwice() throws Exception {
- TokenReplayCache replayCache = new EHCacheTokenReplayCache();
+ TokenReplayCache<String> replayCache = new EHCacheTokenReplayCache();
replayCache.close();
replayCache.close();
}
@@ -53,7 +53,7 @@ public class TokenReplayCacheTest {
// No expiry specified so it falls back to the default
@Test
public void testEhCacheTokenReplayCacheNoExpirySpecified() throws Exception {
- TokenReplayCache replayCache = new EHCacheTokenReplayCache();
+ TokenReplayCache<String> replayCache = new EHCacheTokenReplayCache();
String id = UUID.randomUUID().toString();
replayCache.putId(id);
@@ -65,7 +65,7 @@ public class TokenReplayCacheTest {
// The negative expiry is rejected and it falls back to the default
@Test
public void testEhCacheTokenReplayCacheNegativeExpiry() throws Exception {
- TokenReplayCache replayCache = new EHCacheTokenReplayCache();
+ TokenReplayCache<String> replayCache = new EHCacheTokenReplayCache();
String id = UUID.randomUUID().toString();
replayCache.putId(id, Instant.now().minusSeconds(100L));
@@ -77,7 +77,7 @@ public class TokenReplayCacheTest {
// The huge expiry is rejected and it falls back to the default
@Test
public void testEhCacheTokenReplayCacheHugeExpiry() throws Exception {
- TokenReplayCache replayCache = new EHCacheTokenReplayCache();
+ TokenReplayCache<String> replayCache = new EHCacheTokenReplayCache();
String id = UUID.randomUUID().toString();
replayCache.putId(id, Instant.now().plus(14, ChronoUnit.HOURS));
diff --git a/rt/rs/sse/pom.xml b/rt/rs/sse/pom.xml
index 5846f42dfd..6658818aa5 100644
--- a/rt/rs/sse/pom.xml
+++ b/rt/rs/sse/pom.xml
@@ -37,6 +37,11 @@
</cxf.osgi.import>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
diff --git a/rt/security/src/main/java/org/apache/cxf/rt/security/utils/SecurityUtils.java b/rt/security/src/main/java/org/apache/cxf/rt/security/utils/SecurityUtils.java
index e5f5cd334a..9526d91ddf 100644
--- a/rt/security/src/main/java/org/apache/cxf/rt/security/utils/SecurityUtils.java
+++ b/rt/security/src/main/java/org/apache/cxf/rt/security/utils/SecurityUtils.java
@@ -47,14 +47,14 @@ public final class SecurityUtils {
// complete
}
- public static CallbackHandler getCallbackHandler(Object o) throws InstantiationException,
- IllegalAccessException, ClassNotFoundException {
+ public static CallbackHandler getCallbackHandler(Object o) throws Exception {
CallbackHandler handler = null;
if (o instanceof CallbackHandler) {
handler = (CallbackHandler)o;
} else if (o instanceof String) {
handler = (CallbackHandler)ClassLoaderUtils.loadClass((String)o,
- SecurityUtils.class).newInstance();
+ SecurityUtils.class)
+ .getDeclaredConstructor().newInstance();
}
return handler;
}
diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml
index a832063001..ba8f37572a 100644
--- a/rt/transports/http/pom.xml
+++ b/rt/transports/http/pom.xml
@@ -58,6 +58,11 @@
</cxf.public.suffix.list.url>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpConduitConfigApplier.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpConduitConfigApplier.java
index ddfa19598c..bcbe9d3e7a 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpConduitConfigApplier.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpConduitConfigApplier.java
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.transport.http.osgi;
+import java.lang.reflect.InvocationTargetException;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.List;
@@ -370,8 +371,10 @@ class HttpConduitConfigApplier {
String v = d.get(k);
Object obj;
try {
- obj = Class.forName(v).newInstance();
- } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+ obj = Class.forName(v).getDeclaredConstructor().newInstance();
+ } catch (InstantiationException | IllegalAccessException | ClassNotFoundException
+ | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
+ | SecurityException e) {
throw new RuntimeException(e);
}
if (obj instanceof HttpAuthSupplier) {
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
index 7d649ab300..f751847826 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
@@ -18,6 +18,8 @@
*/
package org.apache.cxf.transport.http.spring;
+import java.lang.reflect.InvocationTargetException;
+
import javax.xml.namespace.QName;
import org.w3c.dom.Attr;
@@ -204,14 +206,16 @@ public class HttpConduitBeanDefinitionParser
try {
Object obj =
ClassLoaderUtils.loadClass(
- classProperty, getClass()).newInstance();
+ classProperty, getClass()).getDeclaredConstructor().newInstance();
if (!elementClass.isInstance(obj)) {
throw new IllegalArgumentException(
"Element '" + elementName + "' must be of type "
+ elementClass.getName() + ".");
}
bean.addPropertyValue(elementName, obj);
- } catch (IllegalAccessException | ClassNotFoundException | InstantiationException ex) {
+ } catch (IllegalAccessException | ClassNotFoundException | InstantiationException
+ | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
+ | SecurityException ex) {
throw new IllegalArgumentException(
"Element '" + elementName + "' could not load "
+ classProperty
diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml
index cfa6145435..18bb0ae69e 100644
--- a/rt/transports/jms/pom.xml
+++ b/rt/transports/jms/pom.xml
@@ -32,6 +32,11 @@
<cxf.module.name>org.apache.cxf.transport.jms</cxf.module.name>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
index 030ce3e149..8aeb66b9d6 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
@@ -535,6 +535,7 @@ public class JMSConduit extends AbstractConduit implements JMSExchangeSender, Me
}
@Override
+ @SuppressWarnings("deprecation")
protected void finalize() throws Throwable {
close();
super.finalize();
diff --git a/rt/transports/udp/pom.xml b/rt/transports/udp/pom.xml
index fc4c3eb841..02d6880d05 100644
--- a/rt/transports/udp/pom.xml
+++ b/rt/transports/udp/pom.xml
@@ -65,5 +65,10 @@
<artifactId>slf4j-jdk14</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
index 6f32514bb8..968187b06a 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
@@ -20,6 +20,7 @@
package org.apache.cxf.transport.websocket.atmosphere;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@@ -90,8 +91,10 @@ public class AtmosphereWebSocketJettyDestination extends JettyHTTPDestination im
Class<?> dcc = ClassUtils.forName("org.eclipse.jetty.util.DecoratedObjectFactory",
getClass().getClassLoader());
handler.getServletContext().setAttribute("org.eclipse.jetty.util.DecoratedObjectFactory",
- dcc.newInstance());
- } catch (ClassNotFoundException | LinkageError | InstantiationException | IllegalAccessException e) {
+ dcc.getDeclaredConstructor().newInstance());
+ } catch (ClassNotFoundException | LinkageError | InstantiationException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
+ | SecurityException e) {
//ignore, old version of Jetty
}
}
diff --git a/rt/ws/eventing/pom.xml b/rt/ws/eventing/pom.xml
index 0e9a10d2df..a2a3ed7bba 100644
--- a/rt/ws/eventing/pom.xml
+++ b/rt/ws/eventing/pom.xml
@@ -43,6 +43,10 @@
<artifactId>cxf-rt-frontend-simple</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml
index bf5ccc889a..73c52b0e49 100644
--- a/rt/ws/policy/pom.xml
+++ b/rt/ws/policy/pom.xml
@@ -52,6 +52,11 @@
</cxf.export.service>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index 937eaa45aa..167832510d 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -120,6 +120,10 @@
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-stax</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-policy-stax</artifactId>
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
index 4c882c94c8..14d18efa02 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
@@ -380,7 +380,7 @@ public class WSS4JStaxInInterceptor extends AbstractWSS4JStaxInterceptor {
} else if (o instanceof String) {
return (Validator)ClassLoaderUtils.loadClass(o.toString(),
WSS4JStaxInInterceptor.class)
- .newInstance();
+ .getDeclaredConstructor().newInstance();
} else {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE,
"Cannot load Validator: " + o);
diff --git a/rt/ws/transfer/pom.xml b/rt/ws/transfer/pom.xml
index 2ce54b17b7..cb21327ec7 100644
--- a/rt/ws/transfer/pom.xml
+++ b/rt/ws/transfer/pom.xml
@@ -24,6 +24,10 @@
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/rt/wsdl/pom.xml b/rt/wsdl/pom.xml
index 18ee1fb254..e51ebbe8a3 100644
--- a/rt/wsdl/pom.xml
+++ b/rt/wsdl/pom.xml
@@ -117,24 +117,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>xerces</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <jdk>[9,)</jdk>
- <property>
- <name>xerces</name>
- <value>true</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
index 7a28ebc92f..f41975e729 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
@@ -230,7 +230,7 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory
} catch (NoSuchMethodException nsme) {
//ignore, use the no-arg constructor
}
- return cls.newInstance();
+ return cls.getDeclaredConstructor().newInstance();
} catch (Exception e) {
throw new ServiceConstructionException(e);
}
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index 260cb93c32..cecaafe1f1 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -175,29 +175,16 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <!-- The 'http://javax.xml.XMLConstants/property/accessExternalSchema' is not supported by Xerces -->
+ <hazelcast.ignoreXxeProtectionFailures>true</hazelcast.ignoreXxeProtectionFailures>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>xerces</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <!-- The 'http://javax.xml.XMLConstants/property/accessExternalSchema' is not supported by Xerces -->
- <hazelcast.ignoreXxeProtectionFailures>true</hazelcast.ignoreXxeProtectionFailures>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/services/sts/systests/advanced/pom.xml b/services/sts/systests/advanced/pom.xml
index 96c9ba4035..211b22aa45 100644
--- a/services/sts/systests/advanced/pom.xml
+++ b/services/sts/systests/advanced/pom.xml
@@ -36,6 +36,14 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/services/sts/systests/basic/pom.xml b/services/sts/systests/basic/pom.xml
index 46235d8db0..f106bf9c2c 100644
--- a/services/sts/systests/basic/pom.xml
+++ b/services/sts/systests/basic/pom.xml
@@ -36,6 +36,14 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
index da5b8ff213..db25fcabf8 100644
--- a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
+++ b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
@@ -275,6 +275,7 @@ public class WSDiscoveryClient implements Closeable {
}
service = null;
}
+ @SuppressWarnings("deprecation")
protected void finalize() throws Throwable {
close();
super.finalize();
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index c67aae44c0..a5019a7ae3 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -37,6 +37,14 @@
<cxf.surefire.enable.assertions>false</cxf.surefire.enable.assertions>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -65,6 +73,10 @@
<artifactId>cxf-services-wsn-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
@@ -148,32 +160,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>java9plus</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- <include>**/*TestCase.java</include>
- <include>**/*TestCases.java</include>
- </includes>
- <excludes>
- <exclude>**/*$*</exclude>
- <!--ignore the test caused by CXF-7270-->
- <exclude>/org/apache/cxf/wsn/RiTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/RiTest.java b/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/RiTest.java
deleted file mode 100644
index a08cc5b84c..0000000000
--- a/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/RiTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.wsn;
-
-import org.junit.Test;
-
-public class RiTest extends WsnBrokerTest {
-
- protected String getProviderImpl() {
- return "com.sun.xml.ws.spi.ProviderImpl";
- }
-
- @Test
- public void testPublisherCustomType() throws Exception {
- try {
- assert false;
- } catch (AssertionError e) {
- //Bug in jaxb prevents this test from passing if assertions are on.
- //We'll just return;
- return;
- }
- super.testPublisherCustomType();
- }
-}
diff --git a/services/xkms/xkms-common/pom.xml b/services/xkms/xkms-common/pom.xml
index f337ba5195..e4753d45e5 100644
--- a/services/xkms/xkms-common/pom.xml
+++ b/services/xkms/xkms-common/pom.xml
@@ -39,6 +39,10 @@
</cxf.osgi.import>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
diff --git a/systests/cdi/cdi-owb/pom.xml b/systests/cdi/cdi-owb/pom.xml
index f43db75f85..b3fd6bc532 100644
--- a/systests/cdi/cdi-owb/pom.xml
+++ b/systests/cdi/cdi-owb/pom.xml
@@ -46,6 +46,14 @@
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
diff --git a/systests/cdi/cdi-weld/pom.xml b/systests/cdi/cdi-weld/pom.xml
index bffaf420ae..67481e9aeb 100644
--- a/systests/cdi/cdi-weld/pom.xml
+++ b/systests/cdi/cdi-weld/pom.xml
@@ -65,6 +65,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
diff --git a/systests/container-integration/grizzly/pom.xml b/systests/container-integration/grizzly/pom.xml
index 470ba2a5e8..c4969fd927 100644
--- a/systests/container-integration/grizzly/pom.xml
+++ b/systests/container-integration/grizzly/pom.xml
@@ -34,6 +34,11 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
diff --git a/systests/forked/pom.xml b/systests/forked/pom.xml
index 441f29c228..a01d8d24cf 100644
--- a/systests/forked/pom.xml
+++ b/systests/forked/pom.xml
@@ -81,6 +81,10 @@
</plugins>
</build>
<dependencies>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index d50a7fe275..9e85e29176 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -34,6 +34,10 @@
<cxf.module.name>org.apache.cxf.systests.jaxrs</cxf.module.name>
</properties>
<dependencies>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml
index ee5f9fd7ff..e91652eef7 100644
--- a/systests/jaxws/pom.xml
+++ b/systests/jaxws/pom.xml
@@ -110,6 +110,14 @@
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
@@ -279,6 +287,12 @@
<version>${cxf.mockito.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb</artifactId>
+ <version>${cxf.jacorb.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
<profile>
diff --git a/systests/rs-sse/rs-sse-base/pom.xml b/systests/rs-sse/rs-sse-base/pom.xml
index e66dc1f95a..af22b1a788 100644
--- a/systests/rs-sse/rs-sse-base/pom.xml
+++ b/systests/rs-sse/rs-sse-base/pom.xml
@@ -62,5 +62,13 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/systests/spring-boot/pom.xml b/systests/spring-boot/pom.xml
index d6698ee1ff..5729290b0b 100644
--- a/systests/spring-boot/pom.xml
+++ b/systests/spring-boot/pom.xml
@@ -62,6 +62,10 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
diff --git a/systests/tracing/pom.xml b/systests/tracing/pom.xml
index 21c3740e24..e175a3113a 100644
--- a/systests/tracing/pom.xml
+++ b/systests/tracing/pom.xml
@@ -60,6 +60,10 @@
<artifactId>slf4j-jdk14</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml
index afc2423843..3c0a92890a 100644
--- a/systests/transports/pom.xml
+++ b/systests/transports/pom.xml
@@ -91,6 +91,10 @@
</plugins>
</build>
<dependencies>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
@@ -369,29 +373,21 @@
<version>${cxf.jetty9.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-alpn-java-server</artifactId>
+ <version>${cxf.jetty9.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-alpn-java-client</artifactId>
+ <version>${cxf.jetty9.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
- <profile>
- <id>jdk9+</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-java-server</artifactId>
- <version>${cxf.jetty9.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-java-client</artifactId>
- <version>${cxf.jetty9.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>jdk16</id>
<activation>
diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index ce53adc2a6..0f987b01cf 100644
--- a/systests/uncategorized/pom.xml
+++ b/systests/uncategorized/pom.xml
@@ -131,6 +131,10 @@
</plugins>
</build>
<dependencies>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-common</artifactId>
@@ -380,6 +384,13 @@
<artifactId>httpclient</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ <version>1.0.6.Final</version>
+ <scope>test</scope>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
<profile>
@@ -392,20 +403,5 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>java9-plus</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.spec.javax.rmi</groupId>
- <artifactId>jboss-rmi-api_1.0_spec</artifactId>
- <version>1.0.6.Final</version>
- <scope>test</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/Server.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/Server.java
index 2af6193804..711d876ad3 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/Server.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/Server.java
@@ -54,7 +54,7 @@ public class Server extends AbstractBusTestServerBase implements VerificationCac
addVerifiers();
try {
- AbstractGreeterImpl implementor = (AbstractGreeterImpl)cls.newInstance();
+ AbstractGreeterImpl implementor = (AbstractGreeterImpl)cls.getDeclaredConstructor().newInstance();
implementor.verificationCache = this;
ep = Endpoint.publish(address, implementor);
} catch (Exception ex) {
diff --git a/testutils/pom.xml b/testutils/pom.xml
index 9e73de61ef..6ba881de83 100644
--- a/testutils/pom.xml
+++ b/testutils/pom.xml
@@ -42,6 +42,24 @@
</cxf.osgi.import>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java b/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
index e3eb171bc1..03e5945631 100644
--- a/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
+++ b/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
@@ -183,7 +183,7 @@ public class ServerLauncher {
Class<? extends AbstractTestServerBase> svcls =
cls.asSubclass(AbstractTestServerBase.class);
if (null == serverArgs) {
- inProcessServer = svcls.newInstance();
+ inProcessServer = svcls.getDeclaredConstructor().newInstance();
} else {
Constructor<? extends AbstractTestServerBase> ctor
= svcls.getConstructor(serverArgs.getClass());
diff --git a/tools/common/pom.xml b/tools/common/pom.xml
index 6e75875dcb..b72cd5cdc9 100644
--- a/tools/common/pom.xml
+++ b/tools/common/pom.xml
@@ -38,6 +38,11 @@
</cxf.osgi.import>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ <version>${cxf.jakarta.jwsapi.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
@@ -59,6 +64,10 @@
<artifactId>cxf-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -71,6 +80,16 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
index 9a9ee25a2f..389b9ca7f5 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
@@ -136,7 +136,7 @@ public class ToolSpec {
String handlerClz = doc.getDocumentElement().getAttribute("handler");
try {
- handler = (Tool)Class.forName(handlerClz).newInstance();
+ handler = (Tool)Class.forName(handlerClz).getDeclaredConstructor().newInstance();
} catch (Exception ex) {
Message message = new Message("FAIL_TO_INSTANTIATE_HANDLER", LOG, handlerClz);
throw new ToolException(message, ex);
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
index 39f98807a4..54b419fd9c 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
@@ -251,7 +251,7 @@ public class CommandLineParserTest {
private boolean isQuolifiedVersion() {
try {
Class<?> c = Class.forName("org.apache.xerces.impl.Version");
- Object o = c.newInstance();
+ Object o = c.getDeclaredConstructor().newInstance();
String v = (String) c.getMethod("getVersion").invoke(o);
v = StringUtils.getFirstFound(v, "(\\d+.\\d+)").trim();
if (v.charAt(0) >= '3') {
diff --git a/tools/corba/pom.xml b/tools/corba/pom.xml
index 39cea89b28..f01689d4bd 100644
--- a/tools/corba/pom.xml
+++ b/tools/corba/pom.xml
@@ -69,7 +69,11 @@
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb-omgapi</artifactId>
+ <version>${cxf.jacorb.version}</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/tools/javato/ws/pom.xml b/tools/javato/ws/pom.xml
index 60f09e9b83..42742bc8e8 100644
--- a/tools/javato/ws/pom.xml
+++ b/tools/javato/ws/pom.xml
@@ -198,56 +198,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>java9-plus</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>jakarta.jws</groupId>
- <artifactId>jakarta.jws-api</artifactId>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/tools/wadlto/jaxrs/pom.xml b/tools/wadlto/jaxrs/pom.xml
index f9b942f927..4a93b43537 100644
--- a/tools/wadlto/jaxrs/pom.xml
+++ b/tools/wadlto/jaxrs/pom.xml
@@ -70,6 +70,11 @@
<artifactId>jakarta.validation-api</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-common</artifactId>
diff --git a/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java b/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
index b1cd224391..ae795294c9 100644
--- a/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
+++ b/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
@@ -305,7 +305,7 @@ public class JavaScriptContainer extends WSDLToJavaContainer {
true,
Thread.currentThread()
.getContextClassLoader())
- .newInstance();
+ .getDeclaredConstructor().newInstance();
validators.add(validator);
} catch (Exception ex) {
LOG.log(Level.WARNING, "EXTENSION_ADD_FAILED_MSG", ex);