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 2024/10/04 15:13:36 UTC
(cxf) branch 3.5.x-fixes updated (cc6ea9463c -> c525f26c8e)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from cc6ea9463c Fix CachedStreamTestBase test cases
new 7f2446bd2e Update Netty to 4.1.114.Final
new 19e191470c Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.0 to 3.10.1 (#2091)
new 92c3d96534 Update Dropwizard Metrics to 4.2.28
new dcbb8e8cb0 Attempt to fix org.apache.cxf.ws.discovery.WSDiscoveryClientTest.testMultiResponses by favoring docker interface if available
new 05a3e89220 Attempt to fix org.apache.cxf.ws.discovery.WSDiscoveryClientTest.testMultiResponses by skipping docker interfaces (if available) and sorting them
new c525f26c8e 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 +++++++
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 6 +++---
pom.xml | 2 +-
.../java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java | 7 ++++++-
5 files changed, 18 insertions(+), 6 deletions(-)
(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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c525f26c8e1930221a6e2503dd5b7466c533bcb4
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Oct 4 11:04:07 2024 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9eaf4def1d..f91698275b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -176,6 +176,7 @@ B 56ee7acf496ff8c45ab0b4a5b909c4380fe01da8
B 575df6bb997f9f523bf3fb1e49180099bfc71da7
B 575e24e5f632f5541736b0f7f06459b4d673a3d4
B 5794ddf9809aa6f8a67c43bd5edeff71be275fd3
+B 58c4189ae5c3316e47804184bcd2e5710debab0f
B 592cf5b16d5988ab68187af5369541ead7b4292a
B 59a7073a8a95fb7e7508d8561745c3cf822d9d51
B 59b33d4a326016f2b4a861e408c7de06cd895362
@@ -469,6 +470,7 @@ B e58e39d9dc861d913917788aed649241c9e7b068
B e5b64d813c4c36dff86731b28b5334772f9b70b5
B e6abcd2a008b39cb40573718eb26c7f9d1d76676
B e7328567faaaa0c3c2a59f07eb6ba25b425b455f
+B e76b0cf44e237dbda63e982a65a9c17516c91a38
B e77527fbb19d006713cde6bc9b1b3996a82cec3b
B e7c2aee206ae5084204502b4744feed5a8e93e04
B e7d5bca0ba38b0f282f9da7f87bf964544b6b66a
@@ -612,6 +614,7 @@ M 2c67a400a5dec9dc6bd8d7b72160f2cb58021f1f
M 2ccc490f8a993130c8f37cf6455ea2e6edd7a333
M 2d0342d51e6a13b7af5980863ba1b7436724daf8
M 2d68a2e46debfcc27fc845ea08fbe078a8abff1a
+M 2db24ad8ae9491fc6cac82bcde215005e56200e8
M 2e94d6905208c580ed64cd7f05051bf86ab11bd8
M 2f29b6725823ec058095778f819d5fd5b1eda4af
M 2f59ffac0752b453ba8b0673f321d5c29e1d7781
@@ -681,6 +684,7 @@ M 4493c7a3ec03b14abd07d623abc8f9bdc04a817a
M 44f938a4cdd4f4bfc3dbcd0b3c450c3c7286b889
M 466bfbdaca8b274233f745603980e37e7a288d96
M 46a11ff843851c22fa76b77325a2889cb4e3d93e
+M 47696fb63131d4351f3250be25c29153eefba0d2
M 477c6b17943c86f6cf60e7b798595131fd2a531d
M 480abad68fd026633b77574a1dfc5ea377ca70c5
M 485413b2c2f0f57e13ab4b91940334a5a3bebc01
@@ -720,6 +724,7 @@ M 543412a0e028b07326fb1439fd683fd8b05b6c21
M 5493624ac70af916217193398f64b80d73078524
M 54b55ac35a101af792f3aa8e1598a200ef704c9e
M 54f65e5b70deb43bd27a2a5ed728377afca54c8c
+M 5552147767fc7d89f502bd46c6f6de5338aaa1d8
M 5566cc4600827e08fda454c5644b9ec81251fbba
M 56a61325089695721be79eff8afec02095d98783
M 574b44aefb77baab37feab88adf1445f3b538a95
@@ -925,6 +930,7 @@ M a5ad0b1798aac1f5df2f725363f932a808395b3e
M a65137905175b6a02fb8f704d3363e62dc3069f9
M a6782300fd9c55764b2582f7d9f4e73d1031028c
M a68aca6a36de4c6e7761efef119c38614ce95a38
+M a716e70d9590c566b28d6d87316bc78b1872a136
M a75b56a7c3826a48320202aca771cbcbdca6a350
M a77a4fe0c382f8631635b805400a51da25a4709f
M a8023574cf77790b546eb266bcf42a5f9ff6d638
@@ -997,6 +1003,7 @@ M c1a14852505f8dc0359b51e4a3ba4ce5e9e94c77
M c23fbecf3b06514ec8b82cb9407be3772614dffd
M c2c40943cee8b0d9f1a3c8d0876f2474cb96e3d7
M c2eeed8880886e2fe06c65e6836cc913bdef0b8d
+M c36619151bd006354a94bd517c4def0cf8df8a59
M c3bbfbcfa2a55fecb6d47098d11d2f529f13af5f
M c3fa8f19ed721b21e1e18133e9eb20b2906a5eaf
M c46f22ab11dc809f059054ab209d2ecfb952015f
(cxf) 05/06: Attempt to fix org.apache.cxf.ws.discovery.WSDiscoveryClientTest.testMultiResponses by skipping docker interfaces (if available) and sorting them
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 05a3e89220a25f3d42bcd59045c420e5974d8d97
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Oct 4 08:55:18 2024 -0400
Attempt to fix org.apache.cxf.ws.discovery.WSDiscoveryClientTest.testMultiResponses by skipping docker interfaces (if available) and sorting them
(cherry picked from commit 2db24ad8ae9491fc6cac82bcde215005e56200e8)
---
.../org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
index 168b2f25c8..1a396c0022 100644
--- a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
+++ b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
@@ -68,7 +68,8 @@ public final class WSDiscoveryClientTest {
for (InterfaceAddress ia : ni.getInterfaceAddresses()) {
if (ia.getAddress() instanceof java.net.Inet4Address && !ia.getAddress().isLoopbackAddress()
&& !ni.getDisplayName().startsWith("vnic")
- && !ni.getDisplayName().startsWith("tailscale")) {
+ && !ni.getDisplayName().startsWith("tailscale")
+ && !ni.getDisplayName().startsWith("docker")) {
possibles.add(ni);
}
}
@@ -82,12 +83,10 @@ public final class WSDiscoveryClientTest {
return p;
}
}
- for (NetworkInterface p : possibles) {
- if (p.getDisplayName().startsWith("docker")) {
- System.out.println("Using docker network interface:" + p.getDisplayName());
- return p;
- }
- }
+
+ // Sort interfaces predictably, in reverse order
+ possibles.sort((left, right) -> right.getDisplayName().compareTo(left.getDisplayName()));
+
if (possibles.isEmpty()) {
return null;
} else {
(cxf) 01/06: Update Netty to 4.1.114.Final
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7f2446bd2e7699189ada1f3928e19ef851c68a6c
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 2 12:39:59 2024 -0400
Update Netty to 4.1.114.Final
(cherry picked from commit 17d5f097db56b068a73bad99ca210a3c063b0b7a)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
(cherry picked from commit c4a7f6083ec7d3e25a67f0a0093597b39bcfb244)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
(cherry picked from commit a716e70d9590c566b28d6d87316bc78b1872a136)
# 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 ca6269a10f..8af31979d0 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -33,7 +33,7 @@
<cxf.spring.boot.version>2.6.15</cxf.spring.boot.version>
<cxf.spring.cloud.eureka.version>3.1.7</cxf.spring.cloud.eureka.version>
<cxf.jetty9.version>9.4.56.v20240826</cxf.jetty9.version>
- <cxf.netty.version>4.1.113.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.114.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>5.17.14</cxf.swagger.ui.version>
<cxf.tika.version>2.9.1</cxf.tika.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 490e0ba907..d64d94e6d0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -180,7 +180,7 @@
<cxf.msv.version>2022.7</cxf.msv.version>
<cxf.neethi.version>3.2.0</cxf.neethi.version>
<cxf.netty.version.range>[4,5)</cxf.netty.version.range>
- <cxf.netty.version>4.1.113.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.114.Final</cxf.netty.version>
<cxf.netty.tcnative.version>2.0.46.Final</cxf.netty.tcnative.version>
<cxf.olingo.version>2.0.12</cxf.olingo.version>
<cxf.openjpa.version>3.2.2</cxf.openjpa.version>
(cxf) 04/06: Attempt to fix org.apache.cxf.ws.discovery.WSDiscoveryClientTest.testMultiResponses by favoring docker interface if available
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit dcbb8e8cb04baa76a81e400ce55038e7965a09f3
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Oct 3 20:38:59 2024 -0400
Attempt to fix org.apache.cxf.ws.discovery.WSDiscoveryClientTest.testMultiResponses by favoring docker interface if available
(cherry picked from commit 924e577f6e29bd8b9c127c99be83bc02b996dd28)
---
.../java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
index 859eb2add0..168b2f25c8 100644
--- a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
+++ b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
@@ -82,6 +82,12 @@ public final class WSDiscoveryClientTest {
return p;
}
}
+ for (NetworkInterface p : possibles) {
+ if (p.getDisplayName().startsWith("docker")) {
+ System.out.println("Using docker network interface:" + p.getDisplayName());
+ return p;
+ }
+ }
if (possibles.isEmpty()) {
return null;
} else {
(cxf) 02/06: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.0 to 3.10.1 (#2091)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 19e191470cadd2b3af145d5c4af35c2ffd2cd0a7
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Oct 3 18:59:57 2024 -0400
Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.0 to 3.10.1 (#2091)
Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.10.0...maven-javadoc-plugin-3.10.1)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-javadoc-plugin
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 8cef5849b4741b1bfade570cd611ce31edd84ae8)
(cherry picked from commit 5c694ce1c5f857a26c54608deb617d10a45c864c)
(cherry picked from commit 456c2aee3771ea2164a010dad7b691def4329534)
---
parent/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d64d94e6d0..0342441641 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2043,7 +2043,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.10.0</version>
+ <version>3.10.1</version>
</dependency>
<dependency>
<groupId>org.ehcache</groupId>
diff --git a/pom.xml b/pom.xml
index 93a6fb67c3..00124366b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -467,7 +467,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.10.0</version>
+ <version>3.10.1</version>
<configuration>
<attach>true</attach>
<source>${cxf.jdk.version}</source>
(cxf) 03/06: Update Dropwizard Metrics to 4.2.28
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 92c3d96534516cc893418ef3cab45bea35024178
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Oct 3 19:04:00 2024 -0400
Update Dropwizard Metrics to 4.2.28
(cherry picked from commit 4f16fb986dadbc87d53d13fb17a23b8c95ad5ac3)
(cherry picked from commit 64f9782ad16188c44c7b2b762c118ae4ad711d4c)
(cherry picked from commit 47696fb63131d4351f3250be25c29153eefba0d2)
# 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 0342441641..4c2091817e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -106,7 +106,7 @@
<cxf.derby.version>10.14.2.0</cxf.derby.version>
<cxf.dom4j.version>2.1.4</cxf.dom4j.version>
<cxf.dropwizard3.version>3.2.6</cxf.dropwizard3.version>
- <cxf.dropwizard4.version>4.2.27</cxf.dropwizard4.version>
+ <cxf.dropwizard4.version>4.2.28</cxf.dropwizard4.version>
<cxf.ehcache3.version>3.9.3</cxf.ehcache3.version>
<cxf.el-api.version>3.0.3</cxf.el-api.version>
<cxf.findbugs.version>3.0.2</cxf.findbugs.version>