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/11/13 13:42:54 UTC
(cxf) branch 4.0.x-fixes updated (84001789e2 -> c620ab0aa7)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 84001789e2 [maven-release-plugin] prepare for next development iteration
new 2e38a84f74 Bump com.puppycrawl.tools:checkstyle from 12.1.1 to 12.1.2 (#2727)
new cdd2693d88 Bump org.owasp:dependency-check-maven from 12.1.8 to 12.1.9 (#2726)
new 1eca1a5067 Bump org.graalvm.buildtools:native-maven-plugin from 0.11.2 to 0.11.3 (#2725)
new 7a28bfa599 Update PMD to 7.18.0 (#2697)
new 36c4eb9ee2 Fix subresource proxy creation for MicroProfileClientProxyImpl
new c620ab0aa7 Recording .gitmergeinfo Changes
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 7 +++++++
.../src/main/release/samples/jax_rs/graalvm_basic/pom.xml | 4 ++--
.../src/main/release/samples/jaxws_graalvm/pom.xml | 4 ++--
.../release/samples/jaxws_graalvm_dynamic/client/pom.xml | 2 +-
.../release/samples/jaxws_graalvm_dynamic/server/pom.xml | 2 +-
parent/pom.xml | 6 +++---
pom.xml | 4 ++--
.../cxf/binding/corba/types/CorbaStructEventProducer.java | 1 +
.../java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java | 1 +
.../handler/logical/LogicalHandlerFaultInInterceptor.java | 1 +
.../jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java | 1 +
.../cxf/management/counters/ResponseTimeCounter.java | 1 -
.../java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java | 8 ++++++--
.../main/java/org/apache/cxf/jaxrs/client/WebClient.java | 2 ++
.../org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 1 +
.../client/proxy/MicroProfileClientProxyImpl.java | 11 +++++++++++
.../oauth2/provider/AbstractOAuthDataProvider.java | 1 +
.../org/apache/cxf/systest/handlers/LoggingHandler.java | 15 ---------------
.../org/apache/cxf/systest/soapfault/LoggingHandler.java | 14 --------------
.../tools/corba/processors/wsdl/WSDLToCorbaBinding.java | 2 +-
.../apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java | 1 +
21 files changed, 45 insertions(+), 44 deletions(-)
(cxf) 05/06: Fix subresource proxy creation for MicroProfileClientProxyImpl
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 36c4eb9ee25e2a58323b1be720c4ed57f88c61e2
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Nov 12 21:21:32 2025 -0500
Fix subresource proxy creation for MicroProfileClientProxyImpl
(cherry picked from commit 58727eb07018c13e3712ec2f8e94b612e1893e01)
---
.../main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java | 8 ++++++--
.../microprofile/client/proxy/MicroProfileClientProxyImpl.java | 9 +++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
index 2cf922e40c..467af934c8 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
@@ -317,8 +317,7 @@ public class ClientProxyImpl extends AbstractClient implements
ClientState newState = getState().newState(uri, subHeaders,
getTemplateParametersMap(ori.getURITemplate(), pathParams));
- ClientProxyImpl proxyImpl =
- new ClientProxyImpl(newState, proxyLoader, subCri, false, inheritHeaders);
+ ClientProxyImpl proxyImpl = createProxy(newState, proxyLoader, subCri, false, inheritHeaders);
proxyImpl.setConfiguration(getConfiguration());
return JAXRSClientFactory.createProxy(m.getReturnType(), proxyLoader, proxyImpl);
}
@@ -351,6 +350,11 @@ public class ClientProxyImpl extends AbstractClient implements
}
+ protected ClientProxyImpl createProxy(final ClientState newState, final ClassLoader loader,
+ final ClassResourceInfo newCri, final boolean isNewRoot, final boolean newInheritHeaders) {
+ return new ClientProxyImpl(newState, loader, newCri, isNewRoot, newInheritHeaders);
+ }
+
protected void addNonEmptyPath(UriBuilder builder, String pathValue) {
if (!SLASH.equals(pathValue)) {
builder.path(pathValue);
diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
index ac5cfa04e8..c5a0800e0e 100644
--- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
+++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
@@ -449,6 +449,15 @@ public class MicroProfileClientProxyImpl extends ClientProxyImpl {
}
}
+ @Override
+ protected ClientProxyImpl createProxy(final ClientState newState, final ClassLoader loader,
+ final ClassResourceInfo newCri, final boolean isNewRoot, final boolean newInheritHeaders) {
+ final ExecutorService executor = (ExecutorService) cfg.getRequestContext().get(EXECUTOR_SERVICE_PROPERTY);
+ final Configuration configuration = (Configuration) cfg.getRequestContext().get(Configuration.class.getName());
+ return new MicroProfileClientProxyImpl(newState, loader, newCri, isNewRoot, newInheritHeaders,
+ executor, configuration, interceptorWrapper, tlsConfig);
+ }
+
private <T> T mapInstance(Instance<T> instance) {
cdiInstances.add(instance);
return instance.getValue();
(cxf) 06/06: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c620ab0aa71ed43c812014b6269d2c3f13740cef
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Nov 13 08:32:09 2025 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 140f603b4f..c9603b5ad8 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,4 +1,5 @@
origin/main
+B 2e5c1ba89f96b9a11cc2a75bbb61281520100035
B 331c64bf5020904ecf179c521691a955fdfe11f3
B 3bdbc420f641131a6786f9e17e1e232ed64d33c0
B 5aef1e4fbef4877f7e1b310e054dfb8e7af25a85
@@ -10,6 +11,7 @@ B 7fb95ad266e4a5ced561a0dc56c038db43967ca4
B 85f681bd0e70636289aacf36a32c841f03db7ee8
B 89c8e33cd4eea9cb2285dfbaeeadb87697259ef5
B 8e8e52f010b803a4fdc2db6fa6271d85bf061a3c
+B a029714bfe9fa2aedd5bb22f1c384104b4060e20
B a67d7379e02f48f7119ce7c9fc7621567ced3a37
B bc284de65cbe7a7b7a3a4d9ef4823e72b106021b
B c0c009007e15b2f7fd8975176ded12618272eb11
@@ -78,6 +80,7 @@ M 16296b09c5adc51aeb781321b47917170e33f8ed
M 165e4b39b53225d18d7eb897874e681473f0998d
M 16e2bd76191541a05654846e42af9583182d7699
M 16f424fa4cafb6f0adb0feb25220888538ab1bff
+M 17164f93d93538d56a2b3860d7131194dcdb1030
M 1722b75432e280af08126573d5b9fd5450c21a63
M 17d5f097db56b068a73bad99ca210a3c063b0b7a
M 1814a1d9f42f492cd20733cf9969afe65989050f
@@ -251,6 +254,7 @@ M 4bd5ac3b7b98001cddf8873458f42a14d0d97ab4
M 4be33dce0cad5353a094fe08aba49989b93eb99b
M 4d70a40429b65ca764e125d4ba4d4335336e96ac
M 4d8a34318074bc5b2e79ddd8be8c1981176dc980
+M 4e79dd119d175f2b7b6e682eddae4972d74e4254
M 4e960cf9acdc777319c8d56bb12115e08fc79af5
M 4f16fb986dadbc87d53d13fb17a23b8c95ad5ac3
M 50058598b0caddc83b4a23b2454af25d1c23a76e
@@ -403,6 +407,7 @@ M 81a3dc73acf4bb5ec52099ab65137662984dea85
M 81f2683bfe081b44514a57bb80f0b1ca4986742e
M 82bea1f66a38bf11efaeae776566baa796d841a4
M 836169d7c5a5386041bc4fd84a6406aff8d36869
+M 8404794c0eab81984f5129390b278c3d15466ccb
M 8412ed8a29be3d0ae1481d7344c7a296ea42494b
M 842957ece9761b2cd23946cdd82f4a3a77de3e0f
M 847055984da12293aa6b3c2fe1dfe4845200dff9
@@ -471,6 +476,7 @@ M 9a6702ad89c283c3c281c7d035d9f4b95ae62c78
M 9a9fbe94ca928bb619fbcff326c08fcf4f482c22
M 9b09bfcbdf596bef5c4bc1c511caa2e0ad4cc92e
M 9bef7a027c3ff17fed3568f9ef1e338c43132d36
+M 9c792208c1419d97d7b1815dba3282f5391b7325
M 9cdc5e53db22c0362ed63080fe82399adc06f2b2
M 9db8e320b95fa79b13f5b43c5a3bebf822044a60
M 9deffa6ddfa9df0ea8011a54dd16773c059fe5e9
@@ -667,6 +673,7 @@ M e210dbf4f015227ebb5bd089e3c2582a9ceacf1f
M e2497a3a96276fbca69ba279b85b852695a0c14c
M e272c5e9452eddfbbfe3c7b11140f83308a59697
M e39da917db1728115039f2e93da7456bfd7f18ca
+M e3c0c6edfff3eb64a834725b0e81349061dc5102
M e3e039cf272879c28bf5baaef8a4d5ee297545a6
M e60fd15ce98e4f1fe1278a0f29c95600e48700ca
M e6489a12edd2289477e3ed71b2fd1257ea55fede
(cxf) 04/06: Update PMD to 7.18.0 (#2697)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7a28bfa5998b84a0dabcecd8a46b74adf70ec109
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Nov 12 11:28:58 2025 -0500
Update PMD to 7.18.0 (#2697)
(cherry picked from commit e3c0c6edfff3eb64a834725b0e81349061dc5102)
# Conflicts:
# pom.xml
---
parent/pom.xml | 4 ++--
pom.xml | 2 +-
.../cxf/binding/corba/types/CorbaStructEventProducer.java | 1 +
.../java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java | 1 +
.../handler/logical/LogicalHandlerFaultInInterceptor.java | 1 +
.../jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java | 1 +
.../cxf/management/counters/ResponseTimeCounter.java | 1 -
.../main/java/org/apache/cxf/jaxrs/client/WebClient.java | 2 ++
.../org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 1 +
.../client/proxy/MicroProfileClientProxyImpl.java | 2 ++
.../oauth2/provider/AbstractOAuthDataProvider.java | 1 +
.../org/apache/cxf/systest/handlers/LoggingHandler.java | 15 ---------------
.../org/apache/cxf/systest/soapfault/LoggingHandler.java | 14 --------------
.../tools/corba/processors/wsdl/WSDLToCorbaBinding.java | 2 +-
.../apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java | 1 +
15 files changed, 15 insertions(+), 34 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 2847206849..2060be4f97 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -432,12 +432,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
- <version>7.17.0</version>
+ <version>7.18.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
- <version>7.17.0</version>
+ <version>7.18.0</version>
</dependency>
</dependencies>
<configuration>
diff --git a/pom.xml b/pom.xml
index f5e879b79d..22a47472aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
</issueManagement>
<properties>
<cxf.compiler.fork>false</cxf.compiler.fork>
- <cxf.build-utils.version>4.1.2</cxf.build-utils.version>
+ <cxf.build-utils.version>4.1.3-SNAPSHOT</cxf.build-utils.version>
<cxf.xjc-utils.version>4.0.1</cxf.xjc-utils.version>
<cxf.jdk.version>11</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java
index d1280d477c..1543833384 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java
@@ -40,6 +40,7 @@ public class CorbaStructEventProducer extends AbstractStartEndEventProducer {
}
+ @SuppressWarnings("PMD.IdenticalConditionalBranches")
public int next() {
int event = states[state];
if (event != 0) {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
index 0d65ee2247..3d7e9d10ed 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
@@ -293,6 +293,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
}
}
//CHECKSTYLE:OFF
+ @SuppressWarnings("PMD.ExcessiveParameterList")
private String substituteVarargs(URITemplate templ,
Map<String, Object> alreadyResolvedTs,
Map<String, Object> alreadyResolvedTsPathEnc,
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java
index c5abf991ce..d98b23d5b1 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java
@@ -35,6 +35,7 @@ public class LogicalHandlerFaultInInterceptor
addAfter(SOAPHandlerFaultInInterceptor.class.getName());
}
+ @SuppressWarnings("PMD.IdenticalConditionalBranches")
@Override
public void handleMessage(Message message) {
if (binding.getHandlerChain().isEmpty()) {
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
index e1438b4e80..6480f83f9f 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
@@ -105,6 +105,7 @@ public class SOAPHandlerFaultInInterceptor extends
}
}
+ @SuppressWarnings("PMD.IdenticalConditionalBranches")
private void handleAbort(SoapMessage message, MessageContext context) {
if (isRequestor(message)) {
diff --git a/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounter.java b/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounter.java
index 2143ec34fb..60e8c0748b 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounter.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/counters/ResponseTimeCounter.java
@@ -46,7 +46,6 @@ public class ResponseTimeCounter implements ResponseTimeCounterMBean, Counter {
objectName = on;
}
- @SuppressWarnings("PMD.UselessPureMethodCall")
public void increase(MessageHandlingTimeRecorder mhtr) {
if (!enabled) {
return;
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
index 85c658a86c..f8753f6838 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
@@ -1064,6 +1064,7 @@ public class WebClient extends AbstractClient {
inAnns, respClass, outType, exchange, invContext);
}
//CHECKSTYLE:OFF
+ @SuppressWarnings("PMD.ExcessiveParameterList")
protected Response doChainedInvocation(String httpMethod,
MultivaluedMap<String, String> headers,
Object body,
@@ -1098,6 +1099,7 @@ public class WebClient extends AbstractClient {
}
//CHECKSTYLE:OFF
+ @SuppressWarnings("PMD.ExcessiveParameterList")
private Message finalizeMessage(String httpMethod,
MultivaluedMap<String, String> headers,
Object body,
diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 86c536f05c..07c9d67eca 100644
--- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -600,6 +600,7 @@ public class WadlGenerator implements ContainerRequestFilter {
}
// CHECKSTYLE:OFF
+ @SuppressWarnings("PMD.ExcessiveParameterList")
protected boolean handleOperation(StringBuilder sb, Set<Class<?>> jaxbTypes,
ElementQNameResolver qnameResolver, Map<Class<?>, QName> clsMap,
OperationResourceInfo ori, Map<Parameter, Object> classParams,
diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
index 08df9824f8..ac5cfa04e8 100644
--- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
+++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
@@ -109,6 +109,7 @@ public class MicroProfileClientProxyImpl extends ClientProxyImpl {
private final TLSConfiguration tlsConfig;
//CHECKSTYLE:OFF
+ @SuppressWarnings("PMD.ExcessiveParameterList")
public MicroProfileClientProxyImpl(URI baseURI, ClassLoader loader, ClassResourceInfo cri,
boolean isRoot, boolean inheritHeaders, ExecutorService executorService,
Configuration configuration, CDIInterceptorWrapper interceptorWrapper,
@@ -125,6 +126,7 @@ public class MicroProfileClientProxyImpl extends ClientProxyImpl {
init(executorService, configuration);
}
+ @SuppressWarnings("PMD.ExcessiveParameterList")
public MicroProfileClientProxyImpl(ClientState initialState, ClassLoader loader, ClassResourceInfo cri,
boolean isRoot, boolean inheritHeaders, ExecutorService executorService,
Configuration configuration, CDIInterceptorWrapper interceptorWrapper,
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
index bd34e1968d..26f7492849 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
@@ -100,6 +100,7 @@ public abstract class AbstractOAuthDataProvider implements OAuthDataProvider, Cl
}
//CHECKSTYLE:OFF
+ @SuppressWarnings("PMD.ExcessiveParameterList")
protected ServerAccessToken doCreateAccessToken(List<String> audiences,
Client client,
String clientCodeVerifier,
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java
index 4557bb5348..a5717afa08 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java
@@ -38,7 +38,6 @@ public class LoggingHandler implements SOAPHandler<SOAPMessageContext> {
private PrintStream out;
public LoggingHandler() {
- //setLogStream(System.out);
setLogStream(new PrintStream(new ByteArrayOutputStream()));
}
@@ -51,25 +50,21 @@ public class LoggingHandler implements SOAPHandler<SOAPMessageContext> {
}
public boolean handleMessage(SOAPMessageContext smc) {
- //System.out.println("LoggingHandler : handleMessage Called....");
logToSystemOut(smc);
return true;
}
public boolean handleFault(SOAPMessageContext smc) {
- //System.out.println("LoggingHandler : handleFault Called....");
logToSystemOut(smc);
return true;
}
// nothing to clean up
public void close(MessageContext messageContext) {
- //System.out.println("LoggingHandler : close() Called....");
}
// nothing to clean up
public void destroy() {
- //System.out.println("LoggingHandler : destroy() Called....");
}
/*
@@ -80,20 +75,10 @@ public class LoggingHandler implements SOAPHandler<SOAPMessageContext> {
* SOAPException or IOException
*/
protected void logToSystemOut(SOAPMessageContext smc) {
- Boolean outboundProperty = (Boolean)smc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
-
- if (outboundProperty.booleanValue()) {
- //out.println("\nOutbound message:");
- } else {
- //out.println("\nInbound message:");
- }
-
SOAPMessage message = smc.getMessage();
try {
message.writeTo(out);
- //out.println();
} catch (Exception e) {
- //out.println("Exception in handler: " + e);
e.printStackTrace();
}
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java
index 597d1b6834..a8d428336f 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java
@@ -49,25 +49,21 @@ public class LoggingHandler implements SOAPHandler<SOAPMessageContext> {
}
public boolean handleMessage(SOAPMessageContext smc) {
- //System.out.println("LoggingHandler : handleMessage Called....");
logToSystemOut(smc);
return true;
}
public boolean handleFault(SOAPMessageContext smc) {
- //System.out.println("LoggingHandler : handleFault Called....");
logToSystemOut(smc);
return true;
}
// nothing to clean up
public void close(MessageContext messageContext) {
- //System.out.println("LoggingHandler : close() Called....");
}
// nothing to clean up
public void destroy() {
- //System.out.println("LoggingHandler : destroy() Called....");
}
/*
@@ -78,20 +74,10 @@ public class LoggingHandler implements SOAPHandler<SOAPMessageContext> {
* SOAPException or IOException
*/
protected void logToSystemOut(SOAPMessageContext smc) {
- Boolean outboundProperty = (Boolean)smc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
-
- if (outboundProperty.booleanValue()) {
- //out.println("\nOutbound message:");
- } else {
- //out.println("\nInbound message:");
- }
-
SOAPMessage message = smc.getMessage();
try {
message.writeTo(out);
- //out.println();
} catch (Exception e) {
- //out.println("Exception in handler: " + e);
e.printStackTrace();
}
}
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
index 0867edc26f..4591cbbd3e 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
@@ -863,7 +863,7 @@ public class WSDLToCorbaBinding {
if (verboseOn) {
ex.printStackTrace();
}
- System.exit(1); //NOPMD
+ System.exit(1);
}
}
diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index 78379e9d8b..df6822b591 100644
--- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -1179,6 +1179,7 @@ public class SourceGenerator {
sbCode.append(localName).append(' ');
}
//CHECKSTYLE:OFF: ParameterNumber
+ @SuppressWarnings("PMD.ExcessiveParameterList")
private void writeRequestTypes(Element requestEl,
String classPackage,
Element repElement,
(cxf) 02/06: Bump org.owasp:dependency-check-maven from 12.1.8 to 12.1.9 (#2726)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit cdd2693d883148c3b172c8dc312fef7a50a280b9
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Nov 12 11:28:00 2025 -0500
Bump org.owasp:dependency-check-maven from 12.1.8 to 12.1.9 (#2726)
Bumps [org.owasp:dependency-check-maven](https://github.com/dependency-check/DependencyCheck) from 12.1.8 to 12.1.9.
- [Release notes](https://github.com/dependency-check/DependencyCheck/releases)
- [Changelog](https://github.com/dependency-check/DependencyCheck/blob/main/CHANGELOG.md)
- [Commits](https://github.com/dependency-check/DependencyCheck/compare/v12.1.8...v12.1.9)
---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-maven
dependency-version: 12.1.9
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 8404794c0eab81984f5129390b278c3d15466ccb)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1f16b2f4c3..f5e879b79d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<cxf.jdk.version>11</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
- <maven-owasp-plugin-version>12.1.8</maven-owasp-plugin-version>
+ <maven-owasp-plugin-version>12.1.9</maven-owasp-plugin-version>
<preparationGoals>clean install</preparationGoals>
</properties>
<distributionManagement>
(cxf) 03/06: Bump org.graalvm.buildtools:native-maven-plugin from 0.11.2 to 0.11.3 (#2725)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1eca1a5067fc92fba0cc370a417cec9aed2b1b0d
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Nov 12 11:28:19 2025 -0500
Bump org.graalvm.buildtools:native-maven-plugin from 0.11.2 to 0.11.3 (#2725)
Bumps [org.graalvm.buildtools:native-maven-plugin](https://github.com/graalvm/native-build-tools) from 0.11.2 to 0.11.3.
- [Release notes](https://github.com/graalvm/native-build-tools/releases)
- [Commits](https://github.com/graalvm/native-build-tools/compare/0.11.2...0.11.3)
---
updated-dependencies:
- dependency-name: org.graalvm.buildtools:native-maven-plugin
dependency-version: 0.11.3
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit b6125ca0afb17b478a6b9ce189edb80c6d30a199)
---
distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml | 4 ++--
distribution/src/main/release/samples/jaxws_graalvm/pom.xml | 4 ++--
.../src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml | 2 +-
.../src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml b/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml
index 7fb9ccb7a2..61692ab604 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml
@@ -67,7 +67,7 @@
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
- <version>0.11.2</version>
+ <version>0.11.3</version>
<executions>
<execution>
<goals>
@@ -125,7 +125,7 @@
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
- <version>0.11.2</version>
+ <version>0.11.3</version>
<executions>
<execution>
<goals>
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/pom.xml b/distribution/src/main/release/samples/jaxws_graalvm/pom.xml
index 8c9951586b..59b9784dfb 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_graalvm/pom.xml
@@ -92,7 +92,7 @@
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
- <version>0.11.2</version>
+ <version>0.11.3</version>
<executions>
<execution>
<goals>
@@ -146,7 +146,7 @@
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
- <version>0.11.2</version>
+ <version>0.11.3</version>
<executions>
<execution>
<goals>
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml
index fd1452c0ee..58e01d12dd 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml
@@ -41,7 +41,7 @@
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
- <version>0.11.2</version>
+ <version>0.11.3</version>
<executions>
<execution>
<goals>
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml
index d0bfb8c3bf..ce18852c31 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml
@@ -68,7 +68,7 @@
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
- <version>0.11.2</version>
+ <version>0.11.3</version>
<executions>
<execution>
<goals>
(cxf) 01/06: Bump com.puppycrawl.tools:checkstyle from 12.1.1 to 12.1.2 (#2727)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2e38a84f74a86f1469a409989fa76da902fba65d
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Nov 12 11:25:44 2025 -0500
Bump com.puppycrawl.tools:checkstyle from 12.1.1 to 12.1.2 (#2727)
Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 12.1.1 to 12.1.2.
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-12.1.1...checkstyle-12.1.2)
---
updated-dependencies:
- dependency-name: com.puppycrawl.tools:checkstyle
dependency-version: 12.1.2
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 1b59ea3386240b06bbe08a8bc05544fc4316492f)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 88c781249c..2847206849 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -394,7 +394,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>12.1.1</version>
+ <version>12.1.2</version>
</dependency>
</dependencies>
<configuration>