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 2026/03/23 12:22:01 UTC
(cxf) branch 4.1.x-fixes updated (41d9428494a -> 59405f22048)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 4.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 41d9428494a Recording .gitmergeinfo Changes
new 3933152cb6c [CXF-8748] Fix case-insensitive matching in PatternBuilder for nonProxyHosts (#2982)
new a07b42fbc54 Bump cxf.openfeign.version from 13.9.3 to 13.10 (#2984)
new 5c62c2d777b Bump org.jboss.logging:jboss-logging from 3.6.2.Final to 3.6.3.Final (#2985)
new a0089d0b79f Recording .gitmergeinfo Changes
new 59405f22048 Update Jackson to 2.21.2
The 5 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 | 3 ++
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 6 +--
.../apache/cxf/transport/http/PatternBuilder.java | 2 +-
.../cxf/transport/http/PatternBuilderTest.java | 46 ++++++++++++++++------
5 files changed, 43 insertions(+), 16 deletions(-)
(cxf) 04/05: 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.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a0089d0b79f2b0adddb88fc71e6a9063c0ce3a71
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Mar 23 08:14:54 2026 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 953190f10a5..2b0bd526586 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -46,6 +46,7 @@ M 35afa2b3534b4e0a3ddd657fca8462ad364e955d
M 35ccb3a4924cb69d2ce4d2a0e5cbc82140260e69
M 382a6d99fd6d032bc4f11f372614d4972788dc89
M 38494776241f9bfdb78528939ed28b619f5f2259
+M 391805f2098f05d56630df067f58da505f15852a
M 397a7e3ff3da8ea27d80985f0048750178d76e9c
M 3a4e4bf3242f6eff73a33e40b3453ce8d60612eb
M 3ad8c9c26bf9ffd8c9de896222284732f72a0550
@@ -68,6 +69,7 @@ M 56d15952a2547b5780cee868545d8073fba3462a
M 570eb1f2a097cf20f05a4b863c5943fc172d1d98
M 581db014679136647dbbb6e01bce7f6eed294c7e
M 5aad5f1f5c5089cb165680de45a276b40ea7e498
+M 5ab296f47a9c7f795e757ee28a611cf87b336160
M 5ce2625d759ffd64224489448d200ae5bea7ec99
M 5f1b27db2666910e707cd009e11a07eba0225a49
M 636e750866f67fd70fd022083da686909cdf0c5c
@@ -185,6 +187,7 @@ M edb3add2a16fcfd7af7c471240eca312056b319a
M edcd3335e00bc636f7f0ca146d8ab89bbd78b62b
M ee04e4a3bc7f28ead64408681ff8ed59e7bc3e4a
M ee0d6fb93e3de3bb6bf0e0f2f695446ff8df7dd3
+M f0b4ae62951b137d22930a49687abd5bbb8fe10d
M f17fdc431119f05f95a117cc4b2022ed07361506
M f1f6703d1b109247104c9fa9f04499285ff3060e
M f1fc37d5961692e26f9f9e73d4c914cd5d1c90b5
(cxf) 03/05: Bump org.jboss.logging:jboss-logging from 3.6.2.Final to 3.6.3.Final (#2985)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5c62c2d777bb3bb1802124d27184d64afbf65e96
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Mar 23 07:34:09 2026 -0400
Bump org.jboss.logging:jboss-logging from 3.6.2.Final to 3.6.3.Final (#2985)
Bumps [org.jboss.logging:jboss-logging](https://github.com/jboss-logging/jboss-logging) from 3.6.2.Final to 3.6.3.Final.
- [Release notes](https://github.com/jboss-logging/jboss-logging/releases)
- [Commits](https://github.com/jboss-logging/jboss-logging/compare/v3.6.2.Final...v3.6.3.Final)
---
updated-dependencies:
- dependency-name: org.jboss.logging:jboss-logging
dependency-version: 3.6.3.Final
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 5ab296f47a9c7f795e757ee28a611cf87b336160)
# 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 0c50ece93b8..e764de85d2d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -155,7 +155,7 @@
<cxf.jaxb.version>4.0.5</cxf.jaxb.version>
<cxf.jaxb.xjc.version>${cxf.jaxb.runtime.version}</cxf.jaxb.xjc.version>
<cxf.jaxen.version>2.0.0</cxf.jaxen.version>
- <cxf.jboss.logging.version>3.6.2.Final</cxf.jboss.logging.version>
+ <cxf.jboss.logging.version>3.6.3.Final</cxf.jboss.logging.version>
<cxf.jboss.weld.version>5.1.2.Final</cxf.jboss.weld.version>
<cxf.jboss.narayana.version>5.13.1.Final</cxf.jboss.narayana.version>
<cxf.jcache.version>1.1.1</cxf.jcache.version>
(cxf) 05/05: Update Jackson to 2.21.2
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 59405f22048b63f468ed03549130e6c7e6eb7639
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Mar 23 08:21:48 2026 -0400
Update Jackson to 2.21.2
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index e764de85d2d..709a6c32940 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -131,8 +131,8 @@
<cxf.httpcomponents.core.version>4.4.16</cxf.httpcomponents.core.version>
<cxf.httpcomponents.client5.version>5.4.4</cxf.httpcomponents.client5.version>
<cxf.httpcomponents.core5.version>5.3.6</cxf.httpcomponents.core5.version>
- <cxf.jackson.version>2.21.1</cxf.jackson.version>
- <cxf.jackson.databind.version>2.21.1</cxf.jackson.databind.version>
+ <cxf.jackson.version>2.21.2</cxf.jackson.version>
+ <cxf.jackson.databind.version>2.21.2</cxf.jackson.databind.version>
<cxf.jackson.annotations.version>2.21</cxf.jackson.annotations.version>
<cxf.jacorb.version>3.9</cxf.jacorb.version>
<cxf.jaeger.version>1.8.1</cxf.jaeger.version>
(cxf) 01/05: [CXF-8748] Fix case-insensitive matching in PatternBuilder for nonProxyHosts (#2982)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3933152cb6cd5c70c401e609f76d327d2c0dffce
Author: sstremler <st...@gmail.com>
AuthorDate: Mon Mar 23 02:34:47 2026 +0100
[CXF-8748] Fix case-insensitive matching in PatternBuilder for nonProxyHosts (#2982)
(cherry picked from commit ee8ccf8ff20d221dee10175fbfb76d950d4d8ed5)
---
.../apache/cxf/transport/http/PatternBuilder.java | 2 +-
.../cxf/transport/http/PatternBuilderTest.java | 46 ++++++++++++++++------
2 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/PatternBuilder.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/PatternBuilder.java
index 86a840be72c..89333adf0ea 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/PatternBuilder.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/PatternBuilder.java
@@ -48,6 +48,6 @@ public final class PatternBuilder {
String regexp = value.replace(".", "\\.");
regexp = regexp.replace("*", ".*");
- return Pattern.compile(regexp);
+ return Pattern.compile(regexp, Pattern.CASE_INSENSITIVE);
}
}
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
index 4073d2cc546..40fa7e6ba5f 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/PatternBuilderTest.java
@@ -31,44 +31,68 @@ import static org.junit.Assert.assertTrue;
public class PatternBuilderTest {
@Test
- public void testPatternBuilder() {
-
- // Simple matching
+ public void buildPatternWithSimpleHostname() {
Pattern pattern = PatternBuilder.build("localhost");
assertTrue(pattern.matcher("localhost").matches());
+ assertTrue(pattern.matcher("LOCALHOST").matches());
assertFalse(pattern.matcher("localhost-after").matches());
assertFalse(pattern.matcher("before-localhost").matches());
+ }
- // List matching
- pattern = PatternBuilder.build("localhost|othername");
+ @Test
+ public void buildPatternWithPipelineDelimitedHostnames() {
+ Pattern pattern = PatternBuilder.build("localhost|othername");
assertTrue(pattern.matcher("localhost").matches());
+ assertTrue(pattern.matcher("LOCALHOST").matches());
assertTrue(pattern.matcher("othername").matches());
assertFalse(pattern.matcher("somename").matches());
+ }
- // Name with dots matching
- pattern = PatternBuilder.build("www.apache.org");
+ @Test
+ public void buildPatternWithDotsInTheHostname() {
+ Pattern pattern = PatternBuilder.build("www.apache.org");
assertTrue(pattern.matcher("www.apache.org").matches());
+ assertTrue(pattern.matcher("WWW.apache.ORG").matches());
assertFalse(pattern.matcher("www1apache1org").matches());
+ }
- // Wildcards matching 1/2
- pattern = PatternBuilder.build("*.apache.org");
+ @Test
+ public void buildPatternWithLeadingWildcardInTheHostname() {
+ Pattern pattern = PatternBuilder.build("*.apache.org");
assertTrue(pattern.matcher("www.apache.org").matches());
assertTrue(pattern.matcher("svn.apache.org").matches());
assertFalse(pattern.matcher("apache.org").matches());
assertTrue(pattern.matcher(".apache.org").matches()); // not very useful ...
+ }
- // Wildcards matching 2/2
- pattern = PatternBuilder.build("www.apache.*");
+ @Test
+ public void buildPatternWithTrailingWildcardInTheHostname() {
+ Pattern pattern = PatternBuilder.build("www.apache.*");
assertTrue(pattern.matcher("www.apache.org").matches());
assertTrue(pattern.matcher("www.apache.net").matches());
assertFalse(pattern.matcher("www.apache").matches());
assertTrue(pattern.matcher("www.apache.").matches()); // not very useful ...
+ }
+
+ @Test
+ public void buildPatternWithUppercaseLettersInTheSimpleHostname() {
+ Pattern pattern = PatternBuilder.build("APACHE.ORG");
+ assertTrue(pattern.matcher("apache.org").matches());
+ assertTrue(pattern.matcher("APACHE.ORG").matches());
}
+ @Test
+ public void buildPatternWithUppercaseLettersInTheLeadingWildcardHostname() {
+ Pattern pattern = PatternBuilder.build("*.APACHE.ORG");
+
+ assertTrue(pattern.matcher("www.apache.org").matches());
+ assertTrue(pattern.matcher("svn.apache.org").matches());
+ assertFalse(pattern.matcher("apache.org").matches());
+ }
}
\ No newline at end of file
(cxf) 02/05: Bump cxf.openfeign.version from 13.9.3 to 13.10 (#2984)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a07b42fbc54a71a678b9d8995e650427286d2cf6
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Mar 23 07:31:09 2026 -0400
Bump cxf.openfeign.version from 13.9.3 to 13.10 (#2984)
Bumps `cxf.openfeign.version` from 13.9.3 to 13.10.
Updates `io.github.openfeign:feign-core` from 13.9.3 to 13.10
- [Release notes](https://github.com/openfeign/feign/releases)
- [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openfeign/feign/compare/13.9.3...13.10)
Updates `io.github.openfeign:feign-httpclient` from 13.9.3 to 13.10
- [Release notes](https://github.com/openfeign/feign/releases)
- [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openfeign/feign/compare/13.9.3...13.10)
Updates `io.github.openfeign:feign-micrometer` from 13.9.3 to 13.10
- [Release notes](https://github.com/openfeign/feign/releases)
- [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openfeign/feign/compare/13.9.3...13.10)
---
updated-dependencies:
- dependency-name: io.github.openfeign:feign-core
dependency-version: '13.10'
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.github.openfeign:feign-httpclient
dependency-version: '13.10'
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.github.openfeign:feign-micrometer
dependency-version: '13.10'
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 f0b4ae62951b137d22930a49687abd5bbb8fe10d)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
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 bc179afbe9f..8973f66ce80 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -52,7 +52,7 @@
<cxf.jboss.narayana.version>5.13.1.Final</cxf.jboss.narayana.version>
<cxf.narayana.spring.boot.version>2.6.7</cxf.narayana.spring.boot.version>
<cxf.camel.version>4.11.0</cxf.camel.version>
- <cxf.openfeign.version>13.9.3</cxf.openfeign.version>
+ <cxf.openfeign.version>13.10</cxf.openfeign.version>
</properties>
<dependencies>
<dependency>