Merge branch 'release/0.9.4'

Author: rdegnan

.travis.yml

@@ -1,16 +1,7 @@
+language: java
 sudo: required
-matrix:
-  include:
-  - os: linux
-    jdk: oraclejdk8
-    language: generic
-    script: gradle/buildViaTravis-linux.sh
-  - os: osx
-    osx_image: xcode9.4
-    language: generic
-    env:
-    - HOMEBREW_TEMP="/tmp"
-    script: gradle/buildViaTravis.sh
+jdk: oraclejdk8
+script: gradle/buildViaTravis.sh
 before_cache:
 - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 notifications:

gradle.properties

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

gradle/buildViaTravis-linux.sh

@@ -35,7 +35,7 @@ task ciVersion {
 build.dependsOn ciVersion
 
 ext {
-    rsocketRpcVersion = '0.2.1'
+    rsocketRpcVersion = '0.2.2'
     protobufVersion = '3.6.1'
 }
 
@@ -94,8 +94,8 @@ dependencies {
     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.7'
+    testCompile 'io.rsocket:rsocket-transport-local:0.11.7'
     testCompile 'org.mockito:mockito-all:1.10.19'
 }
 

gradle/java.gradle

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