Skip to content
This repository was archived by the owner on May 4, 2019. It is now read-only.

Commit c420915

Browse files
flyinprogrammerrobertroeser
authored andcommitted
ci: use common-deps 1.6.1-SNAPSHOT; add the lib-snapshot-local repo (#68)
* ci: use common-deps 1.6.1-SNAPSHOT; add the lib-snapshot-local repo * ci: write-locks * fix compile errors
1 parent 479ea17 commit c420915

File tree

12 files changed

+33
-20
lines changed

12 files changed

+33
-20
lines changed

build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,13 @@ subprojects {
6565
password = project.findProperty('netifiArtifactoryPassword') ?: System.getenv('NETIFI_ARTIFACTORY_PASSWORD')
6666
}
6767
}
68+
maven {
69+
url = 'https://artifactory.netifiinc.com/artifactory/libs-snapshot-local'
70+
credentials {
71+
username = project.findProperty('netifiArtifactoryUsername') ?: System.getenv('NETIFI_ARTIFACTORY_USERNAME')
72+
password = project.findProperty('netifiArtifactoryPassword') ?: System.getenv('NETIFI_ARTIFACTORY_PASSWORD')
73+
}
74+
}
6875
maven {
6976
url "https://dl.bintray.com/netifi/netifi-oss"
7077
}

dependency-management.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'io.spring.dependency-management'
22

33
ext['slf4j.version'] = '1.7.25'
4-
ext['proteus-common-dependencies.version'] = '1.6.0'
4+
ext['proteus-common-dependencies.version'] = '1.6.1-SNAPSHOT'
55

66
dependencyManagement {
77
imports {

proteus-auth/gradle/dependency-locks/testCompileClasspath.lockfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ io.netty:netty-transport:4.1.33.Final
1717
io.projectreactor.netty:reactor-netty:0.8.5.RELEASE
1818
io.projectreactor:reactor-core:3.2.6.RELEASE
1919
io.projectreactor:reactor-test:3.2.6.RELEASE
20-
io.rsocket:rsocket-core:0.11.17.2
21-
io.rsocket:rsocket-transport-local:0.11.17.2
22-
io.rsocket:rsocket-transport-netty:0.11.17.2
20+
io.rsocket:rsocket-core:0.12.2-RC1
21+
io.rsocket:rsocket-transport-local:0.12.2-RC1
22+
io.rsocket:rsocket-transport-netty:0.12.2-RC1
2323
javax.inject:javax.inject:1
2424
junit:junit:4.12
2525
net.bytebuddy:byte-buddy-agent:1.9.7

proteus-auth/gradle/dependency-locks/testRuntimeClasspath.lockfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ io.netty:netty-transport:4.1.33.Final
1717
io.projectreactor.netty:reactor-netty:0.8.5.RELEASE
1818
io.projectreactor:reactor-core:3.2.6.RELEASE
1919
io.projectreactor:reactor-test:3.2.6.RELEASE
20-
io.rsocket:rsocket-core:0.11.17.2
21-
io.rsocket:rsocket-transport-local:0.11.17.2
22-
io.rsocket:rsocket-transport-netty:0.11.17.2
20+
io.rsocket:rsocket-core:0.12.2-RC1
21+
io.rsocket:rsocket-transport-local:0.12.2-RC1
22+
io.rsocket:rsocket-transport-netty:0.12.2-RC1
2323
javax.inject:javax.inject:1
2424
junit:junit:4.12
2525
net.bytebuddy:byte-buddy-agent:1.9.7

proteus-client/gradle/dependency-locks/compile.lockfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ io.netty:netty-transport:4.1.33.Final
2020
io.opentracing:opentracing-api:0.31.0
2121
io.projectreactor.netty:reactor-netty:0.8.5.RELEASE
2222
io.projectreactor:reactor-core:3.2.6.RELEASE
23-
io.rsocket.rpc:rsocket-rpc-core:0.2.13.3
24-
io.rsocket:rsocket-core:0.11.17.2
25-
io.rsocket:rsocket-transport-netty:0.11.17.2
23+
io.rsocket.rpc:rsocket-rpc-core:0.2.17
24+
io.rsocket:rsocket-core:0.12.2-RC1
25+
io.rsocket:rsocket-transport-netty:0.12.2-RC1
2626
javax.annotation:javax.annotation-api:1.3.2
2727
javax.inject:javax.inject:1
2828
org.hdrhistogram:HdrHistogram:2.1.10

proteus-client/gradle/dependency-locks/compileClasspath.lockfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ io.netty:netty-transport:4.1.33.Final
2020
io.opentracing:opentracing-api:0.31.0
2121
io.projectreactor.netty:reactor-netty:0.8.5.RELEASE
2222
io.projectreactor:reactor-core:3.2.6.RELEASE
23-
io.rsocket.rpc:rsocket-rpc-core:0.2.13.3
24-
io.rsocket:rsocket-core:0.11.17.2
25-
io.rsocket:rsocket-transport-netty:0.11.17.2
23+
io.rsocket.rpc:rsocket-rpc-core:0.2.17
24+
io.rsocket:rsocket-core:0.12.2-RC1
25+
io.rsocket:rsocket-transport-netty:0.12.2-RC1
2626
javax.annotation:javax.annotation-api:1.3.2
2727
javax.inject:javax.inject:1
2828
org.hdrhistogram:HdrHistogram:2.1.10
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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.rsocket.rpc:rsocket-rpc-protobuf:0.2.13.3
4+
io.rsocket.rpc:rsocket-rpc-protobuf:0.2.17

proteus-client/src/main/java/io/netifi/proteus/rsocket/NamedRSocketServiceWrapper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ public String getService() {
6464
return name;
6565
}
6666

67+
@Override
68+
public Flux<Payload> requestChannel(Payload payload, Flux<Payload> publisher) {
69+
return requestChannel(payload, (Publisher<Payload>) publisher);
70+
}
71+
6772
@Override
6873
public final Flux<Payload> requestChannel(Payload payload, Publisher<Payload> publisher) {
6974
if (source instanceof ResponderRSocket) {

proteus-client/src/main/java/io/netifi/proteus/rsocket/WeightedReconnectingRSocket.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.netty.buffer.ByteBufUtil;
2424
import io.rsocket.*;
2525
import io.rsocket.RSocketFactory.ClientRSocketFactory;
26+
import io.rsocket.frame.decoder.PayloadDecoder;
2627
import io.rsocket.rpc.exception.TimeoutException;
2728
import io.rsocket.util.Clock;
2829
import java.nio.channels.ClosedChannelException;
@@ -193,7 +194,7 @@ synchronized void resetStatistics() {
193194
}
194195

195196
private ClientRSocketFactory getClientFactory() {
196-
ClientRSocketFactory connect = RSocketFactory.connect().frameDecoder(Frame::retain);
197+
ClientRSocketFactory connect = RSocketFactory.connect().frameDecoder(PayloadDecoder.ZERO_COPY);
197198

198199
if (keepalive) {
199200
connect =

proteus-client/src/main/java/io/netifi/proteus/rsocket/transport/WeightedClientTransportSupplier.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ public ClientTransport get() {
6666

6767
int i = selectCount.get();
6868

69-
return () ->
69+
return (int mtu) ->
7070
clientTransportFunction
7171
.apply(socketAddress)
72-
.connect()
72+
.connect(mtu)
7373
.doOnNext(
7474
duplexConnection -> {
7575
logger.debug("opened connection to {} - active connections {}", socketAddress, i);

0 commit comments

Comments
 (0)