Merge branch 'release/0.12.1'

Author: robertroeser

README.md

@@ -82,7 +82,7 @@ public class ExampleClient {
 
 ## Zero Copy
 By default to make RSocket easier to use it copies the incoming Payload. Copying the payload comes at cost to performance
-and latency. If you want to use zero copy you must disable this. To disable copying you must include a `frameDecoder`
+and latency. If you want to use zero copy you must disable this. To disable copying you must include a `payloadDecoder`
 argument in your `RSocketFactory`. This will let you manage the Payload without copying the data from the underlying
 transport. You must free the Payload when you are done with them
 or you will get a memory leak. Used correctly this will reduce latency and increase performance.
@@ -91,7 +91,7 @@ or you will get a memory leak. Used correctly this will reduce latency and incre
 ```java
 RSocketFactory.receive()
         // Enable Zero Copy
-        .frameDecoder(Frame::retain)
+        .payloadDecoder(Frame::retain)
         .acceptor(new PingHandler())
         .transport(TcpServerTransport.create(7878))
         .start()
@@ -105,7 +105,7 @@ RSocketFactory.receive()
 Mono<RSocket> client =
         RSocketFactory.connect()
             // Enable Zero Copy
-            .frameDecoder(Frame::retain)
+            .payloadDecoder(Frame::retain)
             .transport(TcpClientTransport.create(7878))
             .start();
 ```

build.gradle

@@ -17,7 +17,7 @@
 plugins {
     id 'com.gradle.build-scan' version '1.16'
 
-    id 'com.github.sherter.google-java-format' version '0.7.1'
+    id 'com.github.sherter.google-java-format' version '0.7.1' apply false
     id 'com.jfrog.artifactory' version '4.7.3' apply false
     id 'com.jfrog.bintray' version '1.8.4' apply false
     id 'me.champeau.gradle.jmh' version '0.4.7' apply false
@@ -27,8 +27,9 @@ plugins {
 
 subprojects {
     apply plugin: 'io.spring.dependency-management'
+    apply plugin: 'com.github.sherter.google-java-format'
 
-    ext['reactor-bom.version'] = 'Californium-SR3'
+    ext['reactor-bom.version'] = 'Californium-SR5'
     ext['logback.version'] = '1.2.3'
     ext['findbugs.version'] = '3.0.2'
     ext['netty.version'] = '4.1.31.Final'
@@ -42,6 +43,10 @@ subprojects {
     ext['micrometer.version'] = '1.0.6'
     ext['assertj.version'] = '3.11.1'
 
+    googleJavaFormat {
+        toolVersion = '1.6'
+    }
+    
     dependencyManagement {
         imports {
             mavenBom "io.projectreactor:reactor-bom:${ext['reactor-bom.version']}"
@@ -188,10 +193,6 @@ buildScan {
 
 description = 'RSocket: Stream Oriented Messaging Passing with Reactive Stream Semantics.'
 
-googleJavaFormat {
-    toolVersion = '1.5'
-}
-
 repositories {
     mavenCentral()
 }

gradle.properties

@@ -12,4 +12,4 @@
 # limitations under the License.
 #
 
-version=0.11.16-SNAPSHOT
+version=0.12.1-RC1