Merge 1.0.x into master

Oleh Dokuka · OlegDokuka · commit 7d9c28f98fc3 · 2021-06-09T11:49:20.000+03:00
Signed-off-by: Oleh Dokuka &lt;oleh.dokuka@icloud.com&gt;
Signed-off-by: Oleh Dokuka &lt;odokuka@vmware.com&gt;
Signed-off-by: Oleh Dokuka &lt;oleh.dokuka@icloud.com&gt;
diff --git a/README.md b/README.md
@@ -29,8 +29,8 @@ repositories {
     maven { url 'https://repo.spring.io/milestone' }  // Reactor milestones (if needed)
 }
 dependencies {
-    implementation 'io.rsocket:rsocket-core:1.1.0'
-    implementation 'io.rsocket:rsocket-transport-netty:1.1.0'
+    implementation 'io.rsocket:rsocket-core:1.1.1'
+    implementation 'io.rsocket:rsocket-transport-netty:1.1.1'
 }
 ```
 
@@ -40,12 +40,12 @@ Example:
 
 ```groovy
 repositories {
-    maven { url 'https://oss.jfrog.org/oss-snapshot-local' }
+    maven { url 'https://maven.pkg.github.com/rsocket/rsocket-java' }
     maven { url 'https://repo.spring.io/snapshot' }  // Reactor snapshots (if needed)
 }
 dependencies {
-    implementation 'io.rsocket:rsocket-core:1.1.1-SNAPSHOT'
-    implementation 'io.rsocket:rsocket-transport-netty:1.1.1-SNAPSHOT'
+    implementation 'io.rsocket:rsocket-core:1.1.2-SNAPSHOT'
+    implementation 'io.rsocket:rsocket-transport-netty:1.1.2-SNAPSHOT'
 }
 ```
 
diff --git a/gradle.properties b/gradle.properties
@@ -11,5 +11,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-version=1.1.1
-perfBaselineVersion=1.1.0
+version=1.1.2
+perfBaselineVersion=1.1.1

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ repositories {`
`29`	`29`	`maven { url 'https://repo.spring.io/milestone' } // Reactor milestones (if needed)`
`30`	`30`	`}`
`31`	`31`	`dependencies {`
`32`		`- implementation 'io.rsocket:rsocket-core:1.1.0'`
`33`		`- implementation 'io.rsocket:rsocket-transport-netty:1.1.0'`
	`32`	`+ implementation 'io.rsocket:rsocket-core:1.1.1'`
	`33`	`+ implementation 'io.rsocket:rsocket-transport-netty:1.1.1'`
`34`	`34`	`}`
`35`	`35`	```
`36`	`36`
`@@ -40,12 +40,12 @@ Example:`
`40`	`40`
`41`	`41`	```groovy
`42`	`42`	`repositories {`
`43`		`- maven { url 'https://oss.jfrog.org/oss-snapshot-local' }`
	`43`	`+ maven { url 'https://maven.pkg.github.com/rsocket/rsocket-java' }`
`44`	`44`	`maven { url 'https://repo.spring.io/snapshot' } // Reactor snapshots (if needed)`
`45`	`45`	`}`
`46`	`46`	`dependencies {`
`47`		`- implementation 'io.rsocket:rsocket-core:1.1.1-SNAPSHOT'`
`48`		`- implementation 'io.rsocket:rsocket-transport-netty:1.1.1-SNAPSHOT'`
	`47`	`+ implementation 'io.rsocket:rsocket-core:1.1.2-SNAPSHOT'`
	`48`	`+ implementation 'io.rsocket:rsocket-transport-netty:1.1.2-SNAPSHOT'`
`49`	`49`	`}`
`50`	`50`	```
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@`
`11`	`11`	`# See the License for the specific language governing permissions and`
`12`	`12`	`# limitations under the License.`
`13`	`13`	`#`
`14`		`-version=1.1.1`
`15`		`-perfBaselineVersion=1.1.0`
	`14`	`+version=1.1.2`
	`15`	`+perfBaselineVersion=1.1.1`