Merge pull request #765 from scalecube/update-cluster-2.6.x

Updated cluster to 2.6.0-RC1
scalecube · Jun 11, 2020 · 3c9f0ed · 3c9f0ed
2 parents ef504cd + 4e97178
commit 3c9f0ed
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>scalecube-services-parent</artifactId>
-  <version>2.9.3-SNAPSHOT</version>
+  <version>2.10.0-SNAPSHOT</version>
 
   <parent>
     <groupId>io.scalecube</groupId>
@@ -23,7 +23,7 @@
 
   <properties>
     <jackson.version>2.11.0</jackson.version>
-    <scalecube-cluster.version>2.5.0</scalecube-cluster.version>
+    <scalecube-cluster.version>2.6.0-RC1</scalecube-cluster.version>
     <scalecube-commons.version>1.0.4</scalecube-commons.version>
     <scalecube-benchmarks.version>1.2.2</scalecube-benchmarks.version>
     <scalecube-config.version>0.4.3</scalecube-config.version>

diff --git a/services-api/pom.xml b/services-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.9.3-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-api</artifactId>

diff --git a/services-benchmarks/pom.xml b/services-benchmarks/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>scalecube-services-parent</artifactId>
     <groupId>io.scalecube</groupId>
-    <version>2.9.3-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-benchmarks</artifactId>

diff --git a/services-bytebuf-codec/pom.xml b/services-bytebuf-codec/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.9.3-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-bytebuf-codec</artifactId>

diff --git a/services-discovery/pom.xml b/services-discovery/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.9.3-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-discovery</artifactId>

diff --git a/...es-discovery/src/main/java/io/scalecube/services/discovery/ScalecubeServiceDiscovery.java b/...es-discovery/src/main/java/io/scalecube/services/discovery/ScalecubeServiceDiscovery.java
@@ -17,6 +17,7 @@
 import io.scalecube.services.ServiceEndpoint;
 import io.scalecube.services.discovery.api.ServiceDiscovery;
 import io.scalecube.services.discovery.api.ServiceDiscoveryEvent;
+import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 import java.lang.management.ManagementFactory;
 import java.nio.ByteBuffer;
 import java.util.List;
@@ -57,8 +58,9 @@ public ScalecubeServiceDiscovery(ServiceEndpoint serviceEndpoint) {
     this.serviceEndpoint = Objects.requireNonNull(serviceEndpoint, "serviceEndpoint");
     this.clusterConfig =
         ClusterConfig.defaultLanConfig()
+            .metadata(serviceEndpoint)
             .memberIdGenerator(serviceEndpoint::id)
-            .metadata(serviceEndpoint);
+            .transport(opts -> opts.transportFactory(new WebsocketTransportFactory()));
   }
 
   /**

diff --git a/services-examples-parent/pom.xml b/services-examples-parent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.9.3-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-examples-parent</artifactId>

diff --git a/services-examples-parent/services-examples-runner/pom.xml b/services-examples-parent/services-examples-runner/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>scalecube-services-examples-parent</artifactId>
     <groupId>io.scalecube</groupId>
-    <version>2.9.3-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/services-examples-parent/services-examples/pom.xml b/services-examples-parent/services-examples/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-examples-parent</artifactId>
-    <version>2.9.3-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-examples</artifactId>

diff --git a/services-transport-parent/pom.xml b/services-transport-parent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.9.3-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-transport-parent</artifactId>

diff --git a/services-transport-parent/services-transport-jackson/pom.xml b/services-transport-parent/services-transport-jackson/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-transport-parent</artifactId>
-    <version>2.9.3-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-transport-jackson</artifactId>

diff --git a/services-transport-parent/services-transport-protostuff/pom.xml b/services-transport-parent/services-transport-protostuff/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>scalecube-services-transport-parent</artifactId>
     <groupId>io.scalecube</groupId>
-    <version>2.9.3-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-transport-protostuff</artifactId>

diff --git a/services-transport-parent/services-transport-rsocket/pom.xml b/services-transport-parent/services-transport-rsocket/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-transport-parent</artifactId>
-    <version>2.9.3-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-transport-rsocket</artifactId>

diff --git a/services/pom.xml b/services/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>scalecube-services-parent</artifactId>
     <groupId>io.scalecube</groupId>
-    <version>2.9.3-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services</artifactId>