You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2022/09/27 15:14:14 UTC
[cxf] branch 3.5.x-fixes updated (d5409bf227 -> 237c71cbdc)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from d5409bf227 Recording .gitmergeinfo Changes
new e713fd3483 Recording .gitmergeinfo Changes
new 237c71cbdc Revert "Fix ws-discovery-api test on MacOS on M1"
The 2 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 | 2 ++
.../java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
[cxf] 02/02: Revert "Fix ws-discovery-api test on MacOS on M1"
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 237c71cbdc26cbc6e346c8cc592bd17ac892910e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Sep 27 16:14:03 2022 +0100
Revert "Fix ws-discovery-api test on MacOS on M1"
This reverts commit 0a6d9ccffea358ba69aceef43fd10255ab86b5c2.
---
.../java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 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 836f72bc7c..b8a313802c 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
@@ -85,6 +85,7 @@ public final class WSDiscoveryClientTest {
System.out.println("Skipping MultiResponse test for REL");
return;
}
+
Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
int count = 0;
if (interfaces != null) {
@@ -108,10 +109,8 @@ public final class WSDiscoveryClientTest {
//fake a discovery server to send back some canned messages.
InetAddress address = InetAddress.getByName("239.255.255.250");
MulticastSocket s = new MulticastSocket(Integer.parseInt(PORT));
- if (!"Mac OS X".equals(System.getProperties().getProperty("os.name"))) {
- s.setNetworkInterface(findIpv4Interface());
- }
s.setBroadcast(true);
+ s.setNetworkInterface(findIpv4Interface());
s.setLoopbackMode(false);
s.setReuseAddress(true);
s.joinGroup(address);
@@ -122,7 +121,8 @@ public final class WSDiscoveryClientTest {
s.receive(p);
SocketAddress sa = p.getSocketAddress();
String incoming = new String(p.getData(), 0, p.getLength(), StandardCharsets.UTF_8);
- int idx = incoming.indexOf('>', incoming.indexOf("MessageID"));
+ int idx = incoming.indexOf("MessageID");
+ idx = incoming.indexOf('>', idx);
incoming = incoming.substring(idx + 1);
idx = incoming.indexOf("</");
incoming = incoming.substring(0, idx);
[cxf] 01/02: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e713fd34837af629711a16a7e376b0a090a393c7
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Sep 27 16:13:50 2022 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ed2717bd86..73797b2d9f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -28,6 +28,7 @@ B 8311c0ea9783697307e616bd4c3f669e8396eab3
B 83909463eb6b905b983208a6b084a97f2e91ab0f
B 85b9b53c632feb023b522afd49192e95ab232a15
B 86c4b4960df71674490b3bc84fb3ffd72ba5bea5
+B 8c3e3a003702fb9547519c0768806a7ce478dfa0
B 8f7c9dae610cd708b5e17828b58b642a5485b9cc
B 9723e32190d3a820e0eecf19177561155399c867
B a6501f782cd2b392f09edb4ccb99a83acd2e75a2
@@ -41,6 +42,7 @@ B c87e69e5d3f1f1cd24ed37d3ba2b2fef6b294f90
B cad4f0b76bb79f82a5ef4bc7e435e93996eb884b
B cfca13411eb72d2d07ca243e24ced6e9743e6124
B d30602dda6a86c80c58aa7665f1f6ac11b94845d
+B d319f8a2f5ca93e7bcaa028f8026c402e1046037
B d77fd3ac9eb11bd69e5d534dffe53296e4c00ae8
B d7b9a3095d864a6b41dc0ee07dffbd0c36d7cdf6
B e7c2aee206ae5084204502b4744feed5a8e93e04