Merge #1.0.x into master

OlegDokuka · OlegDokuka · commit d271f0c8bd2c · 2020-06-17T10:47:09.000+03:00
Signed-off-by: Oleh Dokuka &lt;shadowgun@i.ua&gt;
diff --git a/README.md b/README.md
@@ -17,6 +17,8 @@ Learn more at http://rsocket.io
 
 [![Build Status](https://travis-ci.org/rsocket/rsocket-java.svg?branch=develop)](https://travis-ci.org/rsocket/rsocket-java)
 
+⚠️ The `master` branch is now dedicated to development of the `1.1.x` line.
+
 Releases are available via Maven Central.
 
 Example:
@@ -26,8 +28,8 @@ repositories {
 	mavenCentral()
 }
 dependencies {
-    implementation 'io.rsocket:rsocket-core:1.0.0'
-    implementation 'io.rsocket:rsocket-transport-netty:1.0.0'
+    implementation 'io.rsocket:rsocket-core:1.1.0-SNAPSHOT'
+    implementation 'io.rsocket:rsocket-transport-netty:1.1.0-SNAPSHOT'
 }
 ```
 
@@ -40,8 +42,8 @@ repositories {
 	maven { url 'https://oss.jfrog.org/oss-snapshot-local' }
 }
 dependencies {
-    implementation 'io.rsocket:rsocket-core:1.0.1-SNAPSHOT'
-    implementation 'io.rsocket:rsocket-transport-netty:1.0.1-SNAPSHOT'
+    implementation 'io.rsocket:rsocket-core:1.1.1-SNAPSHOT'
+    implementation 'io.rsocket:rsocket-transport-netty:1.1.1-SNAPSHOT'
 }
 ```
 
diff --git a/gradle.properties b/gradle.properties
@@ -12,4 +12,4 @@
 # limitations under the License.
 #
 version=1.1.0
-perfBaselineVersion=1.0.0
+perfBaselineVersion=1.0.1

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ Learn more at http://rsocket.io`
`17`	`17`
`18`	`18`	`[![Build Status](https://travis-ci.org/rsocket/rsocket-java.svg?branch=develop)](https://travis-ci.org/rsocket/rsocket-java)`
`19`	`19`
	`20`	+⚠️ The `master` branch is now dedicated to development of the `1.1.x` line.
	`21`	`+`
`20`	`22`	`Releases are available via Maven Central.`
`21`	`23`
`22`	`24`	`Example:`
`@@ -26,8 +28,8 @@ repositories {`
`26`	`28`	`mavenCentral()`
`27`	`29`	`}`
`28`	`30`	`dependencies {`
`29`		`- implementation 'io.rsocket:rsocket-core:1.0.0'`
`30`		`- implementation 'io.rsocket:rsocket-transport-netty:1.0.0'`
	`31`	`+ implementation 'io.rsocket:rsocket-core:1.1.0-SNAPSHOT'`
	`32`	`+ implementation 'io.rsocket:rsocket-transport-netty:1.1.0-SNAPSHOT'`
`31`	`33`	`}`
`32`	`34`	```
`33`	`35`
`@@ -40,8 +42,8 @@ repositories {`
`40`	`42`	`maven { url 'https://oss.jfrog.org/oss-snapshot-local' }`
`41`	`43`	`}`
`42`	`44`	`dependencies {`
`43`		`- implementation 'io.rsocket:rsocket-core:1.0.1-SNAPSHOT'`
`44`		`- implementation 'io.rsocket:rsocket-transport-netty:1.0.1-SNAPSHOT'`
	`45`	`+ implementation 'io.rsocket:rsocket-core:1.1.1-SNAPSHOT'`
	`46`	`+ implementation 'io.rsocket:rsocket-transport-netty:1.1.1-SNAPSHOT'`
`45`	`47`	`}`
`46`	`48`	```
`47`	`49`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@`
`12`	`12`	`# limitations under the License.`
`13`	`13`	`#`
`14`	`14`	`version=1.1.0`
`15`		`-perfBaselineVersion=1.0.0`
	`15`	`+perfBaselineVersion=1.0.1`