Merge branch 'release/0.9.3'

build.gradle

@@ -95,10 +95,3 @@ project(':proteus-vizceral-idl') {
 
     apply from: file('../gradle/java.gradle')
 }
-
-project(':proteus-vizceral') {
-    description = 'Netifi Proteus Vizceral Service'
-    ext.artifactName = 'proteus-vizceral'
-
-    apply from: file('../gradle/java.gradle')
-}

docs/index.md

@@ -84,11 +84,11 @@ Proteus Java uses a Protobuf plugin to generate application code. Add the follow
 ```
 Protobuf {
     protoc {
-        artifact = 'com.google.Protobuf:protoc:3.6.0'
+        artifact = 'com.google.Protobuf:protoc:3.6.1'
     }
     plugins {
         rsocketRpc {
-            artifact = 'io.netifi.proteus:proteus-java:0.7.x'
+            artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.x'
         }
     }
     generateProtoTasks {
@@ -101,10 +101,10 @@ Protobuf {
 // If you use Intellij add this so it can find the generated classes
 idea {
     module {
-        sourceDirs += file("${projectDir}/build/generated/source/proto/main/java");
-        sourceDirs += file("${projectDir}/build/generated/source/proto/main/proteus");
-        sourceDirs += file("${projectDir}/build/generated/source/proto/test/java");
-        sourceDirs += file("${projectDir}/build/generated/source/proto/test/proteus");
+        sourceDirs += file("${projectDir}/build/generated/source/rsocketRpc/main/java");
+        sourceDirs += file("${projectDir}/build/generated/source/rsocketRpc/main/proteus");
+        sourceDirs += file("${projectDir}/build/generated/source/rsocketRpc/test/java");
+        sourceDirs += file("${projectDir}/build/generated/source/rsocketRpc/test/proteus");
     }
 }
 ```

gradle.properties

@@ -1,2 +1,2 @@
 group=io.netifi.proteus
-version=0.9.2
+version=0.9.3

gradle/java.gradle

@@ -34,6 +34,11 @@ task ciVersion {
 }
 build.dependsOn ciVersion
 
+ext {
+    rsocketRpcVersion = '0.2.1'
+    protobufVersion = '3.6.1'
+}
+
 repositories {
     jcenter()
     mavenLocal()
@@ -83,14 +88,14 @@ dependencies {
     testCompile 'junit:junit:4.12'
 
     testCompile 'javax.inject:javax.inject:1'
-    testCompile 'io.projectreactor:reactor-test:3.1.7.RELEASE'
-    testCompile 'com.google.protobuf:protobuf-java:3.6.0'
+    testCompile 'io.projectreactor:reactor-test:3.1.9.RELEASE'
+    testCompile "com.google.protobuf:protobuf-java:$protobufVersion"
     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.5'
-    testCompile 'io.rsocket:rsocket-transport-local:0.11.5'
+    testCompile 'io.rsocket:rsocket-transport-netty:0.11.6'
+    testCompile 'io.rsocket:rsocket-transport-local:0.11.6'
     testCompile 'org.mockito:mockito-all:1.10.19'
 }
 

proteus-access-key-info-idl/build.gradle

@@ -3,12 +3,12 @@ plugins {
 }
 
 dependencies {
-    protobuf 'com.google.protobuf:protobuf-java:3.6.0'
+    protobuf "com.google.protobuf:protobuf-java:$protobufVersion"
 }
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.6.0'
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
     }
     generateProtoTasks {
         all()*.enabled = false

proteus-auth/build.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    compile 'io.netty:netty-buffer:4.1.24.Final'
+    compile 'io.netty:netty-buffer:4.1.29.Final'
 }

proteus-broker-info-idl/build.gradle

@@ -3,12 +3,12 @@ plugins {
 }
 
 dependencies {
-    protobuf 'com.google.protobuf:protobuf-java:3.6.0'
+    protobuf "com.google.protobuf:protobuf-java:$protobufVersion"
 }
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.6.0'
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
     }
     generateProtoTasks {
         all()*.enabled = false

proteus-broker-mgmt-idl/build.gradle

@@ -8,7 +8,7 @@ dependencies {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.6.0'
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
     }
     generateProtoTasks {
         all()*.enabled = false

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.0'
+    compile "io.rsocket.rpc:rsocket-rpc-core:$rsocketRpcVersion"
     compile 'io.netty:netty-tcnative:2.0.14.Final:linux-x86_64'
 
-    testProtobuf 'io.rsocket.rpc:rsocket-rpc-protobuf-idl:0.2.0'
+    testProtobuf "io.rsocket.rpc:rsocket-rpc-protobuf-idl:$rsocketRpcVersion"
     testCompile project(':proteus-tracing-openzipkin')
     testCompile project(':proteus-metrics-micrometer')
     testCompile 'io.micrometer:micrometer-registry-atlas:1.0.6'
@@ -30,11 +30,11 @@ protobuf {
     generatedFilesBaseDir = "${projectDir}/src/generated"
 
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.6.0'
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
     }
     plugins {
         rsocketRpc {
-            artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0'
+            artifact = "io.rsocket.rpc:rsocket-rpc-protobuf:$rsocketRpcVersion"
         }
     }
     generateProtoTasks {

proteus-frames/build.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    compile 'io.rsocket:rsocket-core:0.11.5'
+    compile 'io.rsocket:rsocket-core:0.11.6'
 }

proteus-metrics-micrometer/build.gradle

@@ -7,20 +7,20 @@ targetCompatibility = 1.8
 
 dependencies {
     compile project (':proteus-client')
-    compile 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0'
-    protobuf 'io.rsocket.rpc:rsocket-rpc-metrics-idl:0.2.0'
+    compile "io.rsocket.rpc:rsocket-rpc-protobuf:$rsocketRpcVersion"
+    protobuf "io.rsocket.rpc:rsocket-rpc-metrics-idl:$rsocketRpcVersion"
     compile 'io.micrometer:micrometer-registry-atlas:1.0.6'
 }
 
 protobuf {
     generatedFilesBaseDir = "${projectDir}/src/generated"
 
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.6.0'
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
     }
     plugins {
         rsocketRpc {
-            artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0'
+            artifact = "io.rsocket.rpc:rsocket-rpc-protobuf:$rsocketRpcVersion"
         }
     }
     generateProtoTasks {

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.0'
-    protobuf 'io.rsocket.rpc:rsocket-rpc-metrics-idl:0.2.0'
+    compile "io.rsocket.rpc:rsocket-rpc-protobuf:$rsocketRpcVersion"
+    protobuf "io.rsocket.rpc:rsocket-rpc-metrics-idl:$rsocketRpcVersion"
     compile 'io.micrometer:micrometer-registry-prometheus:1.0.6'
 
     testCompile 'org.apache.logging.log4j:log4j-api:2.9.0'
@@ -20,11 +20,11 @@ protobuf {
     generatedFilesBaseDir = "${projectDir}/src/generated"
 
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.6.0'
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
     }
     plugins {
         rsocketRpc {
-            artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0'
+            artifact = "io.rsocket.rpc:rsocket-rpc-protobuf:$rsocketRpcVersion"
         }
     }
     generateProtoTasks {

proteus-tracing-idl/build.gradle

@@ -3,12 +3,12 @@ plugins {
 }
 
 dependencies {
-    protobuf 'com.google.protobuf:protobuf-java:3.6.0'
+    protobuf "com.google.protobuf:protobuf-java:$protobufVersion"
 }
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.6.0'
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
     }
     generateProtoTasks {
         all()*.enabled = false

proteus-tracing-openzipkin/build.gradle

@@ -6,16 +6,16 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 dependencies {
-    compile 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0'
+    compile "io.rsocket.rpc:rsocket-rpc-protobuf:$rsocketRpcVersion"
     protobuf project (':proteus-tracing-idl')
     compile project (':proteus-client')
 
-    compile 'io.projectreactor.addons:reactor-adapter:3.1.6.RELEASE'
-    compile 'com.google.protobuf:protobuf-java-util:3.6.0'
+    compile 'io.projectreactor.addons:reactor-adapter:3.1.7.RELEASE'
+    compile "com.google.protobuf:protobuf-java-util:$protobufVersion"
 
     compile 'io.opentracing:opentracing-api:0.31.0'
     compile 'io.opentracing.brave:brave-opentracing:0.31.2'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.6'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.4'
     compile group: 'com.hubspot.jackson', name: 'jackson-datatype-protobuf', version: '0.9.10-jackson2.9-proto3'
 
     testCompile 'org.apache.logging.log4j:log4j-api:2.9.0'
@@ -27,11 +27,11 @@ protobuf {
     generatedFilesBaseDir = "${projectDir}/src/generated"
 
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.6.0'
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
     }
     plugins {
         rsocketRpc {
-            artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0'
+            artifact = "io.rsocket.rpc:rsocket-rpc-protobuf:$rsocketRpcVersion"
         }
     }
     generateProtoTasks {

proteus-vizceral-idl/build.gradle

@@ -4,12 +4,12 @@ plugins {
 }
 
 dependencies {
-    protobuf 'com.google.protobuf:protobuf-java:3.6.0'
+    protobuf "com.google.protobuf:protobuf-java:$protobufVersion"
 }
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.6.0'
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
     }
     generateProtoTasks {
         all()*.enabled = false

settings.gradle

@@ -10,4 +10,3 @@ include 'proteus-metrics-prometheus'
 include 'proteus-tracing-openzipkin'
 include 'proteus-tracing-idl'
 include 'proteus-vizceral-idl'
-include 'proteus-vizceral'