You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by fm...@apache.org on 2023/08/04 10:09:59 UTC
[camel] branch main updated: bump zookeeper version to 3.9.0
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 0f93f36d2ad bump zookeeper version to 3.9.0
0f93f36d2ad is described below
commit 0f93f36d2ad0f415d6fcb1dfd2d856995924bfa5
Author: Croway <fe...@gmail.com>
AuthorDate: Fri Aug 4 11:29:54 2023 +0200
bump zookeeper version to 3.9.0
---
.../java/org/apache/camel/test/AvailablePortFinder.java | 16 ++++++++++++++++
.../camel/component/zookeepermaster/group/GroupIT.java | 12 ++++++------
.../group/internal/ZooKeeperGroupTest.java | 2 +-
.../cloud/integration/ZooKeeperServiceCallRouteIT.java | 2 +-
.../cloud/integration/ZooKeeperServiceDiscoveryIT.java | 2 +-
.../integration/ZooKeeperServiceRegistrationITBase.java | 2 +-
parent/pom.xml | 2 +-
7 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
index d1d5a106c79..55b651b985c 100644
--- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
+++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
@@ -21,6 +21,7 @@ import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.util.Map;
+import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
@@ -132,6 +133,21 @@ public final class AvailablePortFinder {
}
}
+ /**
+ * Gets the next available port.
+ *
+ * @throws IllegalStateException if there are no ports available
+ * @return the available port
+ */
+ public static int getNextRandomAvailable() {
+ Random random = new Random();
+ int fromPort = random.nextInt(10000, 65500);
+ int toPort = random.nextInt(fromPort, 65500);
+ try (Port port = INSTANCE.findPort(fromPort, toPort)) {
+ return port.getPort();
+ }
+ }
+
/**
* Gets the next available port in the given range.
*
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupIT.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupIT.java
index 3d207422bf6..90694ddc823 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupIT.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupIT.java
@@ -117,7 +117,7 @@ public class GroupIT {
@Test
public void testOrder() throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
+ int port = AvailablePortFinder.getNextRandomAvailable();
CuratorFramework curator = CuratorFrameworkFactory.builder()
.connectString("localhost:" + port)
@@ -179,7 +179,7 @@ public class GroupIT {
@Test
public void testJoinAfterConnect() throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
+ int port = AvailablePortFinder.getNextRandomAvailable();
CuratorFramework curator = CuratorFrameworkFactory.builder()
.connectString("localhost:" + port)
@@ -229,7 +229,7 @@ public class GroupIT {
@Test
public void testJoinBeforeConnect() throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
+ int port = AvailablePortFinder.getNextRandomAvailable();
CuratorFramework curator = CuratorFrameworkFactory.builder()
.connectString("localhost:" + port)
@@ -273,7 +273,7 @@ public class GroupIT {
@Test
public void testRejoinAfterDisconnect() throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
+ int port = AvailablePortFinder.getNextRandomAvailable();
CuratorFramework curator = CuratorFrameworkFactory.builder()
.connectString("localhost:" + port)
@@ -332,7 +332,7 @@ public class GroupIT {
//(see https://github.com/jboss-fuse/fuse/issues/133)
@Test
public void testGroupClose() throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
+ int port = AvailablePortFinder.getNextRandomAvailable();
ZooKeeperContainer container = null;
Path dataDir = Files.createTempDirectory("zk-");
@@ -380,7 +380,7 @@ public class GroupIT {
@Test
public void testAddFieldIgnoredOnParse() throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
+ int port = AvailablePortFinder.getNextRandomAvailable();
ZooKeeperContainer container = null;
Path dataDir = Files.createTempDirectory("zk-");
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java
index 34a1be1c6bb..3dd745e8c3b 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java
@@ -45,7 +45,7 @@ public class ZooKeeperGroupTest {
private ZooKeeperGroup<NodeState> group;
private int findFreePort() {
- return AvailablePortFinder.getNextAvailable();
+ return AvailablePortFinder.getNextRandomAvailable();
}
@BeforeEach
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceCallRouteIT.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceCallRouteIT.java
index 8d0c4f74771..90eab7d80e8 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceCallRouteIT.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceCallRouteIT.java
@@ -80,7 +80,7 @@ public class ZooKeeperServiceCallRouteIT extends CamelTestSupport {
ServiceInstance<MetaData> instance
= ServiceInstance.<MetaData> builder()
.address("127.0.0.1")
- .port(AvailablePortFinder.getNextAvailable())
+ .port(AvailablePortFinder.getNextRandomAvailable())
.name(SERVICE_NAME)
.id("service-" + i)
.build();
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceDiscoveryIT.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceDiscoveryIT.java
index 33bcf1e83d7..4de7f283083 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceDiscoveryIT.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceDiscoveryIT.java
@@ -69,7 +69,7 @@ class ZooKeeperServiceDiscoveryIT {
ServiceInstance<MetaData> instance
= ServiceInstance.<MetaData> builder()
.address("127.0.0.1")
- .port(AvailablePortFinder.getNextAvailable())
+ .port(AvailablePortFinder.getNextRandomAvailable())
.name("my-service")
.id("service-" + i)
.build();
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceRegistrationITBase.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceRegistrationITBase.java
index 390747aa9a1..8242f64f3dc 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceRegistrationITBase.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceRegistrationITBase.java
@@ -49,7 +49,7 @@ public abstract class ZooKeeperServiceRegistrationITBase extends CamelTestSuppor
protected static final String SERVICE_NAME = "my-service";
protected static final String SERVICE_HOST = "localhost";
protected static final String SERVICE_PATH = "/camel";
- protected static final int SERVICE_PORT = AvailablePortFinder.getNextAvailable();
+ protected static final int SERVICE_PORT = AvailablePortFinder.getNextRandomAvailable();
protected ZooKeeperContainer container;
protected CuratorFramework curator;
diff --git a/parent/pom.xml b/parent/pom.xml
index db0e38bb95d..6762952f9f5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -476,7 +476,7 @@
<yetus-audience-annotations-version>0.14.1</yetus-audience-annotations-version>
<zeebe.version>8.2.11</zeebe.version>
<zendesk-client-version>0.23.0</zendesk-client-version>
- <zookeeper-version>3.8.2</zookeeper-version>
+ <zookeeper-version>3.9.0</zookeeper-version>
<zxing-version>3.5.2</zxing-version>
</properties>