diff --git a/pom.xml b/pom.xml index 98b16e55f..f50ded34f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 scalecube-services-parent - 2.9.3-SNAPSHOT + 2.10.0-SNAPSHOT io.scalecube @@ -23,7 +23,7 @@ 2.11.0 - 2.5.0 + 2.6.0-RC1 1.0.4 1.2.2 0.4.3 diff --git a/services-api/pom.xml b/services-api/pom.xml index 7d5036c1c..384e9ec2d 100644 --- a/services-api/pom.xml +++ b/services-api/pom.xml @@ -6,7 +6,7 @@ io.scalecube scalecube-services-parent - 2.9.3-SNAPSHOT + 2.10.0-SNAPSHOT scalecube-services-api diff --git a/services-benchmarks/pom.xml b/services-benchmarks/pom.xml index 6ecfe5a7f..ce1f28a8b 100644 --- a/services-benchmarks/pom.xml +++ b/services-benchmarks/pom.xml @@ -5,7 +5,7 @@ scalecube-services-parent io.scalecube - 2.9.3-SNAPSHOT + 2.10.0-SNAPSHOT scalecube-services-benchmarks diff --git a/services-bytebuf-codec/pom.xml b/services-bytebuf-codec/pom.xml index 69a5a49be..6b1f74f2d 100644 --- a/services-bytebuf-codec/pom.xml +++ b/services-bytebuf-codec/pom.xml @@ -4,7 +4,7 @@ io.scalecube scalecube-services-parent - 2.9.3-SNAPSHOT + 2.10.0-SNAPSHOT scalecube-services-bytebuf-codec diff --git a/services-discovery/pom.xml b/services-discovery/pom.xml index dd6b0c366..50b35b3e8 100644 --- a/services-discovery/pom.xml +++ b/services-discovery/pom.xml @@ -4,7 +4,7 @@ io.scalecube scalecube-services-parent - 2.9.3-SNAPSHOT + 2.10.0-SNAPSHOT scalecube-services-discovery diff --git a/services-discovery/src/main/java/io/scalecube/services/discovery/ScalecubeServiceDiscovery.java b/services-discovery/src/main/java/io/scalecube/services/discovery/ScalecubeServiceDiscovery.java index 333b213c7..684ebae5a 100644 --- a/services-discovery/src/main/java/io/scalecube/services/discovery/ScalecubeServiceDiscovery.java +++ b/services-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 index 8e46a7606..65db4f7b7 100644 --- a/services-examples-parent/pom.xml +++ b/services-examples-parent/pom.xml @@ -5,7 +5,7 @@ io.scalecube scalecube-services-parent - 2.9.3-SNAPSHOT + 2.10.0-SNAPSHOT scalecube-services-examples-parent diff --git a/services-examples-parent/services-examples-runner/pom.xml b/services-examples-parent/services-examples-runner/pom.xml index a7a957db4..ca2d41314 100644 --- a/services-examples-parent/services-examples-runner/pom.xml +++ b/services-examples-parent/services-examples-runner/pom.xml @@ -3,7 +3,7 @@ scalecube-services-examples-parent io.scalecube - 2.9.3-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/services-examples-parent/services-examples/pom.xml b/services-examples-parent/services-examples/pom.xml index 9f957be05..00aa0e867 100644 --- a/services-examples-parent/services-examples/pom.xml +++ b/services-examples-parent/services-examples/pom.xml @@ -4,7 +4,7 @@ io.scalecube scalecube-services-examples-parent - 2.9.3-SNAPSHOT + 2.10.0-SNAPSHOT scalecube-services-examples diff --git a/services-transport-parent/pom.xml b/services-transport-parent/pom.xml index bcf1aaa09..bac760982 100644 --- a/services-transport-parent/pom.xml +++ b/services-transport-parent/pom.xml @@ -5,7 +5,7 @@ io.scalecube scalecube-services-parent - 2.9.3-SNAPSHOT + 2.10.0-SNAPSHOT scalecube-services-transport-parent diff --git a/services-transport-parent/services-transport-jackson/pom.xml b/services-transport-parent/services-transport-jackson/pom.xml index d68cb1230..fc5cc4eed 100644 --- a/services-transport-parent/services-transport-jackson/pom.xml +++ b/services-transport-parent/services-transport-jackson/pom.xml @@ -4,7 +4,7 @@ io.scalecube scalecube-services-transport-parent - 2.9.3-SNAPSHOT + 2.10.0-SNAPSHOT scalecube-services-transport-jackson diff --git a/services-transport-parent/services-transport-protostuff/pom.xml b/services-transport-parent/services-transport-protostuff/pom.xml index 6d23e3e72..2d82e790b 100644 --- a/services-transport-parent/services-transport-protostuff/pom.xml +++ b/services-transport-parent/services-transport-protostuff/pom.xml @@ -5,7 +5,7 @@ scalecube-services-transport-parent io.scalecube - 2.9.3-SNAPSHOT + 2.10.0-SNAPSHOT scalecube-services-transport-protostuff diff --git a/services-transport-parent/services-transport-rsocket/pom.xml b/services-transport-parent/services-transport-rsocket/pom.xml index 8aa60e20a..1ff1b51a3 100644 --- a/services-transport-parent/services-transport-rsocket/pom.xml +++ b/services-transport-parent/services-transport-rsocket/pom.xml @@ -4,7 +4,7 @@ io.scalecube scalecube-services-transport-parent - 2.9.3-SNAPSHOT + 2.10.0-SNAPSHOT scalecube-services-transport-rsocket diff --git a/services/pom.xml b/services/pom.xml index 980f01f44..a1328516e 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -5,7 +5,7 @@ scalecube-services-parent io.scalecube - 2.9.3-SNAPSHOT + 2.10.0-SNAPSHOT scalecube-services