Merge branch 'hotfix/1.5.1'

Author: kbahr

artifactory.gradle

@@ -20,7 +20,7 @@ if (project.hasProperty('netifiArtifactoryUsername') && project.hasProperty('net
         plugins.withId('com.jfrog.artifactory') {
             artifactory {
                 publish {
-                    contextUrl = 'artifactory.netifiinc.com'
+                    contextUrl = 'https://artifactory.netifiinc.com/artifactory'
 
                     repository {
                         repoKey = version.contains('SNAPSHOT') ? 'libs-snapshot-local' : 'libs-release-local'

build.gradle

@@ -23,21 +23,19 @@ plugins {
 
 buildScan { licenseAgreementUrl = 'https://gradle.com/terms-of-service'; licenseAgree = 'yes' }
 
-apply from: "artifactory.gradle"
-apply from: "bintray.gradle"
-
 subprojects {
     apply plugin: 'io.spring.dependency-management'
     apply plugin: 'com.jfrog.bintray'
+    apply plugin: "com.jfrog.artifactory"
     apply plugin: 'java'
     apply plugin: 'idea'
     apply plugin: 'com.github.sherter.google-java-format'
     apply plugin: 'maven'
     apply plugin: 'maven-publish'
 
     ext['reactor-bom.version'] = 'Californium-SR1'
-    ext['rsocket.version'] = '0.11.9'
-    ext['rsocket-rpc.version'] = '0.2.4'
+    ext['rsocket.version'] = '0.11.12'
+    ext['rsocket-rpc.version'] = '0.2.6'
 
     ext['jackson.version'] = '2.9.7'
     ext['jackson-protobuf.version'] = '0.9.10-jackson2.9-proto3'
@@ -67,6 +65,8 @@ subprojects {
         jcenter()
         maven { url 'http://repo.spring.io/libs-snapshot' }
         maven { url 'https://oss.jfrog.org/oss-snapshot-local' }
+        maven { url 'https://oss.jfrog.org/oss-release-local' }
+
     }
 
     googleJavaFormat {
@@ -199,4 +199,7 @@ subprojects {
             }
         }
     }
-}
+}
+
+apply from: "artifactory.gradle"
+apply from: "bintray.gradle"

gradle.properties

@@ -1,2 +1,2 @@
 group=io.netifi.proteus
-version=1.5.0
+version=1.5.1

proteus-client/build.gradle

@@ -9,8 +9,10 @@ dependencies {
     compile project (':proteus-frames')
     compile 'com.typesafe:config'
     compile 'com.google.guava:guava'
+    compile 'io.rsocket:rsocket-core'
     compile 'io.rsocket.rpc:rsocket-rpc-core'
-    compile "io.netty:netty-tcnative:2.0.18.Final:linux-x86_64"
+    compile 'io.rsocket:rsocket-transport-netty'
+    compile 'io.netty:netty-tcnative:2.0.18.Final:linux-x86_64'
 
     testProtobuf 'io.rsocket.rpc:rsocket-rpc-protobuf-idl'
     testCompile project(':proteus-tracing-openzipkin')