Skip to content

Commit 88188f4

Browse files
mostroverkhovmostroverkhov
committed
Merge branch 'release/1.5.4'
2 parents c617b79 + db9f849 commit 88188f4

File tree

35 files changed

+455
-76
lines changed

35 files changed

+455
-76
lines changed

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Project supports 3 kinds of APIs:
4646
**GRPC compatible**. All implementations are directly compatible with GRPC via MessageStreams-RPC & GRPC transport.
4747
GRPC clients can access such services without separate "gateway" binaries and IDL sharing schemes.
4848

49-
**Non-intrusive**. [MessageStreams](https://github.com/jauntsdn/rsocket-jvm/blob/1.5.2/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/MessageStreams.java) API & [RSocket-JVM](https://github.com/jauntsdn/rsocket-jvm/blob/1.5.2/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/RSocket.java) runtime are clearly split so from end-user perspective there is
49+
**Non-intrusive**. [MessageStreams](https://github.com/jauntsdn/rsocket-jvm/blob/1.5.3/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/MessageStreams.java) API & [RSocket-JVM](https://github.com/jauntsdn/rsocket-jvm/blob/1.5.3/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/RSocket.java) runtime are clearly split so from end-user perspective there is
5050
only set of streaming & non-streaming interactions on buffers/messages:
5151

5252
**traditional streaming**
@@ -125,10 +125,10 @@ repositories {
125125
}
126126
127127
dependencies {
128-
implementation "com.jauntsdn.rsocket:rsocket-messages:1.5.2"
129-
implementation "com.jauntsdn.rsocket:rsocket-rpc-idl:1.5.2"
130-
implementation "com.jauntsdn.rsocket:rsocket-<VENDOR>:1.5.2"
131-
implementation "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>:1.5.2"
128+
implementation "com.jauntsdn.rsocket:rsocket-messages:1.5.3"
129+
implementation "com.jauntsdn.rsocket:rsocket-rpc-idl:1.5.3"
130+
implementation "com.jauntsdn.rsocket:rsocket-<VENDOR>:1.5.3"
131+
implementation "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>:1.5.3"
132132
}
133133
```
134134

@@ -137,7 +137,7 @@ MessageStreams-RPC compiler binaries are linux, windows(x86) only
137137
protobuf {
138138
plugins {
139139
rsocketRpc {
140-
artifact = "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>-compiler:1.5.2"
140+
artifact = "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>-compiler:1.5.3"
141141
}
142142
}
143143
}

‎gradle.properties

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
group=com.jauntsdn.rsocket
2-
version=1.5.3
2+
version=1.5.4
33

44
dependencyManagementPluginVersion=1.1.0
55
protobufPluginVersion=0.8.19
66
googleJavaFormatPluginVersion=0.9
77
gitPluginVersion=0.13.0
88
versionsPluginVersion=0.45.0
99

10-
nettyBomVersion=4.1.106.Final
11-
grpcStubVersion=1.61.0
12-
reactorBomVersion=2023.0.2
10+
nettyBomVersion=4.1.107.Final
11+
grpcStubVersion=1.62.2
12+
reactorBomVersion=2023.0.3
1313
rxjavaVersion=3.1.8
1414
helidonCommonReactiveVersion=2.5.6
15-
mutinyVersion=2.5.6
15+
mutinyVersion=2.5.8
1616
jsr305Version=3.0.2
1717
javaxInjectVersion=1
1818
javaxAnnotationVersion=1.3.2
1919
jakartaInjectVersion=2.0.1
2020
jakartaAnnotationVersion=2.1.1
21-
protobufVersion=3.25.2
21+
protobufVersion=3.25.3
2222

23-
junitVersion=5.10.1
24-
assertjVersion=3.25.2
23+
junitVersion=5.10.2
24+
assertjVersion=3.25.3
2525

2626
release=false
2727
virtualthreads=true

‎rsocket-bom/gradle.lockfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
io.netty:netty-bom:4.1.106.Final=classpath
5-
io.projectreactor:reactor-bom:2023.0.2=classpath
4+
io.netty:netty-bom:4.1.107.Final=classpath
5+
io.projectreactor:reactor-bom:2023.0.3=classpath
66
empty=

‎rsocket-futures/gradle.lockfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
77
com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
88
com.google.guava:guava:22.0=googleJavaFormat1.6
99
com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
10-
io.netty:netty-buffer:4.1.106.Final=compileClasspath,runtimeClasspath
11-
io.netty:netty-common:4.1.106.Final=compileClasspath,runtimeClasspath
10+
io.netty:netty-buffer:4.1.107.Final=compileClasspath,runtimeClasspath
11+
io.netty:netty-common:4.1.107.Final=compileClasspath,runtimeClasspath
1212
org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
1313
empty=annotationProcessor

‎rsocket-grpc/gradle.lockfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
77
com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
88
com.google.guava:guava:22.0=googleJavaFormat1.6
99
com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
10-
io.grpc:grpc-stub:1.61.0=compileClasspath,runtimeClasspath
11-
io.netty:netty-buffer:4.1.106.Final=compileClasspath,runtimeClasspath
12-
io.netty:netty-common:4.1.106.Final=compileClasspath,runtimeClasspath
10+
io.grpc:grpc-stub:1.62.2=compileClasspath,runtimeClasspath
11+
io.netty:netty-buffer:4.1.107.Final=compileClasspath,runtimeClasspath
12+
io.netty:netty-common:4.1.107.Final=compileClasspath,runtimeClasspath
1313
org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
1414
empty=annotationProcessor

‎rsocket-helidon/gradle.lockfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ io.helidon.common:helidon-common-mapper:2.5.6=compileClasspath,runtimeClasspath
1111
io.helidon.common:helidon-common-reactive:2.5.6=compileClasspath,runtimeClasspath
1212
io.helidon.common:helidon-common-service-loader:2.5.6=compileClasspath,runtimeClasspath
1313
io.helidon.common:helidon-common:2.5.6=compileClasspath,runtimeClasspath
14-
io.netty:netty-buffer:4.1.106.Final=compileClasspath,runtimeClasspath
15-
io.netty:netty-common:4.1.106.Final=compileClasspath,runtimeClasspath
14+
io.netty:netty-buffer:4.1.107.Final=compileClasspath,runtimeClasspath
15+
io.netty:netty-common:4.1.107.Final=compileClasspath,runtimeClasspath
1616
jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath
1717
org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
1818
empty=annotationProcessor

‎rsocket-helidon/src/main/java/com/jauntsdn/rsocket/AbstractRSocket.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import io.helidon.common.reactive.Single;
2121
import java.util.concurrent.Flow;
2222

23+
/** Deprecated for removal since helidon-common-reactive project seems inactive/abandoned. */
24+
@Deprecated
2325
public abstract class AbstractRSocket implements RSocketHandler {
2426

2527
@Override

‎rsocket-helidon/src/main/java/com/jauntsdn/rsocket/ClientAcceptor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import java.util.function.Function;
2020

21+
/** Deprecated for removal since helidon-common-reactive project seems inactive/abandoned. */
22+
@Deprecated
2123
public interface ClientAcceptor {
2224

2325
RSocket accept(SetupMessage setup, RSocket requesterRSocket);

‎rsocket-helidon/src/main/java/com/jauntsdn/rsocket/ClientStreamsAcceptor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package com.jauntsdn.rsocket;
1818

19+
/** Deprecated for removal since helidon-common-reactive project seems inactive/abandoned. */
20+
@Deprecated
1921
public interface ClientStreamsAcceptor {
2022

2123
MessageStreams accept(SetupMessage setup, MessageStreams requester);

‎rsocket-helidon/src/main/java/com/jauntsdn/rsocket/Closeable.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import io.helidon.common.reactive.Single;
2020

21+
/** Deprecated for removal since helidon-common-reactive project seems inactive/abandoned. */
22+
@Deprecated
2123
public interface Closeable extends GracefulCloseable {
2224

2325
Single<Void> onClose();

0 commit comments

Comments
 (0)