diff --git a/README.adoc b/README.adoc
index 27b3f15..f0d8f82 100644
--- a/README.adoc
+++ b/README.adoc
@@ -12,6 +12,10 @@ This cluster orchestration library is not meant to be used for writing productio
this library fail without even an attempt at managing nor recovering the problem. This is a reasonable limitation for the scope
of this library which is to ease writing multi-machine tests.
+=== Required java version
+
+Starting with version 1.1.0, Java 11 is necessary. Version 1.0.3 is the last one compatible with Java 8.
+
=== Configuring a JVM cluster
Creating a `ClusterConfiguration` instance is the first step to creating a cluster of JVMs.
diff --git a/pom.xml b/pom.xml
index 39d5406..d65be8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
org.mortbay.jetty.orchestrator
jetty-cluster-orchestrator
- 1.0.5-SNAPSHOT
+ 1.1.0-SNAPSHOT
Jetty :: JVM Cluster Orchestrator
https://github.com/jetty-project/jetty-cluster-orchestrator
@@ -63,7 +63,7 @@
- [1.8,)
+ [${maven.compiler.source},)
[3.5,)
@@ -78,7 +78,14 @@
license-maven-plugin
false
-
+
+
+
+
+ **/*.java
+
+
+
true
true
true
@@ -88,9 +95,6 @@
DOUBLESLASH_STYLE
-
- **/*.java
-
@@ -187,7 +191,7 @@
maven-javadoc-plugin
3.5.0
-
+
-html5
@@ -279,13 +283,6 @@
0.35.0
-
- org.zeroturnaround
- zt-process-killer
- 1.10
- test
- true
-
org.junit.jupiter
junit-jupiter
@@ -316,16 +313,26 @@
lorban
Ludovic Orban
- lorban@webtide.com
- Webtide
+ lorban@bitronix.be
+ Webtide, LLC
https://webtide.com
+ 1
olamy
- olamy@webtide.com
Olivier Lamy
- Webtide
+ oliver.lamy@gmail.com
+ Webtide, LLC
+ https://webtide.com
+ Australia/Brisbane
+
+
+ joakime
+ Joakim Erdfelt
+ joakim.erdfelt@gmail.com
+ Webtide, LLC
https://webtide.com
+ -6
diff --git a/src/main/java/org/mortbay/jetty/orchestrator/ClusterTools.java b/src/main/java/org/mortbay/jetty/orchestrator/ClusterTools.java
index a3946cb..079d94b 100644
--- a/src/main/java/org/mortbay/jetty/orchestrator/ClusterTools.java
+++ b/src/main/java/org/mortbay/jetty/orchestrator/ClusterTools.java
@@ -33,6 +33,11 @@ public ClusterTools(CuratorFramework curator, GlobalNodeId globalNodeId)
this.globalNodeId = globalNodeId;
}
+ public String getNodeId()
+ {
+ return globalNodeId.getNodeId();
+ }
+
public Barrier barrier(String name, int count)
{
return new Barrier(curator, globalNodeId, name, count);
diff --git a/src/main/java/org/mortbay/jetty/orchestrator/NodeArray.java b/src/main/java/org/mortbay/jetty/orchestrator/NodeArray.java
index 972106e..8768d92 100644
--- a/src/main/java/org/mortbay/jetty/orchestrator/NodeArray.java
+++ b/src/main/java/org/mortbay/jetty/orchestrator/NodeArray.java
@@ -16,8 +16,8 @@
import java.net.URI;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
@@ -74,36 +74,64 @@ public NodeArrayFuture executeOn(String id, NodeJob nodeJob)
if (node == null)
throw new IllegalArgumentException("No such node with ID " + id);
- List> futures = new ArrayList<>();
+ Map> futures = new HashMap<>();
try
{
CompletableFuture