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 19:27:00 UTC
(cxf) branch 3.6.x-fixes updated (1a593f28a1 -> d4f4f1e799)
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 1a593f28a1 Fix PMD violations (post-merge)
new 238470e9ae Add more tests for sync / async client to excercise parallel calls
new 5fa94e0a5f Bump github/codeql-action from 3.30.3 to 3.30.5 (#2630)
new 932d0cf4ba Bump actions/cache from 4.2.4 to 4.3.0 (#2631)
new 7b9a17cdd9 Update JUnit to 5.14.0
new da741c51a0 Bump org.codehaus.mojo:exec-maven-plugin from 3.5.1 to 3.6.0 (#2637)
new ad0f8b0d9f Bump io.swagger.core.v3:swagger-jaxrs2-jakarta from 2.2.37 to 2.2.38 (#2634)
new 826ad81887 Bump org.codehaus.plexus:plexus-archiver from 4.10.1 to 4.10.2 (#2638)
new 36df4ef2cb Bump org.apache.maven.plugins:maven-dependency-plugin (#2642)
new 5dbe372a55 Bump org.webjars:swagger-ui from 5.28.1 to 5.29.2 (#2643)
new 7bdad70743 CXF-8691: Logging Feature - Sensitive element with arrays (JSON) (#2640)
new fb64ba7ee5 Update ASM to 9.9
new 609a1389cc Recording .gitmergeinfo Changes
new b243077efd Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.6.1 to 3.6.2 (#2641)
new d4f4f1e799 Recording .gitmergeinfo Changes
The 14 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 | 10 +++++
distribution/src/main/release/samples/pom.xml | 4 +-
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, 127 insertions(+), 15 deletions(-)
(cxf) 13/14: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b243077efda7d885bdb7790824a59b0787cf0cbc
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)
(cherry picked from commit e7b6a54e60dd8b1ebc13f342b790869ea4380151)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a8ca262f22..7d0b3d4d1c 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) 08/14: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 36df4ef2cbcb70cab86416a05c4df6b15feb18a5
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)
(cherry picked from commit 6139f5ae83a2ca19be49eadaafedba7c0d6f3a20)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 09bbeba178..a8ca262f22 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) 04/14: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7b9a17cdd9dff7b919b7af2929e53f7ced0c4baf
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)
(cherry picked from commit df7c6986de5c699eb1001052ac3e2bc739201695)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index f27f426bb0..f1c1c795fb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -162,7 +162,7 @@
<cxf.json.bind-api.version>1.0.2</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>1.1.2</cxf.littleproxy.version>
(cxf) 06/14: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ad0f8b0d9f7cf3cd23ccbc5f29fbe06cd93e29d7
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
(cherry picked from commit 6c3a1d45ae157c82440b5f885a596788fbfb3878)
# 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 f1c1c795fb..a2e65c2866 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -212,7 +212,7 @@
<cxf.spring.version>5.3.39</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.swagger2.version>1.6.15</cxf.swagger2.version>
<cxf.swagger2.guava.version>32.1.3-jre</cxf.swagger2.guava.version>
<cxf.swagger2.guava.failureaccess.version>1.0.1</cxf.swagger2.guava.failureaccess.version>
(cxf) 11/14: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit fb64ba7ee5dd932ca834f2ca2d7a150e0d5f326f
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)
(cherry picked from commit e58be91d603f288060b9712c0004c8a5421f0a12)
# 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 60418b25fe..f0ba68b323 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>
<cxf.osgi.asm.version>[3.0,10)</cxf.osgi.asm.version>
<!-- OSGi related properties -->
<cxf.fragment.host />
(cxf) 10/14: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7bdad70743ab4a51830faf63f1a63e7647ef842c
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)
(cherry picked from commit e0a24da3da82b132f16f5d6f73cee757a44b5619)
---
.../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) 05/14: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit da741c51a06443a6d4e3944f37846baf90da21c9
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)
(cherry picked from commit 0ae346534997596e5b81a12023503ae64fe27414)
---
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 ccd83ddece..d34ca1449e 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) 09/14: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5dbe372a55ed23ea9279b84ee7b8deb3a781da9d
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
(cherry picked from commit e7d59b91b6ec0c7460351c6b7a13b4edc9df65f7)
---
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 d34ca1449e..00b99f4e70 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -35,7 +35,7 @@
<cxf.jetty10.version>10.0.26</cxf.jetty10.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>9.0.108</cxf.tomcat.version>
<cxf.lucene.version>9.12.1</cxf.lucene.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 847726c236..60418b25fe 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -211,7 +211,7 @@
<cxf.spring.security.version>5.8.16</cxf.spring.security.version>
<cxf.spring.version>5.3.39</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.swagger2.version>1.6.15</cxf.swagger2.version>
<cxf.swagger2.guava.version>32.1.3-jre</cxf.swagger2.guava.version>
(cxf) 02/14: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5fa94e0a5f041ec62435f46f15804e49122684bb
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
(cherry picked from commit e7c85087e9d865c727203f05b9297acec18d6297)
---
.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 42787dd82d..5b7e5cde8c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -61,7 +61,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: ${{ matrix.language }}
#config-file: ./.github/codeql/codeql-cxf-config.yml
@@ -89,4 +89,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) 03/14: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 932d0cf4ba5f5f6691795058b97a9a771d37ec58
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)
(cherry picked from commit 6f7c653a586fb0e4725856390d6a7ad36102dd55)
---
.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 5b7e5cde8c..9c60b9cd83 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -48,7 +48,7 @@ jobs:
distribution: 'temurin'
java-version: '11'
- 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) 14/14: 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 d4f4f1e799414c9c3f081e2f227c45b0e696f5df
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Oct 5 15:22:38 2025 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d5e89b574d..3e070b91ac 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1603,6 +1603,7 @@ M e6cbcec142d36ac8e4c58b719bdffe906df266a7
M e76b72597c40fc871416cf80496f800516a0eae7
M e797494f0aead82a2fa344c66023303b3c143f34
M e79caa8d41f401a85ac03efffcff9377eab840ae
+M e7b6a54e60dd8b1ebc13f342b790869ea4380151
M e7c85087e9d865c727203f05b9297acec18d6297
M e7d59b91b6ec0c7460351c6b7a13b4edc9df65f7
M e8112a99d3e540dca20a98d6626c69718c6e909f
(cxf) 01/14: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 238470e9ae8aa9903ad4a71c40c560ad93aed676
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)
(cherry picked from commit c0c324a325abecd5ee1bf9ba1171ffb9997a8d7c)
# Conflicts:
# systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientChunkingTest.java
---
.../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 eb5f0eaf45..1780bdbd29 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;
@@ -216,6 +218,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 536b4aecb3..c7fe82148c 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,16 +22,24 @@ 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 javax.ws.rs.client.Entity;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.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;
@@ -114,4 +122,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) 12/14: 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 609a1389cc1d3132fb69681a40650c4b8d8cfa50
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Oct 5 15:21:58 2025 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e473164c24..d5e89b574d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -53,6 +53,7 @@ B 1c1f99fcb4a92836f309cbd63039b9c0758d211f
B 1d92d5abc7913e0ef77f234ee0200d4b0e72ca85
B 1f62de8deb593a6e76514fb6e340b91afbaf493e
B 217d8a7cd6ab50593afbd3dfd539992f7dc3844d
+B 21fdf22445e54594642f9fee0ad92a5a6f265c58
B 22214033c7e5d617ab1f217ff1b31df725307faf
B 22417682d1cda2aab8e26b04838309fa46f26a67
B 248ce9f0527b1e8a69b11a7d92755e0994ab5ebd
@@ -712,6 +713,7 @@ M 3d58af3c762a616d607120d85a3eea8e4a387ac9
M 3d70de80fb60b74040c0214fc6a28774362556e4
M 3d88bbb9cc51ac141d83dcefea4ab307c09d525f
M 3da78c10988c13239f7b156c68fafbe400de76de
+M 3db1398fdb14eb2df1cdc453f733358fab68263a
M 3df6a6d46718fd893499baa25776a7ab60c5fabe
M 3e019d7c33540ec827f6fcb2819b58f416dfd921
M 3e9348f48df34adc5600d2197edfc41f2c9dc981
@@ -966,6 +968,7 @@ M 6bedd4ff8b30909cd752859b097b47128135cfd0
M 6c0e33ea72c7662a1a630d8e1482f56667cbad54
M 6c2d45ab4c13fce45f1aebd41b0a351ce715d4a6
M 6c2ee0109579cc7bb5910d77b420500c0c43a1b1
+M 6c3a1d45ae157c82440b5f885a596788fbfb3878
M 6c5030d52b42f96052ae19846013370175bc9f12
M 6c56c4c41492b9e7660474867f7ff2d69ffb3727
M 6c5a9a300ae97945b057f8867381de837461e06f
@@ -983,6 +986,7 @@ M 6e99fc079b3f36cf2fc55a5d9b7986413d110706
M 6ef9c6387f585665ecd7dd7c88337dd1389d95ed
M 6f480b205251dff006631d4ff7cc1b39fdb171d1
M 6f6aeef7c0365c12a3e3edb15ba49186d146b7a6
+M 6f7c653a586fb0e4725856390d6a7ad36102dd55
M 6fad8c8da1d4b032b027add44fe2985b1fcb6b04
M 6fd233c8a4915109bd4be9403c1f50cf7e6eeeed
M 6ff10522047810b7536d2975f391f6057b0cd8f3
@@ -1403,6 +1407,7 @@ M bfff4e1502db1cef58f961e888f8a9f2c87efd88
M c00ea7f55a19bce91cf513f3dd3f1228f8260856
M c05666fc41161450258a48fbba6298f56d857a63
M c06bc6a71e92db0dd4c54bba74129f8009e14ba4
+M c0c324a325abecd5ee1bf9ba1171ffb9997a8d7c
M c0db9bdd8e92cb4c7be3a2570d6f89fadb362953
M c0ea86138a4bbdb726ab38542aa15e8b02d6209e
M c0f7132dabbb67befb363f4775ffb12115387176
@@ -1557,6 +1562,7 @@ M de98ab70f9b40414d799703f344614014cfb8504
M dec91b4086e0caa44688b50f056c22594983d764
M ded51b955c67bc232e961200b6dc6b59c07bdf32
M ded5cdb59733294a43b12579b018fa00b1a6d6bd
+M df7c6986de5c699eb1001052ac3e2bc739201695
M df7fe8b569a7b8825ab6181a3ea0aab2a2493858
M dfc204777b4c397971b2293baf0b4150284a21f6
M dfe8bc122f2f88804f086dc864feaf14046070b2
@@ -1588,6 +1594,7 @@ M e4d5c200a8e2b4df6c05c3ac6306e5d6384b81dc
M e4f864ad8216283447fba6d9dd44b4609a90da85
M e510e2993dcb939c4e5e111833bfe10104092e67
M e585d86008e96cfe8d1e88c0b415a97fa8b02690
+M e58be91d603f288060b9712c0004c8a5421f0a12
M e58ecdbb73ba6814f0ddd9e21c4a84149aafe74d
M e60fd15ce98e4f1fe1278a0f29c95600e48700ca
M e628555f18f3bb82fc1f29f04cbf293dd0ad8175
@@ -1596,6 +1603,8 @@ M e6cbcec142d36ac8e4c58b719bdffe906df266a7
M e76b72597c40fc871416cf80496f800516a0eae7
M e797494f0aead82a2fa344c66023303b3c143f34
M e79caa8d41f401a85ac03efffcff9377eab840ae
+M e7c85087e9d865c727203f05b9297acec18d6297
+M e7d59b91b6ec0c7460351c6b7a13b4edc9df65f7
M e8112a99d3e540dca20a98d6626c69718c6e909f
M e82ef169d1a61334e6a410c554a7c72ab92d756d
M e864b59e951315845b95500d692f17e7670c8a01
(cxf) 07/14: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 826ad8188762cc235f3cef532fbc61c5754e268d
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
(cherry picked from commit 3db1398fdb14eb2df1cdc453f733358fab68263a)
# 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 a2e65c2866..847726c236 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -189,7 +189,7 @@
<cxf.opentracing.version>0.33.0</cxf.opentracing.version>
<cxf.openwebbeans.version>2.0.28</cxf.openwebbeans.version>
<cxf.persistence-api.version>2.2.3</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>