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

Commit 522cdde

Browse files
kbahrkbahr
authored
Merge pull request #71 from netifi-proteus/rollback-to-prod-versions
rollback to 1.6.0 versions of rsocket
2 parents 8f5d4a3 + d9fbeb2 commit 522cdde

File tree

52 files changed

+571
-577
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+571
-577
lines changed

‎proteus-auth/gradle/dependency-locks/compileClasspath.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-buffer:4.1.33.Final
5-
io.netty:netty-common:4.1.33.Final
4+
io.netty:netty-buffer:4.1.31.Final
5+
io.netty:netty-common:4.1.31.Final
66
javax.inject:javax.inject:1

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.google.protobuf:protobuf-java:3.6.1
5-
io.netty:netty-buffer:4.1.33.Final
6-
io.netty:netty-codec-http2:4.1.33.Final
7-
io.netty:netty-codec-http:4.1.33.Final
8-
io.netty:netty-codec-socks:4.1.33.Final
9-
io.netty:netty-codec:4.1.33.Final
10-
io.netty:netty-common:4.1.33.Final
11-
io.netty:netty-handler-proxy:4.1.33.Final
12-
io.netty:netty-handler:4.1.33.Final
13-
io.netty:netty-resolver:4.1.33.Final
14-
io.netty:netty-transport-native-epoll:4.1.33.Final
15-
io.netty:netty-transport-native-unix-common:4.1.33.Final
16-
io.netty:netty-transport:4.1.33.Final
5+
io.netty:netty-buffer:4.1.31.Final
6+
io.netty:netty-codec-http2:4.1.31.Final
7+
io.netty:netty-codec-http:4.1.31.Final
8+
io.netty:netty-codec-socks:4.1.31.Final
9+
io.netty:netty-codec:4.1.31.Final
10+
io.netty:netty-common:4.1.31.Final
11+
io.netty:netty-handler-proxy:4.1.31.Final
12+
io.netty:netty-handler:4.1.31.Final
13+
io.netty:netty-resolver:4.1.31.Final
14+
io.netty:netty-transport-native-epoll:4.1.31.Final
15+
io.netty:netty-transport-native-unix-common:4.1.31.Final
16+
io.netty:netty-transport:4.1.31.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.12.2-RC1
21-
io.rsocket:rsocket-transport-local:0.12.2-RC1
22-
io.rsocket:rsocket-transport-netty:0.12.2-RC1
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
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: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.google.protobuf:protobuf-java:3.6.1
5-
io.netty:netty-buffer:4.1.33.Final
6-
io.netty:netty-codec-http2:4.1.33.Final
7-
io.netty:netty-codec-http:4.1.33.Final
8-
io.netty:netty-codec-socks:4.1.33.Final
9-
io.netty:netty-codec:4.1.33.Final
10-
io.netty:netty-common:4.1.33.Final
11-
io.netty:netty-handler-proxy:4.1.33.Final
12-
io.netty:netty-handler:4.1.33.Final
13-
io.netty:netty-resolver:4.1.33.Final
14-
io.netty:netty-transport-native-epoll:4.1.33.Final
15-
io.netty:netty-transport-native-unix-common:4.1.33.Final
16-
io.netty:netty-transport:4.1.33.Final
5+
io.netty:netty-buffer:4.1.31.Final
6+
io.netty:netty-codec-http2:4.1.31.Final
7+
io.netty:netty-codec-http:4.1.31.Final
8+
io.netty:netty-codec-socks:4.1.31.Final
9+
io.netty:netty-codec:4.1.31.Final
10+
io.netty:netty-common:4.1.31.Final
11+
io.netty:netty-handler-proxy:4.1.31.Final
12+
io.netty:netty-handler:4.1.31.Final
13+
io.netty:netty-resolver:4.1.31.Final
14+
io.netty:netty-transport-native-epoll:4.1.31.Final
15+
io.netty:netty-transport-native-unix-common:4.1.31.Final
16+
io.netty:netty-transport:4.1.31.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.12.2-RC1
21-
io.rsocket:rsocket-transport-local:0.12.2-RC1
22-
io.rsocket:rsocket-transport-netty:0.12.2-RC1
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
2323
javax.inject:javax.inject:1
2424
junit:junit:4.12
2525
net.bytebuddy:byte-buddy-agent:1.9.7

‎proteus-broker-info-idl/gradle/dependency-locks/testCompile.lockfile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.google.protobuf:protobuf-java:3.6.1
5-
io.netty:netty-buffer:4.1.33.Final
6-
io.netty:netty-codec-http2:4.1.33.Final
7-
io.netty:netty-codec-http:4.1.33.Final
8-
io.netty:netty-codec-socks:4.1.33.Final
9-
io.netty:netty-codec:4.1.33.Final
10-
io.netty:netty-common:4.1.33.Final
11-
io.netty:netty-handler-proxy:4.1.33.Final
12-
io.netty:netty-handler:4.1.33.Final
13-
io.netty:netty-resolver:4.1.33.Final
14-
io.netty:netty-transport-native-epoll:4.1.33.Final
15-
io.netty:netty-transport-native-unix-common:4.1.33.Final
16-
io.netty:netty-transport:4.1.33.Final
5+
io.netty:netty-buffer:4.1.31.Final
6+
io.netty:netty-codec-http2:4.1.31.Final
7+
io.netty:netty-codec-http:4.1.31.Final
8+
io.netty:netty-codec-socks:4.1.31.Final
9+
io.netty:netty-codec:4.1.31.Final
10+
io.netty:netty-common:4.1.31.Final
11+
io.netty:netty-handler-proxy:4.1.31.Final
12+
io.netty:netty-handler:4.1.31.Final
13+
io.netty:netty-resolver:4.1.31.Final
14+
io.netty:netty-transport-native-epoll:4.1.31.Final
15+
io.netty:netty-transport-native-unix-common:4.1.31.Final
16+
io.netty:netty-transport:4.1.31.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

‎proteus-broker-info-idl/gradle/dependency-locks/testCompileClasspath.lockfile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.google.protobuf:protobuf-java:3.6.1
5-
io.netty:netty-buffer:4.1.33.Final
6-
io.netty:netty-codec-http2:4.1.33.Final
7-
io.netty:netty-codec-http:4.1.33.Final
8-
io.netty:netty-codec-socks:4.1.33.Final
9-
io.netty:netty-codec:4.1.33.Final
10-
io.netty:netty-common:4.1.33.Final
11-
io.netty:netty-handler-proxy:4.1.33.Final
12-
io.netty:netty-handler:4.1.33.Final
13-
io.netty:netty-resolver:4.1.33.Final
14-
io.netty:netty-transport-native-epoll:4.1.33.Final
15-
io.netty:netty-transport-native-unix-common:4.1.33.Final
16-
io.netty:netty-transport:4.1.33.Final
5+
io.netty:netty-buffer:4.1.31.Final
6+
io.netty:netty-codec-http2:4.1.31.Final
7+
io.netty:netty-codec-http:4.1.31.Final
8+
io.netty:netty-codec-socks:4.1.31.Final
9+
io.netty:netty-codec:4.1.31.Final
10+
io.netty:netty-common:4.1.31.Final
11+
io.netty:netty-handler-proxy:4.1.31.Final
12+
io.netty:netty-handler:4.1.31.Final
13+
io.netty:netty-resolver:4.1.31.Final
14+
io.netty:netty-transport-native-epoll:4.1.31.Final
15+
io.netty:netty-transport-native-unix-common:4.1.31.Final
16+
io.netty:netty-transport:4.1.31.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

‎proteus-broker-mgmt-idl/gradle/dependency-locks/testCompile.lockfile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.google.protobuf:protobuf-java:3.6.1
5-
io.netty:netty-buffer:4.1.33.Final
6-
io.netty:netty-codec-http2:4.1.33.Final
7-
io.netty:netty-codec-http:4.1.33.Final
8-
io.netty:netty-codec-socks:4.1.33.Final
9-
io.netty:netty-codec:4.1.33.Final
10-
io.netty:netty-common:4.1.33.Final
11-
io.netty:netty-handler-proxy:4.1.33.Final
12-
io.netty:netty-handler:4.1.33.Final
13-
io.netty:netty-resolver:4.1.33.Final
14-
io.netty:netty-transport-native-epoll:4.1.33.Final
15-
io.netty:netty-transport-native-unix-common:4.1.33.Final
16-
io.netty:netty-transport:4.1.33.Final
5+
io.netty:netty-buffer:4.1.31.Final
6+
io.netty:netty-codec-http2:4.1.31.Final
7+
io.netty:netty-codec-http:4.1.31.Final
8+
io.netty:netty-codec-socks:4.1.31.Final
9+
io.netty:netty-codec:4.1.31.Final
10+
io.netty:netty-common:4.1.31.Final
11+
io.netty:netty-handler-proxy:4.1.31.Final
12+
io.netty:netty-handler:4.1.31.Final
13+
io.netty:netty-resolver:4.1.31.Final
14+
io.netty:netty-transport-native-epoll:4.1.31.Final
15+
io.netty:netty-transport-native-unix-common:4.1.31.Final
16+
io.netty:netty-transport:4.1.31.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

‎proteus-broker-mgmt-idl/gradle/dependency-locks/testCompileClasspath.lockfile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.google.protobuf:protobuf-java:3.6.1
5-
io.netty:netty-buffer:4.1.33.Final
6-
io.netty:netty-codec-http2:4.1.33.Final
7-
io.netty:netty-codec-http:4.1.33.Final
8-
io.netty:netty-codec-socks:4.1.33.Final
9-
io.netty:netty-codec:4.1.33.Final
10-
io.netty:netty-common:4.1.33.Final
11-
io.netty:netty-handler-proxy:4.1.33.Final
12-
io.netty:netty-handler:4.1.33.Final
13-
io.netty:netty-resolver:4.1.33.Final
14-
io.netty:netty-transport-native-epoll:4.1.33.Final
15-
io.netty:netty-transport-native-unix-common:4.1.33.Final
16-
io.netty:netty-transport:4.1.33.Final
5+
io.netty:netty-buffer:4.1.31.Final
6+
io.netty:netty-codec-http2:4.1.31.Final
7+
io.netty:netty-codec-http:4.1.31.Final
8+
io.netty:netty-codec-socks:4.1.31.Final
9+
io.netty:netty-codec:4.1.31.Final
10+
io.netty:netty-common:4.1.31.Final
11+
io.netty:netty-handler-proxy:4.1.31.Final
12+
io.netty:netty-handler:4.1.31.Final
13+
io.netty:netty-resolver:4.1.31.Final
14+
io.netty:netty-transport-native-epoll:4.1.31.Final
15+
io.netty:netty-transport-native-unix-common:4.1.31.Final
16+
io.netty:netty-transport:4.1.31.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

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
com.google.protobuf:protobuf-java:3.6.1
55
com.typesafe:config:1.3.3
66
io.micrometer:micrometer-core:1.0.6
7-
io.netty:netty-buffer:4.1.33.Final
8-
io.netty:netty-codec-http2:4.1.33.Final
9-
io.netty:netty-codec-http:4.1.33.Final
10-
io.netty:netty-codec-socks:4.1.33.Final
11-
io.netty:netty-codec:4.1.33.Final
12-
io.netty:netty-common:4.1.33.Final
13-
io.netty:netty-handler-proxy:4.1.33.Final
14-
io.netty:netty-handler:4.1.33.Final
15-
io.netty:netty-resolver:4.1.33.Final
7+
io.netty:netty-buffer:4.1.31.Final
8+
io.netty:netty-codec-http2:4.1.31.Final
9+
io.netty:netty-codec-http:4.1.31.Final
10+
io.netty:netty-codec-socks:4.1.31.Final
11+
io.netty:netty-codec:4.1.31.Final
12+
io.netty:netty-common:4.1.31.Final
13+
io.netty:netty-handler-proxy:4.1.31.Final
14+
io.netty:netty-handler:4.1.31.Final
15+
io.netty:netty-resolver:4.1.31.Final
1616
io.netty:netty-tcnative:2.0.18.Final
17-
io.netty:netty-transport-native-epoll:4.1.33.Final
18-
io.netty:netty-transport-native-unix-common:4.1.33.Final
19-
io.netty:netty-transport:4.1.33.Final
17+
io.netty:netty-transport-native-epoll:4.1.31.Final
18+
io.netty:netty-transport-native-unix-common:4.1.31.Final
19+
io.netty:netty-transport:4.1.31.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.17
24-
io.rsocket:rsocket-core:0.12.2-RC1
25-
io.rsocket:rsocket-transport-netty:0.12.2-RC1
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
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: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
com.google.protobuf:protobuf-java:3.6.1
55
com.typesafe:config:1.3.3
66
io.micrometer:micrometer-core:1.0.6
7-
io.netty:netty-buffer:4.1.33.Final
8-
io.netty:netty-codec-http2:4.1.33.Final
9-
io.netty:netty-codec-http:4.1.33.Final
10-
io.netty:netty-codec-socks:4.1.33.Final
11-
io.netty:netty-codec:4.1.33.Final
12-
io.netty:netty-common:4.1.33.Final
13-
io.netty:netty-handler-proxy:4.1.33.Final
14-
io.netty:netty-handler:4.1.33.Final
15-
io.netty:netty-resolver:4.1.33.Final
7+
io.netty:netty-buffer:4.1.31.Final
8+
io.netty:netty-codec-http2:4.1.31.Final
9+
io.netty:netty-codec-http:4.1.31.Final
10+
io.netty:netty-codec-socks:4.1.31.Final
11+
io.netty:netty-codec:4.1.31.Final
12+
io.netty:netty-common:4.1.31.Final
13+
io.netty:netty-handler-proxy:4.1.31.Final
14+
io.netty:netty-handler:4.1.31.Final
15+
io.netty:netty-resolver:4.1.31.Final
1616
io.netty:netty-tcnative:2.0.18.Final
17-
io.netty:netty-transport-native-epoll:4.1.33.Final
18-
io.netty:netty-transport-native-unix-common:4.1.33.Final
19-
io.netty:netty-transport:4.1.33.Final
17+
io.netty:netty-transport-native-epoll:4.1.31.Final
18+
io.netty:netty-transport-native-unix-common:4.1.31.Final
19+
io.netty:netty-transport:4.1.31.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.17
24-
io.rsocket:rsocket-core:0.12.2-RC1
25-
io.rsocket:rsocket-transport-netty:0.12.2-RC1
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
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/protobufToolsLocator_rsocketRpc.lockfile‎

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.17
4+
io.rsocket.rpc:rsocket-rpc-protobuf:0.2.13.3

0 commit comments

Comments
 (0)