Merge remote-tracking branch 'origin/master'

Author: kbahr

.travis.yml

@@ -11,9 +11,3 @@ cache:
   - "$HOME/.gradle/caches/"
   - "$HOME/.gradle/wrapper/"
   - "$HOME/.m2"
-env:
-  global:
-  - secure: crwXv5Q/iCtIIC81QWgWYNfuGJxSQQjVn83vvRoRMXmfSZ02NnQfDos+p1GxxbIXLUQ8NsaLc8cg0o2PQgsK/l0d7nDExix5Rt+AwzU4UOrUcZh46MgEeZDow4q6ySToOHaeKsaRnbTIpAwU28o9fnZ9ViaQ7s2uZWQZXYigGf0PN1ca9E8MJ6VEMvp34e2wJok6woaWG9ALCL2b5viofTv0zdHXWfGV4rdz9Rq0fThmFn4BlmHdcTwGt2ZLdWcEbzv0qNYNAiVvNJd4uWHOnjRceslAZ/JZxgIzSHK0ctNiZdc9rRNo8BHGQqKvmZqmbzUAU07uS0+iLBnm89KKJyQCXKulDv7NM0ShiFexMQ17TUOdlJtH65ypzUIJ+sbSOj2M+NhThUD8OQlebvjKF6t8M9f1NIXkkH/Xw2XJ146ANBcGyjALVFDIqlKIyCtIoY3/teQWccfbAzBglC24QBizpfgmdBEGOJXs2qR0NxzcIRNc1o9XPyT9BJxa+9JnHyHbF+LG07j1LfaaJSQBIYL7xjDBwEEIOEmP3UrISwjvs1fOQA3oYINguXtl7qi3wNylv35e5xw5acijcTTYHRSY6A5rPdokbK0fCQHCrHldBYDc8Bvy+GnjnYQHynjdWGbTnkvMgvYe2aHD+mH5pO5V7DRYHhnJsuMuscRIELc=
-  - secure: ZMu9rhzTT1F6pyqqrd0TGhAeUGigAvGZT5rJv2ifZJEB8+FOQ+/ylJ/Q3Gq9Wx8quWVR/ocTWF8yEuA1BlZF1Z+tfOcCXOaYPrgMFNhgmETK9X1AQN1gahkTzLNWEZUzKwte5IwaDYDwMe54VcJpY9/f7R6ZyjKVEJOLCjnJ+YLR2rjttsug9ZurH3iLzdgRGMHyI55+dz83MkdumkkATFAeLnQepdL2n4ijD0NvuzvlvaU+Knz9AZCX2kSNDM+hn+K0fFDM4CBFduBi8gEYmRlnSXslHtfwuZRViZQaS4voRMAFmWPNCH67ya3f1voi41BWXgaGTW5He8XDjQtFcIphvykmMOsS4ka9u4K0LEbReoSBRwBUAhigGMFXB1lMup66+WvjvSvwS9rMVVGaXpVGjgpM5shWpiIEoWICWU+Pu5ihk9BWv61/tYNNw6u3QlXt1ZfjM50F7eoJ1ctfYqClrlD3iwrBJ47aIu4kH1HdCp9uxkxq+Cz75n2UdV6Py7eEW1N141fnZ/Iax8nzbNu4SxccsJn1yUv22LJCteW3//GqvRVa7hets587PFpfkyaraBLNBvh90/wouXK/yvYBZN4WK7VwnuCUmxTjTglT9mQGUgPOYNMDU/m7rDp2zDc+8aMEfQjWGktH93M0g1l9yhidc8AMQbyAaxkk73M=
-  - secure: hxmPq8HtqUN04I639LiDA6euoWW8ziWs70USv7nwRLSE0gV/oDrwFrDX5QJNP4rP04hD/UCll0jKZPHClVjXfW7s9U2wqrFlyJifFoefQms7HZIselUuRXAjkK7KVA8ur1kz+6Ox3Ji7gxUnkF9cGR+rGAHyllSmuD+UIw2vCUHcqAAlhYzN9NfenjqEBNTQ5QTR0p1I37fDLsxORxTjuUxQO0yaYv1sy0eUUbDSR0XN0VrN/sNFMkV6+m5+A+7/4LYqxmZxyRqSC4Qk726k8Eab0K/QCnxE3TO/QoAPk9QZ2BEtHbrycNhm9yxG9+CGNbZCpQaWH1BEeo5F9B6u1prbikqzd9cTSuLGqR1r4wBDuIDFB8RloOMvoB0Z5+CWeP8X9u7q13vFFDS26crMWbqCCoo9Vcel8Js1H8/awnYrxtYhBk4BRGDzgUfRzaru+GpjE3s1kppkjj01qUo3fN9P+Px/zISPD9OdMgVvdN0O3rGPYHniFS9lQJZaJSJUU8hlApqsTQfK+5j8vIKmPe0ur39XriVeC8Kam8SWMymjLrLaNGOe0XvST9MLKKel7Aj9mknNyZ0dQEr24BLlN/vGHQsHTrpnReLHP3szuF5FXZQsqYQ2uN4Q5000O6IJfbD9FcBJHzOCtyIlNkJ12qK6GiLChwqcpv9muQZcaH8=
-  - secure: fyh1tUQJBijuGd5jO6ZHl2yn8u5uKgz+9tKgrGNBg2NNlxXvq1TJqBj1/fkZonH3rxPAH4AnmxsR4ktWKhmTci16D3ATflpxVOSQYHdMqbsxpNt4e+um/lnFLp6WORLkcnFAsA0rUrH3eRJXPfZ6YgcY3L4tddiT0sqLZ1ECo5gA915CPN8ANioHzooWJgVBcbr34z2HcJudgKws4C+MoiTKv3C9Ijamg+30D/wgiyRJXPD/azb2KoVx+Bk5yIQuBOl3G/a/LMpK+kv/2jZQjUT/gnKLEvRu9H5xJIL41mFTRgmZxD9E0Rb0VeAaYICfo+4K2g2smXeA/Eb9lmwMQYiEKdG2IH2chjPggBM0hsB42pGc+mFDKaNCtQSVkbQkrg2CmDMwvBaL7IBFNUmlSbZfG1PeQluSNs9uECR0MFM/zyNECLGkcrf3kZXHMuQ+1jYPWf37CuiNbEnN8sQm65t9wqX3TqRB8rksGaThVvYizIon7zuuIrKINynGDEc3ygVUOeOBLT+U9AaF1jatkxuwiZ/VJaReYuJvH76wCUb6k91RQA9udK4n8h8aMomOmTyIWRSnEFObDs1RW6Lixh5PRShTKG8ffoY0vM5IO5i17dPFOmIRo99yqKiWPcfQLK8IP0SiCwc6w0pqAns6H/r8qBgk6BoXGnBT5kyzKr8=

gradle/java.gradle

@@ -35,15 +35,14 @@ task ciVersion {
 build.dependsOn ciVersion
 
 ext {
-    rsocketRpcVersion = '0.2.3'
+    rsocketRpcVersion = '0.2.4'
     protobufVersion = '3.6.1'
 }
 
 repositories {
     jcenter()
-    mavenLocal()
     maven {
-        url = 'https://dl.bintray.com/netifi/netifi-oss'
+        url = 'https://dl.bintray.com/rsocket-admin/RSocket'
     }
 }
 
@@ -88,14 +87,14 @@ dependencies {
     testCompile 'junit:junit:4.12'
 
     testCompile 'javax.inject:javax.inject:1'
-    testCompile 'io.projectreactor:reactor-test:3.2.0.RELEASE'
+    testCompile 'io.projectreactor:reactor-test:3.2.1.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.8'
-    testCompile 'io.rsocket:rsocket-transport-local:0.11.8'
+    testCompile 'io.rsocket:rsocket-transport-netty:0.11.9'
+    testCompile 'io.rsocket:rsocket-transport-local:0.11.9'
     testCompile 'org.mockito:mockito-all:1.10.19'
 }
 

proteus-frames/build.gradle

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