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 18:09:36 UTC
(cxf) branch 3.6.x-fixes updated (a5a3a74a34 -> f7826a08bb)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from a5a3a74a34 Recording .gitmergeinfo Changes
new 1861414b11 Bump org.owasp:dependency-check-maven from 12.1.8 to 12.1.9 (#2726)
new 8f90bf1cb1 Bump org.graalvm.buildtools:native-maven-plugin from 0.11.2 to 0.11.3 (#2725)
new ba803aa966 Update PMD to 7.18.0 (#2697)
new 4c109efb5b Fix subresource proxy creation for MicroProfileClientProxyImpl
new ebb223ac46 Recording .gitmergeinfo Changes
new f7826a08bb 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 | 4 ++--
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, 44 insertions(+), 43 deletions(-)
(cxf) 02/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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8f90bf1cb126df01e4ba53631c09043885cc1680
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)
(cherry picked from commit 1eca1a5067fc92fba0cc370a417cec9aed2b1b0d)
---
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 7bbf17a72f..e8dee6daba 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 ab6e594573..7867935189 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 4c7b76d59f..221db1767f 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 d6dd022fe0..dfb25e3e92 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) 04/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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4c109efb5b770818273ae65259958b8bb7a63625
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)
(cherry picked from commit 36c4eb9ee25e2a58323b1be720c4ed57f88c61e2)
---
.../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 aea834b51d..db7c84ecc3 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
@@ -318,8 +318,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);
}
@@ -352,6 +351,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 3e24b4ba8e..bf4d5f5bee 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
@@ -450,6 +450,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) 05/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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ebb223ac46d4e73eb9660eaac3fee0ed0e3af4c2
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Nov 13 13:05:15 2025 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 544310b2d1..01d25cdda9 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -192,6 +192,7 @@ B 824fe9a79aaf16762157156915be09c9b9ce23c4
B 82dcfc42def87dca528f3be173e5f8a5d9f45b1c
B 83d19ef010183e53c5bbdecd14316dfe9fd09c3a
B 83dbdfa61b1fcea20cda11f8d3ecce427933758a
+B 84001789e212fb91935ff4dd5049c196a21f1d9e
B 8433b2bbf6eedc177aa537e4a4058505220e019c
B 853facf1466661d74ccce985926063ed12d3a9d5
B 868bedf07934feb05e1d9c8319d93f833fe482e5
@@ -293,6 +294,7 @@ B c56c9797b8bc92570d48e6618fe8f450a0d188db
B c58b508fd044acb1ff5da4d80009710b54567dea
B c59992c6fe6ec3205de0499d2beb91ffbcdd760a
B c5d8d3cdedb56d3fe6d457bec56b8323a3a25306
+B c620ab0aa71ed43c812014b6269d2c3f13740cef
B c788d82cb02b3257d3ec560de0df4a6130ba93e9
B c7b4aa0adcf465b43f5088a9be6ec5969e47a6db
B c83b4c1b0a229efc01c67d9250cdc4081855d52c
@@ -363,6 +365,7 @@ B ea8b32093020842261e395ebaa7cb458faa7bd07
B eb8b1c5f0c3f42edbd50a715736e3105f138ee27
B ec1ffc66d13a7cde72ef74b0a98b3c1eca0636dd
B ecf51859f9e594870b1939eda675f1a4a81a68ac
+B ee9d57f0b1f53d24681fd3ebb5b4cb492ee8d180
B eee70693019e46e52c8128482ea04676365716df
B ef0e6abcb0fcba5319ed57a4e64c50c28c02fca5
B f00b5ad4b55c24a55ef4a7ae75151fd06c100877
@@ -1075,6 +1078,7 @@ M 79d04dc22ce13370434fa41f8ad2ad7df7d52058
M 79da13fc29d7c94da41b7f4510eaceeb725885ab
M 79fd113bae51d0e9bf0300f1e79a9c6add5d3563
M 7a20ba731f51919688e5c1f0e7d9614fb10b1cb9
+M 7a28bfa5998b84a0dabcecd8a46b74adf70ec109
M 7a503ee7c7a9cdb3068930a24f9f2b1dd4992825
M 7ab74899002f69055175dacae946b7664413c9ad
M 7ae196bbff8a16ea9d9d52999c853e4ea40f4fa8
@@ -1469,6 +1473,7 @@ M c16423ce707411ec444e87300a10ae355ca1b620
M c1a12b8f1aff3bba97a276afff04641b2d56b086
M c1fed11757c28444bd53e7652f19c4a4e2c0352c
M c27fc631a25999c41a7eca90a5fee51800da7ad0
+M c293dea6a2acb7d06608dcf302fa1c3ba6f3a820
M c298cb37a5dcfb105644eb76d289c35a384b150a
M c378cb2326dde28f0c86e130791f31622b054c89
M c420aaf4f597e83e82c8b0f300bb0b7d09b418df
@@ -1518,6 +1523,7 @@ M cc4086b36892a843884e0ac38d76ae09660d0661
M cd2218e5327360b9784dfeb8dae0ca6a9faa2b41
M cd83d93893202c69a3a3de16b13431acbe99b577
M cda92d7af591baa91b02d2985844f7cbacad42ce
+M cdd2693d883148c3b172c8dc312fef7a50a280b9
M cddb748c23c4f7a1854dfffc525a4a63edc06ee2
M cde59dafde1d0aa03553cc765a17ccbdeeeb2cb1
M ce035b5bb81fe65f18b352d4164b18e75b03fe0e
(cxf) 01/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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1861414b111a470a6fea45dab393a53e6ed5d6a8
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)
(cherry picked from commit cdd2693d883148c3b172c8dc312fef7a50a280b9)
# Conflicts:
# pom.xml
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5f04cf08b7..028c827419 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>
</properties>
<distributionManagement>
<repository>
(cxf) 03/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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ba803aa966ff8aaf9c2a8c7333c91e8c58917946
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
(cherry picked from commit 7a28bfa5998b84a0dabcecd8a46b74adf70ec109)
# 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 34837f67e2..244a3f81d4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -435,12 +435,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 028c827419..4ab8c72dbd 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>3.3.4</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 b13d2d2e61..b7cb123d2a 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
@@ -294,6 +294,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 e96799d970..bdbbf4a2c3 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
@@ -36,6 +36,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 5d30d9abb7..4d1e1c95ec 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 1612c5ae10..0c80e6ca58 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
@@ -1065,6 +1065,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,
@@ -1099,6 +1100,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 0121cde4ee..1e20ef0e4b 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
@@ -599,6 +599,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 20936bebdf..3e24b4ba8e 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
@@ -110,6 +110,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,
@@ -126,6 +127,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 695c0aed6e..57822320ff 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
@@ -101,6 +101,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 fa7b948893..df085dc79b 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
@@ -37,7 +37,6 @@ public class LoggingHandler implements SOAPHandler<SOAPMessageContext> {
private PrintStream out;
public LoggingHandler() {
- //setLogStream(System.out);
setLogStream(new PrintStream(new ByteArrayOutputStream()));
}
@@ -50,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....");
}
/*
@@ -79,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/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 49ecca882e..5855f9d794 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
@@ -48,25 +48,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....");
}
/*
@@ -77,20 +73,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 651bed3c99..3a63044515 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) 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f7826a08bb595840e457d74006d2ee4667e8a996
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Nov 13 13:05:25 2025 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 01d25cdda9..8ce11ee466 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -660,6 +660,7 @@ M 2d1dbd8a9a3dd602653cd7bf7f0106e97fe2e5cd
M 2d5d085df8621805ff33640f7aa43b47d098622d
M 2db882176d45017b2fc53046bdabdd2da53b886f
M 2dfd3bf93e1db856f456058ea0d1ab3d0eb380af
+M 2e38a84f74a86f1469a409989fa76da902fba65d
M 2e61db4b5014fe6d7e8309301788585936375476
M 2ec08fac115e6b287510da55eb72a7f8c1b72bdb
M 2ec76bb8ac23983e6f5bea832576c56e526c71f6