Merge branch 'release/1.5.3'

Author: mostroverkhov

build.gradle

@@ -2,12 +2,14 @@ subprojects {
     apply plugin: 'idea'
 
     group 'io.netifi.proteus.quickstart'
-    version '1.5.2'
+    version '1.5.3'
 
     // Proteus Versions
     ext {
-        proteusVersion = '1.5.2'
-        rsocketRpcVersion = '0.2.10'
+        protobufVersion = '3.6.1'
+        proteusVersion = '1.5.3'
+        rsocketRpcVersion = '0.2.12'
+        log4jVersion = '2.9.1'
     }
 
     repositories {

client/build.gradle

@@ -9,11 +9,11 @@ dependencies {
     compile project(':service-idl')
 
     compile "io.netifi.proteus:proteus-client:$proteusVersion"
-    compile 'com.google.protobuf:protobuf-java:3.6.0'
+    compile "com.google.protobuf:protobuf-java:$protobufVersion"
 
-    compile 'org.apache.logging.log4j:log4j-api:2.9.0'
-    compile 'org.apache.logging.log4j:log4j-core:2.9.0'
-    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.0'
+    compile "org.apache.logging.log4j:log4j-api:$log4jVersion"
+    compile "org.apache.logging.log4j:log4j-core:$log4jVersion"
+    compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
 }
 
 mainClassName = 'io.netifi.proteus.quickstart.client.Main'

client/pom.xml

@@ -6,19 +6,19 @@
     <parent>
         <groupId>io.netifi.proteus.quickstart</groupId>
         <artifactId>proteus-quickstart</artifactId>
-        <version>1.5.0</version>
+        <version>1.5.3</version>
     </parent>
 
     <artifactId>client</artifactId>
     <name>client</name>
-    <version>1.5.0</version>
+    <version>1.5.3</version>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>io.netifi.proteus.quickstart</groupId>
             <artifactId>service-idl</artifactId>
-            <version>1.5.0</version>
+            <version>1.5.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.netifi.proteus.quickstart</groupId>
     <artifactId>proteus-quickstart</artifactId>
-    <version>1.5.0</version>
+    <version>1.5.3</version>
     <packaging>pom</packaging>
     <name>multi</name>
 
@@ -16,10 +16,10 @@
     <properties>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
-        <proteusVersion>1.5.0</proteusVersion>
-        <rsocketRpcVersion>0.2.4</rsocketRpcVersion>
-        <protobufVersion>3.6.0</protobufVersion>
-        <log4j2Version>2.9.0</log4j2Version>
+        <proteusVersion>1.5.3</proteusVersion>
+        <rsocketRpcVersion>0.2.12</rsocketRpcVersion>
+        <protobufVersion>3.6.1</protobufVersion>
+        <log4j2Version>2.9.1</log4j2Version>
     </properties>
 
     <repositories>

service-idl/build.gradle

@@ -1,13 +1,13 @@
 plugins {
-    id 'com.google.protobuf' version '0.8.6'
+    id 'com.google.protobuf' version '0.8.7'
     id 'java'
 }
 
 sourceCompatibility = 1.8
 
 dependencies {
     compile "io.rsocket.rpc:rsocket-rpc-core:$rsocketRpcVersion"
-    compile 'com.google.protobuf:protobuf-java:3.6.0'
+    compile "com.google.protobuf:protobuf-java:$protobufVersion"
 }
 
 sourceSets {
@@ -24,7 +24,7 @@ protobuf {
     generatedFilesBaseDir = "${projectDir}/src/generated"
 
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.6.0'
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
     }
 
     plugins {

service-idl/pom.xml

@@ -7,12 +7,12 @@
     <parent>
         <groupId>io.netifi.proteus.quickstart</groupId>
         <artifactId>proteus-quickstart</artifactId>
-        <version>1.5.0</version>
+        <version>1.5.3</version>
     </parent>
 
     <artifactId>service-idl</artifactId>
     <name>service-idl</name>
-    <version>1.5.0</version>
+    <version>1.5.3</version>
     <packaging>jar</packaging>
 
     <dependencies>

service-idl/src/generated/main/rsocketRpc/io/netifi/proteus/quickstart/service/protobuf/BlockingHelloService.java

@@ -9,11 +9,11 @@ dependencies {
     compile project(':service-idl')
 
     compile "io.netifi.proteus:proteus-client:$proteusVersion"
-    compile 'com.google.protobuf:protobuf-java:3.6.0'
+    compile "com.google.protobuf:protobuf-java:$protobufVersion"
 
-    compile 'org.apache.logging.log4j:log4j-api:2.9.0'
-    compile 'org.apache.logging.log4j:log4j-core:2.9.0'
-    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.0'
+    compile "org.apache.logging.log4j:log4j-api:$log4jVersion"
+    compile "org.apache.logging.log4j:log4j-core:$log4jVersion"
+    compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
 }
 
 mainClassName = 'io.netifi.proteus.quickstart.service.Main'