From 6093acf3fcf603ae1803be446024f7f02b15030b Mon Sep 17 00:00:00 2001 From: Ryland Degnan Date: Sun, 9 Sep 2018 22:16:25 -0700 Subject: [PATCH 1/2] Revert to reactor-core-3.1.7.RELEASE --- gradle.properties | 2 +- gradle/java.gradle | 6 +++--- proteus-auth/build.gradle | 2 +- proteus-client/build.gradle | 6 +++--- proteus-frames/build.gradle | 2 +- proteus-metrics-micrometer/build.gradle | 6 +++--- proteus-metrics-prometheus/build.gradle | 6 +++--- proteus-tracing-openzipkin/build.gradle | 6 +++--- proteus-vizceral/build.gradle | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gradle.properties b/gradle.properties index ab9d6aa..e1aa3c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group=io.netifi.proteus -version=0.9.1 +version=0.9.2 diff --git a/gradle/java.gradle b/gradle/java.gradle index 2687967..d2db3c1 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -83,14 +83,14 @@ dependencies { testCompile 'junit:junit:4.12' testCompile 'javax.inject:javax.inject:1' - testCompile 'io.projectreactor:reactor-test:3.1.9.RELEASE' + testCompile 'io.projectreactor:reactor-test:3.1.7.RELEASE' testCompile 'com.google.protobuf:protobuf-java:3.6.0' testCompile 'org.hdrhistogram:HdrHistogram:2.1.10' testCompile 'org.apache.logging.log4j:log4j-api:2.9.0' testCompile 'org.apache.logging.log4j:log4j-core:2.9.0' testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.0' - testCompile 'io.rsocket:rsocket-transport-netty:0.11.6' - testCompile 'io.rsocket:rsocket-transport-local:0.11.6' + testCompile 'io.rsocket:rsocket-transport-netty:0.11.5' + testCompile 'io.rsocket:rsocket-transport-local:0.11.5' testCompile 'org.mockito:mockito-all:1.10.19' } diff --git a/proteus-auth/build.gradle b/proteus-auth/build.gradle index 1e860af..2bdcd4b 100644 --- a/proteus-auth/build.gradle +++ b/proteus-auth/build.gradle @@ -1,3 +1,3 @@ dependencies { - compile 'io.netty:netty-buffer:4.1.29.Final' + compile 'io.netty:netty-buffer:4.1.24.Final' } \ No newline at end of file diff --git a/proteus-client/build.gradle b/proteus-client/build.gradle index 25ea8d8..b196066 100644 --- a/proteus-client/build.gradle +++ b/proteus-client/build.gradle @@ -12,10 +12,10 @@ dependencies { compile project (':proteus-frames') compile 'com.typesafe:config:1.3.2' compile 'com.google.guava:guava:22.0' - compile 'io.rsocket.rpc:rsocket-rpc-core:0.2.1' + compile 'io.rsocket.rpc:rsocket-rpc-core:0.2.0' compile 'io.netty:netty-tcnative:2.0.14.Final:linux-x86_64' - testProtobuf 'io.rsocket.rpc:rsocket-rpc-protobuf-idl:0.2.1' + testProtobuf 'io.rsocket.rpc:rsocket-rpc-protobuf-idl:0.2.0' testCompile project(':proteus-tracing-openzipkin') testCompile project(':proteus-metrics-micrometer') testCompile 'io.micrometer:micrometer-registry-atlas:1.0.6' @@ -34,7 +34,7 @@ protobuf { } plugins { rsocketRpc { - artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.1' + artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0' } } generateProtoTasks { diff --git a/proteus-frames/build.gradle b/proteus-frames/build.gradle index 4af598b..27a99f4 100644 --- a/proteus-frames/build.gradle +++ b/proteus-frames/build.gradle @@ -1,3 +1,3 @@ dependencies { - compile 'io.rsocket:rsocket-core:0.11.6' + compile 'io.rsocket:rsocket-core:0.11.5' } \ No newline at end of file diff --git a/proteus-metrics-micrometer/build.gradle b/proteus-metrics-micrometer/build.gradle index 60fc180..1b14f1a 100644 --- a/proteus-metrics-micrometer/build.gradle +++ b/proteus-metrics-micrometer/build.gradle @@ -7,8 +7,8 @@ targetCompatibility = 1.8 dependencies { compile project (':proteus-client') - compile 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.1' - protobuf 'io.rsocket.rpc:rsocket-rpc-metrics-idl:0.2.1' + compile 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0' + protobuf 'io.rsocket.rpc:rsocket-rpc-metrics-idl:0.2.0' compile 'io.micrometer:micrometer-registry-atlas:1.0.6' } @@ -20,7 +20,7 @@ protobuf { } plugins { rsocketRpc { - artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.1' + artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0' } } generateProtoTasks { diff --git a/proteus-metrics-prometheus/build.gradle b/proteus-metrics-prometheus/build.gradle index 0cb5fe8..75e493a 100644 --- a/proteus-metrics-prometheus/build.gradle +++ b/proteus-metrics-prometheus/build.gradle @@ -7,8 +7,8 @@ targetCompatibility = 1.8 dependencies { compile project (':proteus-client') - compile 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.1' - protobuf 'io.rsocket.rpc:rsocket-rpc-metrics-idl:0.2.1' + compile 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0' + protobuf 'io.rsocket.rpc:rsocket-rpc-metrics-idl:0.2.0' compile 'io.micrometer:micrometer-registry-prometheus:1.0.6' testCompile 'org.apache.logging.log4j:log4j-api:2.9.0' @@ -24,7 +24,7 @@ protobuf { } plugins { rsocketRpc { - artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.1' + artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0' } } generateProtoTasks { diff --git a/proteus-tracing-openzipkin/build.gradle b/proteus-tracing-openzipkin/build.gradle index 0e64ea0..e6f4cf2 100644 --- a/proteus-tracing-openzipkin/build.gradle +++ b/proteus-tracing-openzipkin/build.gradle @@ -6,11 +6,11 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 dependencies { - compile 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.1' + compile 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0' protobuf project (':proteus-tracing-idl') compile project (':proteus-client') - compile 'io.projectreactor.addons:reactor-adapter:3.1.7.RELEASE' + compile 'io.projectreactor.addons:reactor-adapter:3.1.6.RELEASE' compile 'com.google.protobuf:protobuf-java-util:3.6.0' compile 'io.opentracing:opentracing-api:0.31.0' @@ -31,7 +31,7 @@ protobuf { } plugins { rsocketRpc { - artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.1' + artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0' } } generateProtoTasks { diff --git a/proteus-vizceral/build.gradle b/proteus-vizceral/build.gradle index d3ca035..ca6fcf6 100644 --- a/proteus-vizceral/build.gradle +++ b/proteus-vizceral/build.gradle @@ -9,7 +9,7 @@ dependencies { protobuf project (':proteus-vizceral-idl') compile project (':proteus-client') compile project (':proteus-tracing-openzipkin') - compile 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.1' + compile 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0' testCompile 'com.fasterxml.jackson.core:jackson-core:2.9.6' } @@ -21,7 +21,7 @@ protobuf { } plugins { rsocketRpc { - artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.1' + artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0' } } generateProtoTasks { From 6fbdde06387846ad35ff09d883c12f0dd48a5d59 Mon Sep 17 00:00:00 2001 From: Ryland Degnan Date: Mon, 10 Sep 2018 23:37:58 -0700 Subject: [PATCH 2/2] Expose broadcast socket --- gradle.properties | 2 +- proteus-client/src/main/java/io/netifi/proteus/Proteus.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e1aa3c7..ab9d6aa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group=io.netifi.proteus -version=0.9.2 +version=0.9.1 diff --git a/proteus-client/src/main/java/io/netifi/proteus/Proteus.java b/proteus-client/src/main/java/io/netifi/proteus/Proteus.java index 0c5df09..5f1c396 100644 --- a/proteus-client/src/main/java/io/netifi/proteus/Proteus.java +++ b/proteus-client/src/main/java/io/netifi/proteus/Proteus.java @@ -113,6 +113,10 @@ public ProteusSocket group(String group) { return brokerService.group(group); } + public ProteusSocket broadcast(String group) { + return brokerService.broadcast(group); + } + public long getAccesskey() { return accesskey; }