Merge branch 'release/1.5.0'

jauntsdn · Aug 5, 2023 · 6344d5e · 6344d5e
2 parents f79c364 + febeb7f
commit 6344d5e
Show file tree

Hide file tree

Showing 34 changed files with 693 additions and 75 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ Project supports 3 kinds of APIs:
 **GRPC compatible**. All implementations are directly compatible with GRPC via MessageStreams-RPC & GRPC transport.
 GRPC clients can access such services without separate "gateway" binaries and IDL sharing schemes.
 
-**Non-intrusive**. [MessageStreams](https://github.com/jauntsdn/rsocket-jvm/blob/1.3.2/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/MessageStreams.java) API & [RSocket-JVM](https://github.com/jauntsdn/rsocket-jvm/blob/1.3.2/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/RSocket.java) runtime are clearly split so from end-user perspective there is 
+**Non-intrusive**. [MessageStreams](https://github.com/jauntsdn/rsocket-jvm/blob/1.4.0/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/MessageStreams.java) API & [RSocket-JVM](https://github.com/jauntsdn/rsocket-jvm/blob/1.4.0/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/RSocket.java) runtime are clearly split so from end-user perspective there is 
 only set of streaming & non-streaming interactions on buffers/messages:
 
 ```groovy
@@ -116,10 +116,10 @@ repositories {
 }
 
 dependencies {
-    implementation "com.jauntsdn.rsocket:rsocket-messages:1.3.2"
-    implementation "com.jauntsdn.rsocket:rsocket-rpc-idl:1.3.2"
-    implementation "com.jauntsdn.rsocket:rsocket-<VENDOR>:1.3.2"
-    implementation "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>:1.3.2"
+    implementation "com.jauntsdn.rsocket:rsocket-messages:1.4.0"
+    implementation "com.jauntsdn.rsocket:rsocket-rpc-idl:1.4.0"
+    implementation "com.jauntsdn.rsocket:rsocket-<VENDOR>:1.4.0"
+    implementation "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>:1.4.0"
 }
 ```
 
@@ -128,7 +128,7 @@ MessageStreams-RPC compiler binaries are linux, windows(x86) only
 protobuf {
      plugins {
           rsocketRpc {
-              artifact = "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>-compiler:1.3.2"
+              artifact = "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>-compiler:1.4.0"
           }
      }
 }

diff --git a/build.gradle b/build.gradle
@@ -32,9 +32,10 @@ subprojects {
         mavenCentral()
     }
 
+    def name = project.name
     def javaVersion =
-            project.name.endsWith("virtualthreads") ? 20
-                    : project.name.endsWith("helidon") ? 11
+            name.endsWith("virtualthreads") ? 20
+                    : name.endsWith("helidon") || name.endsWith("mutiny") ? 11
                     : 8
 
     plugins.withType(JavaLibraryPlugin) {

diff --git a/gradle.properties b/gradle.properties
@@ -1,25 +1,25 @@
 group=com.jauntsdn.rsocket
-version=1.4.0
+version=1.5.0
 
 dependencyManagementPluginVersion=1.1.0
 protobufPluginVersion=0.9.2
 googleJavaFormatPluginVersion=0.9
 gitPluginVersion=0.13.0
 versionsPluginVersion=0.45.0
 
-nettyBomVersion=4.1.92.Final
-grpcStubVersion=1.54.1
-reactorBomVersion=Dysprosium-SR22
+nettyBomVersion=4.1.96.Final
+grpcStubVersion=1.57.1
+reactorBomVersion=2022.0.9
 rxjavaVersion=3.1.6
 helidonCommonReactiveVersion=2.5.6
-mutinyVersion=1.8.0
+mutinyVersion=2.3.1
 jsr305Version=3.0.2
 javaxInjectVersion=1
 javaxAnnotationVersion=1.3.2
 jakartaInjectVersion=2.0.1
 jakartaAnnotationVersion=2.1.1
 
-protobufVersion=3.22.3
+protobufVersion=3.23.4
 
 release=false
 virtualthreads=false

diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
@@ -38,9 +38,9 @@ subprojects {
                             }
                         }
                         scm {
-                            connection = "scm:git:https://github.com/jauntsdn/rsocket.git"
-                            developerConnection = "scm:git:https://github.com/jauntsdn/rsocket.git"
-                            url = "https://github.com/jauntsdn/rsocket"
+                            connection = "scm:git:https://github.com/jauntsdn/rsocket-jvm.git"
+                            developerConnection = "scm:git:https://github.com/jauntsdn/rsocket-jvm.git"
+                            url = "https://github.com/jauntsdn/rsocket-jvm"
                         }
                         versionMapping {
                             usage("java-api") {

diff --git a/rsocket-bom/gradle.lockfile b/rsocket-bom/gradle.lockfile
@@ -1,6 +1,6 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-io.netty:netty-bom:4.1.92.Final=classpath
-io.projectreactor:reactor-bom:Dysprosium-SR22=classpath
+io.netty:netty-bom:4.1.96.Final=classpath
+io.projectreactor:reactor-bom:2022.0.9=classpath
 empty=
diff --git a/rsocket-futures/gradle.lockfile b/rsocket-futures/gradle.lockfile
@@ -7,7 +7,7 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
 com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
 com.google.guava:guava:22.0=googleJavaFormat1.6
 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
-io.netty:netty-buffer:4.1.92.Final=compileClasspath,runtimeClasspath
-io.netty:netty-common:4.1.92.Final=compileClasspath,runtimeClasspath
+io.netty:netty-buffer:4.1.96.Final=compileClasspath,runtimeClasspath
+io.netty:netty-common:4.1.96.Final=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
 empty=annotationProcessor
diff --git a/rsocket-grpc/gradle.lockfile b/rsocket-grpc/gradle.lockfile
@@ -7,8 +7,8 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
 com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
 com.google.guava:guava:22.0=googleJavaFormat1.6
 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
-io.grpc:grpc-stub:1.54.1=compileClasspath,runtimeClasspath
-io.netty:netty-buffer:4.1.92.Final=compileClasspath,runtimeClasspath
-io.netty:netty-common:4.1.92.Final=compileClasspath,runtimeClasspath
+io.grpc:grpc-stub:1.57.1=compileClasspath,runtimeClasspath
+io.netty:netty-buffer:4.1.96.Final=compileClasspath,runtimeClasspath
+io.netty:netty-common:4.1.96.Final=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
 empty=annotationProcessor
diff --git a/rsocket-helidon/gradle.lockfile b/rsocket-helidon/gradle.lockfile
@@ -11,8 +11,8 @@ io.helidon.common:helidon-common-mapper:2.5.6=compileClasspath,runtimeClasspath
 io.helidon.common:helidon-common-reactive:2.5.6=compileClasspath,runtimeClasspath
 io.helidon.common:helidon-common-service-loader:2.5.6=compileClasspath,runtimeClasspath
 io.helidon.common:helidon-common:2.5.6=compileClasspath,runtimeClasspath
-io.netty:netty-buffer:4.1.92.Final=compileClasspath,runtimeClasspath
-io.netty:netty-common:4.1.92.Final=compileClasspath,runtimeClasspath
+io.netty:netty-buffer:4.1.96.Final=compileClasspath,runtimeClasspath
+io.netty:netty-common:4.1.96.Final=compileClasspath,runtimeClasspath
 jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
 empty=annotationProcessor
diff --git a/rsocket-messages/gradle.lockfile b/rsocket-messages/gradle.lockfile
@@ -7,7 +7,7 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
 com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
 com.google.guava:guava:22.0=googleJavaFormat1.6
 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
-io.netty:netty-buffer:4.1.92.Final=compileClasspath,runtimeClasspath
-io.netty:netty-common:4.1.92.Final=compileClasspath,runtimeClasspath
+io.netty:netty-buffer:4.1.96.Final=compileClasspath,runtimeClasspath
+io.netty:netty-common:4.1.96.Final=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
 empty=annotationProcessor