Skip to content

Commit 517c276

Browse files
nebhalenebhale
committed
Merge branch 'reactor-netty-upgrade'
2 parents fdee8cf + e481337 commit 517c276

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

‎cloudfoundry-client-reactor/cloudfoundry-client-reactor.iml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@
2828
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.addons:reactor-test:3.0.7.RELEASE" level="project" />
2929
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.7.RELEASE" level="project" />
3030
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
31-
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.6.2.RELEASE" level="project" />
32-
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.8.Final" level="project" />
33-
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.8.Final" level="project" />
34-
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.8.Final" level="project" />
35-
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.8.Final" level="project" />
36-
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.8.Final" level="project" />
37-
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.8.Final" level="project" />
38-
<orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.8.Final" level="project" />
39-
<orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.8.Final" level="project" />
40-
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:4.1.8.Final" level="project" />
41-
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.8.Final" level="project" />
42-
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc:0.6.1.RELEASE" level="project" />
31+
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.6.3.RELEASE" level="project" />
32+
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.9.Final" level="project" />
33+
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.9.Final" level="project" />
34+
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.9.Final" level="project" />
35+
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.9.Final" level="project" />
36+
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.9.Final" level="project" />
37+
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.9.Final" level="project" />
38+
<orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.9.Final" level="project" />
39+
<orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.9.Final" level="project" />
40+
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:4.1.9.Final" level="project" />
41+
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.9.Final" level="project" />
42+
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc:0.6.2.RELEASE" level="project" />
4343
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
4444
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
4545
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.6.2" level="project" />

‎cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/groups/ReactorGroupsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ public void success() {
545545
public void unmapExternalGroupByGroupDisplayName() {
546546
mockRequest(InteractionContext.builder()
547547
.request(TestRequest.builder()
548-
.method(DELETE).path("/Groups/External/displayName/Group For Testing Deleting External Group Mapping By Name/externalGroup/external group/origin/ldap")
548+
.method(DELETE).path("/Groups/External/displayName/Group%20For%20Testing%20Deleting%20External%20Group%20Mapping%20By%20Name/externalGroup/external%20group/origin/ldap")
549549
.build())
550550
.response(TestResponse.builder()
551551
.status(OK)
@@ -580,7 +580,7 @@ public void unmapExternalGroupByGroupDisplayName() {
580580
public void unmapExternalGroupByGroupId() {
581581
mockRequest(InteractionContext.builder()
582582
.request(TestRequest.builder()
583-
.method(DELETE).path("/Groups/External/groupId/d68167b4-81b3-490d-9838-94092d5c89f6/externalGroup/external group/origin/ldap")
583+
.method(DELETE).path("/Groups/External/groupId/d68167b4-81b3-490d-9838-94092d5c89f6/externalGroup/external%20group/origin/ldap")
584584
.build())
585585
.response(TestResponse.builder()
586586
.status(OK)

‎integration-test/integration-test.iml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@
2929
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.8" level="project" />
3030
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.8" level="project" />
3131
<orderEntry type="library" scope="TEST" name="Maven: io.jsonwebtoken:jjwt:0.7.0" level="project" />
32-
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-netty:0.6.2.RELEASE" level="project" />
33-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-http:4.1.8.Final" level="project" />
34-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec:4.1.8.Final" level="project" />
35-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler:4.1.8.Final" level="project" />
36-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-buffer:4.1.8.Final" level="project" />
37-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport:4.1.8.Final" level="project" />
38-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-resolver:4.1.8.Final" level="project" />
39-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler-proxy:4.1.8.Final" level="project" />
40-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-socks:4.1.8.Final" level="project" />
41-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-epoll:4.1.8.Final" level="project" />
42-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-common:4.1.8.Final" level="project" />
43-
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-ipc:0.6.1.RELEASE" level="project" />
32+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-netty:0.6.3.RELEASE" level="project" />
33+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-http:4.1.9.Final" level="project" />
34+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec:4.1.9.Final" level="project" />
35+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler:4.1.9.Final" level="project" />
36+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-buffer:4.1.9.Final" level="project" />
37+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport:4.1.9.Final" level="project" />
38+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-resolver:4.1.9.Final" level="project" />
39+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler-proxy:4.1.9.Final" level="project" />
40+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-socks:4.1.9.Final" level="project" />
41+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-epoll:4.1.9.Final" level="project" />
42+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-common:4.1.9.Final" level="project" />
43+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-ipc:0.6.2.RELEASE" level="project" />
4444
<orderEntry type="module" module-name="cloudfoundry-client" scope="TEST" />
4545
<orderEntry type="library" scope="TEST" name="Maven: com.squareup.wire:wire-runtime:2.2.0" level="project" />
4646
<orderEntry type="library" scope="TEST" name="Maven: com.squareup.okio:okio:1.8.0" level="project" />

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5353
<reactor-addons.version>3.0.7.RELEASE</reactor-addons.version>
5454
<reactor-core.version>3.0.7.RELEASE</reactor-core.version>
55-
<reactor-netty.version>0.6.2.RELEASE</reactor-netty.version>
55+
<reactor-netty.version>0.6.3.RELEASE</reactor-netty.version>
5656
<wire.version>2.2.0</wire.version>
5757
</properties>
5858

0 commit comments

Comments
 (0)