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/10/05 16:23:51 UTC
(cxf) branch 4.0.x-fixes updated (07e155aa38 -> 21fdf22445)
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 07e155aa38 Fix PMD violations (post-merge)
new c0c324a325 Add more tests for sync / async client to excercise parallel calls
new e7c85087e9 Bump github/codeql-action from 3.30.3 to 3.30.5 (#2630)
new 6f7c653a58 Bump actions/cache from 4.2.4 to 4.3.0 (#2631)
new df7c6986de Update JUnit to 5.14.0
new 0ae3465349 Bump org.codehaus.mojo:exec-maven-plugin from 3.5.1 to 3.6.0 (#2637)
new 6c3a1d45ae Bump io.swagger.core.v3:swagger-jaxrs2-jakarta from 2.2.37 to 2.2.38 (#2634)
new 3db1398fdb Bump org.codehaus.plexus:plexus-archiver from 4.10.1 to 4.10.2 (#2638)
new 6139f5ae83 Bump org.apache.maven.plugins:maven-dependency-plugin (#2642)
new e7b6a54e60 Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.6.1 to 3.6.2 (#2641)
new e7d59b91b6 Bump org.webjars:swagger-ui from 5.28.1 to 5.29.2 (#2643)
new e0a24da3da CXF-8691: Logging Feature - Sensitive element with arrays (JSON) (#2640)
new e58be91d60 Update ASM to 9.9
new 21fdf22445 Recording .gitmergeinfo Changes
The 13 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:
.github/workflows/codeql-analysis.yml | 6 +--
.gitmergeinfo | 6 +++
distribution/src/main/release/samples/pom.xml | 6 +--
parent/pom.xml | 10 ++---
pom.xml | 4 +-
.../cxf/ext/logging/MaskSensitiveHelper.java | 12 +++++-
.../cxf/ext/logging/MaskSensitiveHelperTest.java | 7 +++-
.../jaxrs/JAXRSAsyncClientChunkingTest.java | 41 ++++++++++++++++++
.../cxf/systest/jaxrs/JAXRSClientChunkingTest.java | 48 ++++++++++++++++++++++
9 files changed, 124 insertions(+), 16 deletions(-)
(cxf) 04/13: Update JUnit to 5.14.0
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 df7c6986de5c699eb1001052ac3e2bc739201695
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Sep 30 22:08:13 2025 -0400
Update JUnit to 5.14.0
(cherry picked from commit 4b2e8ee1d1959d711c896daab1e23d7de7551278)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ce1aabfef5..0895240f4d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -170,7 +170,7 @@
<cxf.json.bind-api.version>2.0.0</cxf.json.bind-api.version>
<cxf.jsr250.api.version>1.0</cxf.jsr250.api.version>
<cxf.junit.version>4.13.2</cxf.junit.version>
- <cxf.junit5.version>5.13.4</cxf.junit5.version>
+ <cxf.junit5.version>5.14.0</cxf.junit5.version>
<cxf.kerby.version>2.0.3</cxf.kerby.version>
<cxf.ldapsdk.version>7.0.3</cxf.ldapsdk.version>
<cxf.littleproxy.version>2.4.5</cxf.littleproxy.version>
(cxf) 05/13: Bump org.codehaus.mojo:exec-maven-plugin from 3.5.1 to 3.6.0 (#2637)
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 0ae346534997596e5b81a12023503ae64fe27414
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Oct 1 07:32:17 2025 -0400
Bump org.codehaus.mojo:exec-maven-plugin from 3.5.1 to 3.6.0 (#2637)
Bumps [org.codehaus.mojo:exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 3.5.1 to 3.6.0.
- [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/3.5.1...3.6.0)
---
updated-dependencies:
- dependency-name: org.codehaus.mojo:exec-maven-plugin
dependency-version: 3.6.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 6d3e0e525e2193c12c334a6d5624c0de61376459)
---
distribution/src/main/release/samples/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 19e7623d0c..3495cfff1d 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -204,7 +204,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
(cxf) 08/13: Bump org.apache.maven.plugins:maven-dependency-plugin (#2642)
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 6139f5ae83a2ca19be49eadaafedba7c0d6f3a20
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Oct 3 07:33:49 2025 -0400
Bump org.apache.maven.plugins:maven-dependency-plugin (#2642)
Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.8.1 to 3.9.0.
- [Release notes](https://github.com/apache/maven-dependency-plugin/releases)
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.8.1...maven-dependency-plugin-3.9.0)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
dependency-version: 3.9.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 3b59e929728fe88be50688c149c5b0db5b95eb1f)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 75d896b8a4..cf60c6c712 100644
--- a/pom.xml
+++ b/pom.xml
@@ -543,7 +543,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.8.1</version>
+ <version>3.9.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
(cxf) 01/13: Add more tests for sync / async client to excercise parallel calls
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 c0c324a325abecd5ee1bf9ba1171ffb9997a8d7c
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Sep 28 14:44:59 2025 -0400
Add more tests for sync / async client to excercise parallel calls
(cherry picked from commit f7be1cfcf7ffe1c7e0158dbaf97f383cc94c3d83)
---
.../jaxrs/JAXRSAsyncClientChunkingTest.java | 41 ++++++++++++++++++
.../cxf/systest/jaxrs/JAXRSClientChunkingTest.java | 48 ++++++++++++++++++++++
2 files changed, 89 insertions(+)
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientChunkingTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientChunkingTest.java
index 8d754780d5..ad6e3d4baa 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientChunkingTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientChunkingTest.java
@@ -22,6 +22,7 @@ package org.apache.cxf.systest.jaxrs;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -29,6 +30,7 @@ import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
@@ -215,6 +217,45 @@ public class JAXRSAsyncClientChunkingTest extends AbstractBusClientServerTestBas
assertNoDuplicateLogging();
}
+
+ @Test
+ public void testStreamChunkingAsyncParallel()
+ throws IOException, InterruptedException, ExecutionException, TimeoutException {
+ final String url = "http://localhost:" + PORT + "/file-store/stream";
+ final WebClient webClient = WebClient.create(url).query("chunked", chunked);
+
+ final ClientConfiguration config = WebClient.getConfig(webClient);
+ config.getBus().setProperty(AsyncHTTPConduit.USE_ASYNC, true);
+ config.getHttpConduit().getClient().setAllowChunking(chunked);
+ config.getHttpConduit().getClient().setAutoRedirect(autoRedirect);
+ configureLogging(config);
+
+ final byte[] bytes = new byte [32 * 1024];
+ final Random random = new Random();
+ random.nextBytes(bytes);
+
+ final Collection<Future<Response>> futures = new ArrayList<>();
+ try {
+ for (int i = 0; i < 100; ++i) {
+ try (InputStream in = new ByteArrayInputStream(bytes)) {
+ final Entity<InputStream> entity = Entity.entity(in, MediaType.APPLICATION_OCTET_STREAM);
+ futures.add(webClient.async().post(entity));
+ }
+ }
+
+ for (Future<Response> future: futures) {
+ try (Response response = future.get(10, TimeUnit.SECONDS)) {
+ assertThat(response.getStatus(), equalTo(200));
+ assertThat(response.getHeaderString("Transfer-Encoding"), equalTo(chunked ? "chunked" : null));
+ assertThat(response.getEntity(), not(equalTo(null)));
+ }
+ }
+ } finally {
+ webClient.close();
+ }
+
+ assertNoDuplicateLogging();
+ }
private void assertRedirect(String filename) {
final String url = "http://localhost:" + PORT + "/file-store/redirect";
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientChunkingTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientChunkingTest.java
index 88e9b5d020..a8524da8c9 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientChunkingTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientChunkingTest.java
@@ -22,15 +22,23 @@ package org.apache.cxf.systest.jaxrs;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Random;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import jakarta.ws.rs.client.Entity;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.Response;
+import org.apache.cxf.jaxrs.client.ClientConfiguration;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
@@ -113,4 +121,44 @@ public class JAXRSClientChunkingTest extends AbstractBusClientServerTestBase {
webClient.close();
}
}
+
+ @Test
+ public void testStreamChunkingParallel()
+ throws IOException, InterruptedException, ExecutionException, TimeoutException {
+ final String url = "http://localhost:" + PORT + "/file-store/stream";
+ final WebClient webClient = WebClient.create(url).query("chunked", chunked);
+ final ExecutorService pool = Executors.newFixedThreadPool(100);
+
+ final ClientConfiguration config = WebClient.getConfig(webClient);
+ config.getHttpConduit().getClient().setAllowChunking(chunked);
+
+ final byte[] bytes = new byte [32 * 1024];
+ final Random random = new Random();
+ random.nextBytes(bytes);
+
+ final Collection<Future<Response>> futures = new ArrayList<>();
+ try {
+ for (int i = 0; i < 100; ++i) {
+ try (InputStream in = new ByteArrayInputStream(bytes)) {
+ final Entity<InputStream> entity = Entity.entity(in, MediaType.APPLICATION_OCTET_STREAM);
+ futures.add(pool.submit(() -> webClient.post(entity)));
+ }
+ }
+
+ for (Future<Response> future: futures) {
+ try (Response response = future.get(10, TimeUnit.SECONDS)) {
+ assertThat(response.getStatus(), equalTo(200));
+ assertThat(response.getHeaderString("Transfer-Encoding"), equalTo(chunked ? "chunked" : null));
+ assertThat(response.getEntity(), not(equalTo(null)));
+ }
+ }
+ } finally {
+ webClient.close();
+ }
+
+ pool.shutdown();
+ if (!pool.awaitTermination(2, TimeUnit.MINUTES)) {
+ pool.shutdownNow();
+ }
+ }
}
(cxf) 03/13: Bump actions/cache from 4.2.4 to 4.3.0 (#2631)
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 6f7c653a586fb0e4725856390d6a7ad36102dd55
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Sep 29 08:42:48 2025 -0400
Bump actions/cache from 4.2.4 to 4.3.0 (#2631)
Bumps [actions/cache](https://github.com/actions/cache) from 4.2.4 to 4.3.0.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/0400d5f644dc74513175e3cd8d07132dd4860809...0057852bfaa89a56745cba8c7296529d2fc39830)
---
updated-dependencies:
- dependency-name: actions/cache
dependency-version: 4.3.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 2cc9ea1100e360a5775fdbab4d049abef53e1252)
---
.github/workflows/codeql-analysis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c48fa692c1..928e8ac837 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -36,7 +36,7 @@ jobs:
distribution: 'temurin'
java-version: '17'
- name: Cache local Maven repository
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+ uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
(cxf) 10/13: Bump org.webjars:swagger-ui from 5.28.1 to 5.29.2 (#2643)
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 e7d59b91b6ec0c7460351c6b7a13b4edc9df65f7
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Oct 3 12:05:09 2025 -0400
Bump org.webjars:swagger-ui from 5.28.1 to 5.29.2 (#2643)
Bumps [org.webjars:swagger-ui](https://github.com/swagger-api/swagger-ui) from 5.28.1 to 5.29.2.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.28.1...v5.29.2)
---
updated-dependencies:
- dependency-name: org.webjars:swagger-ui
dependency-version: 5.29.2
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit a4daa46f232cff6832e820d453d849054a0858db)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index b59e2e0ca9..ae77ca86cf 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -36,7 +36,7 @@
<cxf.jetty11.version>11.0.26</cxf.jetty11.version>
<cxf.netty.version>4.1.127.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
- <cxf.swagger.ui.version>5.28.1</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>5.29.2</cxf.swagger.ui.version>
<cxf.tika.version>2.9.1</cxf.tika.version>
<cxf.tomcat.version>10.1.44</cxf.tomcat.version>
<cxf.jboss.weld.version>4.0.3.Final</cxf.jboss.weld.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 4dc5e5241c..1b031007c3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -217,7 +217,7 @@
<cxf.spring.security.version>6.1.9</cxf.spring.security.version>
<cxf.spring.version>6.0.23</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
- <cxf.swagger.ui.version>5.28.1</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>5.29.2</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.2.38</cxf.swagger.v3.version>
<cxf.tika.version>2.9.1</cxf.tika.version>
<cxf.tomcat.version>10.1.44</cxf.tomcat.version>
(cxf) 02/13: Bump github/codeql-action from 3.30.3 to 3.30.5 (#2630)
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 e7c85087e9d865c727203f05b9297acec18d6297
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Sep 29 08:42:27 2025 -0400
Bump github/codeql-action from 3.30.3 to 3.30.5 (#2630)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.30.3 to 3.30.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/192325c86100d080feab897ff886c34abd4c83a3...3599b3baa15b485a2e49ef411a7a4bb2452e7f93)
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-version: 3.30.5
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 ddcf5da028ce8f22a2ee29431d1f0214959d287b)
# Conflicts:
# .github/workflows/scorecards.yml
---
.github/workflows/codeql-analysis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 34b5e50ca1..c48fa692c1 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
+ uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
with:
languages: java
#config-file: ./.github/codeql/codeql-cxf-config.yml
@@ -72,4 +72,4 @@ jobs:
# make release
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
+ uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
(cxf) 09/13: Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.6.1 to 3.6.2 (#2641)
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 e7b6a54e60dd8b1ebc13f342b790869ea4380151
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Oct 3 12:04:55 2025 -0400
Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.6.1 to 3.6.2 (#2641)
Bumps [org.apache.maven.plugins:maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.6.1 to 3.6.2.
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.6.1...enforcer-3.6.2)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
dependency-version: 3.6.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 d2ad02248076411b22b6d295a7680103df83b400)
---
distribution/src/main/release/samples/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 3495cfff1d..b59e2e0ca9 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -229,7 +229,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.6.1</version>
+ <version>3.6.2</version>
<executions>
<execution>
<goals>
diff --git a/pom.xml b/pom.xml
index cf60c6c712..f32cc40108 100644
--- a/pom.xml
+++ b/pom.xml
@@ -645,7 +645,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.6.1</version>
+ <version>3.6.2</version>
<configuration>
<rules>
<requireJavaVersion>
(cxf) 07/13: Bump org.codehaus.plexus:plexus-archiver from 4.10.1 to 4.10.2 (#2638)
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 3db1398fdb14eb2df1cdc453f733358fab68263a
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Oct 2 06:58:39 2025 -0400
Bump org.codehaus.plexus:plexus-archiver from 4.10.1 to 4.10.2 (#2638)
Bumps [org.codehaus.plexus:plexus-archiver](https://github.com/codehaus-plexus/plexus-archiver) from 4.10.1 to 4.10.2.
- [Release notes](https://github.com/codehaus-plexus/plexus-archiver/releases)
- [Changelog](https://github.com/codehaus-plexus/plexus-archiver/blob/master/ReleaseNotes.md)
- [Commits](https://github.com/codehaus-plexus/plexus-archiver/compare/plexus-archiver-4.10.1...plexus-archiver-4.10.2)
---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-archiver
dependency-version: 4.10.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 bd0744bce7b43e7c1dc95280c8bbc13e85c72e3d)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 0be27b4785..4dc5e5241c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -196,7 +196,7 @@
<cxf.opentracing.version>0.33.0</cxf.opentracing.version>
<cxf.openwebbeans.version>2.0.28</cxf.openwebbeans.version>
<cxf.persistence-api.version>3.0.0</cxf.persistence-api.version>
- <cxf.plexus-archiver.version>4.10.1</cxf.plexus-archiver.version>
+ <cxf.plexus-archiver.version>4.10.2</cxf.plexus-archiver.version>
<cxf.plexus-utils.version>3.5.1</cxf.plexus-utils.version>
<cxf.reactivestreams.version>1.0.4</cxf.reactivestreams.version>
<cxf.reactor.version>3.5.20</cxf.reactor.version>
(cxf) 06/13: Bump io.swagger.core.v3:swagger-jaxrs2-jakarta from 2.2.37 to 2.2.38 (#2634)
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 6c3a1d45ae157c82440b5f885a596788fbfb3878
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Oct 1 08:35:25 2025 -0400
Bump io.swagger.core.v3:swagger-jaxrs2-jakarta from 2.2.37 to 2.2.38 (#2634)
Bumps io.swagger.core.v3:swagger-jaxrs2-jakarta from 2.2.37 to 2.2.38.
---
updated-dependencies:
- dependency-name: io.swagger.core.v3:swagger-jaxrs2-jakarta
dependency-version: 2.2.38
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 a05eb41c0230244739902e83347dfb8a1404efea)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 0895240f4d..0be27b4785 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -218,7 +218,7 @@
<cxf.spring.version>6.0.23</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
<cxf.swagger.ui.version>5.28.1</cxf.swagger.ui.version>
- <cxf.swagger.v3.version>2.2.37</cxf.swagger.v3.version>
+ <cxf.swagger.v3.version>2.2.38</cxf.swagger.v3.version>
<cxf.tika.version>2.9.1</cxf.tika.version>
<cxf.tomcat.version>10.1.44</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.8</cxf.tomitribe.http.signature.version>
(cxf) 11/13: CXF-8691: Logging Feature - Sensitive element with arrays (JSON) (#2640)
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 e0a24da3da82b132f16f5d6f73cee757a44b5619
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Oct 4 17:45:05 2025 -0400
CXF-8691: Logging Feature - Sensitive element with arrays (JSON) (#2640)
(cherry picked from commit ad81da5000b6a14d760ca5d1c0b5626c7a592b1b)
---
.../java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java | 12 ++++++++++--
.../org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java | 7 ++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java
index 22957887be..e6ec38eeb3 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java
@@ -34,6 +34,10 @@ public class MaskSensitiveHelper {
private static final String MATCH_PATTERN_XML_TEMPLATE = "(<(" + PATTERN_XML_NAMESPACE_PREFIX
+ ":)?-ELEMENT_NAME-\\b[^>/]*>)(.*?)(</(" + PATTERN_XML_NAMESPACE_PREFIX + ":)?-ELEMENT_NAME->)";
private static final String REPLACEMENT_XML_TEMPLATE = "$1XXX$4";
+ private static final String MATCH_PATTERN_JSON_TEMPLATE_ARRAY
+ = "\"-ELEMENT_NAME-\"[ \\t]*:[ \\t]*[\\[]((\\s*\".\"),?)+[\\]]";
+ private static final String REPLACEMENT_JSON_TEMPLATE_ARRAY
+ = "\"-ELEMENT_NAME-\": [\"X\",\"X\",\"X\"]";
private static final String MATCH_PATTERN_JSON_TEMPLATE = "\"-ELEMENT_NAME-\"[ \\t]*:[ \\t]*\"(.*?)\"";
private static final String REPLACEMENT_JSON_TEMPLATE = "\"-ELEMENT_NAME-\": \"XXX\"";
private static final String MASKED_HEADER_VALUE = "XXX";
@@ -63,8 +67,12 @@ public class MaskSensitiveHelper {
public void addSensitiveElementNames(final Set<String> inSensitiveElementNames) {
for (final String sensitiveName : inSensitiveElementNames) {
- addReplacementPair(MATCH_PATTERN_XML_TEMPLATE, REPLACEMENT_XML_TEMPLATE, sensitiveName, replacementsXML);
- addReplacementPair(MATCH_PATTERN_JSON_TEMPLATE, REPLACEMENT_JSON_TEMPLATE, sensitiveName, replacementsJSON);
+ addReplacementPair(MATCH_PATTERN_XML_TEMPLATE, REPLACEMENT_XML_TEMPLATE,
+ sensitiveName, replacementsXML);
+ addReplacementPair(MATCH_PATTERN_JSON_TEMPLATE_ARRAY, REPLACEMENT_JSON_TEMPLATE_ARRAY,
+ sensitiveName, replacementsJSON);
+ addReplacementPair(MATCH_PATTERN_JSON_TEMPLATE, REPLACEMENT_JSON_TEMPLATE,
+ sensitiveName, replacementsJSON);
}
}
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 471a78a9ff..88d910b6c8 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
@@ -76,6 +76,10 @@ public class MaskSensitiveHelperTest {
private static final String MASKED_LOGGING_CONTENT_JSON =
"\"user\":\"testUser\", \"password\": \"XXX\"";
+ private static final String SENSITIVE_LOGGING_CONTENT_JSON_ARRAY =
+ "\"user\":\"testUser\", \"password\": [\"G\",\"e\",\"h\",\"e\",\"i\",\"m\",\"1\",\"2\",\"3\",\"!\"]";
+ private static final String MASKED_LOGGING_CONTENT_JSON_ARRAY =
+ "\"user\":\"testUser\", \"password\": [\"X\",\"X\",\"X\"]";
private static final String SENSITIVE_LOGGING_MULTIPLE_ELEMENT_XML =
"<item><user>testUser1</user><password myAttribute=\"test\">my secret password 1</password></item>"
+ "<item><user>testUser2</user><password>my secret password 2</password></item>";
@@ -113,7 +117,8 @@ public class MaskSensitiveHelperTest {
{SENSITIVE_LOGGING_XML_EMPTY_TAG_REPEATED, MASKED_LOGGING_XML_EMPTY_TAG_REPEATED, APPLICATION_XML},
{SENSITIVE_LOGGING_MULTIPLE_ELEMENT_XML, MASKED_LOGGING_MULTIPLE_ELEMENT_XML, APPLICATION_XML},
{SENSITIVE_LOGGING_CONTENT_XML_WITH_NAMESPACE, MASKED_LOGGING_CONTENT_XML_WITH_NAMESPACE, APPLICATION_XML},
- {SENSITIVE_LOGGING_CONTENT_JSON, MASKED_LOGGING_CONTENT_JSON, APPLICATION_JSON}
+ {SENSITIVE_LOGGING_CONTENT_JSON, MASKED_LOGGING_CONTENT_JSON, APPLICATION_JSON},
+ {SENSITIVE_LOGGING_CONTENT_JSON_ARRAY, MASKED_LOGGING_CONTENT_JSON_ARRAY, APPLICATION_JSON}
});
}
(cxf) 13/13: 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 21fdf22445e54594642f9fee0ad92a5a6f265c58
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Oct 5 12:13:25 2025 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 64778db0d0..6e039a870d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -227,6 +227,7 @@ M 4a540e5e1afeab52a35a02c75979d47d850829a1
M 4ab8fcaef7288cbb4ef287d13dde9feaa0b65873
M 4acb907e4dc98908a5d53c05d8b2fca07db01dc8
M 4ad78c7c98c13aa5479e21fef066b9e0826691dc
+M 4b2e8ee1d1959d711c896daab1e23d7de7551278
M 4bd222d322451cef832e783fe8f887fcab68a2e1
M 4be33dce0cad5353a094fe08aba49989b93eb99b
M 4d70a40429b65ca764e125d4ba4d4335336e96ac
@@ -439,6 +440,7 @@ M 9e8aee89845f16952dddf855b4d5f0159d189348
M 9e9a906658a4924627abd5068577d4f55f33bb72
M 9ffcd078281da628e9ee78447b222e1d430baea3
M a05953d0d4b8f21976de03a6ad6ba9dfbbd8fc32
+M a05eb41c0230244739902e83347dfb8a1404efea
M a0ad89088d2865836ec6d34b4fe8a58aa7684621
M a10d62ef17f1d748f63e32dfd23f3ad4c1bb85f6
M a116fc8aca9fe39266ce4e4b5f98305d07150f7d
@@ -452,6 +454,7 @@ M a3b103fc801bd660fe4dcc7c8c8e74cdba03db26
M a3cd8018e169bf070ffc189818ce508f21e28115
M a4a936400b8f05ebdaf5e076182fb5a8961a39d8
M a4ba237b06461d409f4e6627513f58ef2fe78020
+M a4daa46f232cff6832e820d453d849054a0858db
M a51f15db8044695995a9cc6b8bf272c01609e838
M a5328560b32573b0bda49d428605df5d2f1bbaa5
M a5680ea92dd9754fe6dd319a4ca4cd225ed6bba5
@@ -459,6 +462,7 @@ M a57e914546a0624c78c823547d9a4cc8d7b3389f
M a5d41befbef9fd7dae5152bee361915aabf2fe47
M a5fbebbb668f282dcfdc7cb96ffa2fcc196a9d94
M a71713898dc4866865df8abe1b76ff6c34e9de6d
+M a809fd9ccc163f81ff3b02122aed097357aff590
M a9933e7d7137c29ebbad34683e19d4c5d739e737
M aa3787b4ef1a9df0c94e181b7bf178d707813522
M aa3e2c5c22ba1519975c26e2f3e0d7d300b8d6e3
@@ -505,6 +509,7 @@ M bb1ea6bac4f980144becebcd79533ca736b44342
M bba0417ee2a454c291d7573e06216ca40e35ca97
M bbf373beac4393c1bc4dee5a3378f95d9dd6144a
M bca6dd3c53ad6666f0361c8a27bac2a874f9f5de
+M bd0744bce7b43e7c1dc95280c8bbc13e85c72e3d
M be13c31b5852a59a033990abbddc9be20e201b62
M bea3fd5397c92199692e7dfd0738214c3ec8a4ce
M bf231e5145f75e2b07c1c36fa0e541070efe09d2
@@ -585,6 +590,7 @@ M dd18d934c723263e9895aaf97052ccf43b00182a
M dd3ce33c2ccbec205c06b44f8886710561e272ec
M dd74a63a8e59aa2bc762a41370e444cadae4c899
M dd7dc2748586a9bb639770da49d62c46bbda4571
+M ddcf5da028ce8f22a2ee29431d1f0214959d287b
M ddd4dfe1ed3748ff07de12dc9c46ecdb850107a3
M ddd74e7e65a65d24ce5bfc642a433a020ad10f58
M dde8e84f03e25858f1d7ed48714a8ad2eabfaf2b
(cxf) 12/13: Update ASM to 9.9
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 e58be91d603f288060b9712c0004c8a5421f0a12
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Oct 5 09:30:25 2025 -0400
Update ASM to 9.9
(cherry picked from commit 26b54bb544ca9576f69ebfb05299af6b539bc0f3)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 1b031007c3..b7e9abc7d8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -56,7 +56,7 @@
<!-- stuff related to ASM -->
<cxf.asm.groupId>org.ow2.asm</cxf.asm.groupId>
<cxf.asm.artifactId>asm</cxf.asm.artifactId>
- <cxf.asm.version>9.8</cxf.asm.version>
+ <cxf.asm.version>9.9</cxf.asm.version>
<!-- OSGi related properties -->
<cxf.fragment.host />