Merge branch 'release/0.9.1'

netifi-proteus · Sep 11, 2018 · 0bebe41 · 0bebe41
2 parents 168642f + 6fbdde0
commit 0bebe41
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 19 deletions.
diff --git 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
@@ -1,3 +1,3 @@
 dependencies {
-    compile 'io.netty:netty-buffer:4.1.29.Final'
+    compile 'io.netty:netty-buffer:4.1.24.Final'
 }
diff --git 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-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;
   }

diff --git 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'
 }
diff --git 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
@@ -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
@@ -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
@@ -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 {