Skip to content

Commit 57dd6ed

Browse files
committed
update zk and apache curator version
1 parent fd8629e commit 57dd6ed

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

core/debug.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- "27017:27017"
1111

1212
zk:
13-
image: zookeeper:3.4
13+
image: zookeeper:3.6
1414
container_name: flowci-debug-zk
1515
restart: always
1616
ports:

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<spring.version>2.1.9.RELEASE</spring.version>
2929
<snakeyaml.version>1.21</snakeyaml.version>
3030
<jackson.version>2.10.1</jackson.version>
31-
<curator.version>2.12.0</curator.version>
31+
<curator.version>4.3.0</curator.version>
3232
<caffeine.version>2.6.2</caffeine.version>
3333
<h2.version>1.4.197</h2.version>
3434
<wiremock.version>2.18.0</wiremock.version>

zookeeper/src/main/java/com/flowci/zookeeper/LocalServer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Properties;
2222
import org.apache.zookeeper.server.ServerConfig;
2323
import org.apache.zookeeper.server.ZooKeeperServerMain;
24+
import org.apache.zookeeper.server.admin.AdminServer;
2425
import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
2526
import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
2627

@@ -52,7 +53,7 @@ public void run() {
5253
configuration.readFrom(quorumPeerConfig);
5354

5455
this.runFromConfig(configuration);
55-
} catch (IOException | ConfigException e) {
56+
} catch (Exception e) {
5657
throw new ZookeeperException("Unable to start embedded zookeeper server: {}", e.getMessage());
5758
}
5859
}
@@ -70,7 +71,7 @@ protected void shutdown() {
7071
}
7172

7273
@Override
73-
public void runFromConfig(ServerConfig config) throws IOException {
74+
public void runFromConfig(ServerConfig config) throws IOException, AdminServer.AdminServerException {
7475
isStarted = true;
7576
super.runFromConfig(config);
7677
}

0 commit comments

Comments
 (0)