This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new e3c0c6edff Update PMD to 7.18.0 (#2697)
e3c0c6edff is described below
commit e3c0c6edfff3eb64a834725b0e81349061dc5102
Author: Andriy Redko <[email protected]>
AuthorDate: Wed Nov 12 11:28:58 2025 -0500
Update PMD to 7.18.0 (#2697)
---
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 7ab2938a90..5814406c2f 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 a72135db7b..86046619a3 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.1.1</cxf.xjc-utils.version>
<cxf.jdk.version>17</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 fcde90da56..c113186377 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,
