Skip to content

Commit 893e8d5

Browse files
nebhalenebhale
committed
Upgrade Reactor Netty
This change upgrades the code with reactor-netty 0.7.1.RELEASE.
1 parent fca1ef0 commit 893e8d5

File tree

3 files changed

+25
-81
lines changed

3 files changed

+25
-81
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:reactor-test:3.1.0.RELEASE" level="project" />
2929
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.0.RELEASE" level="project" />
3030
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.1" level="project" />
31-
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.7.0.RELEASE" level="project" />
32-
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.13.Final" level="project" />
33-
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.13.Final" level="project" />
34-
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.13.Final" level="project" />
35-
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.13.Final" level="project" />
36-
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.13.Final" level="project" />
37-
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.13.Final" level="project" />
38-
<orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.13.Final" level="project" />
39-
<orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.13.Final" level="project" />
40-
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:4.1.13.Final" level="project" />
41-
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.13.Final" level="project" />
42-
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.13.Final" level="project" />
31+
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.7.1.RELEASE" level="project" />
32+
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.16.Final" level="project" />
33+
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.16.Final" level="project" />
34+
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.16.Final" level="project" />
35+
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.16.Final" level="project" />
36+
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.16.Final" level="project" />
37+
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.16.Final" level="project" />
38+
<orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.16.Final" level="project" />
39+
<orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.16.Final" level="project" />
40+
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:4.1.16.Final" level="project" />
41+
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.16.Final" level="project" />
42+
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.16.Final" 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.8.0" level="project" />

‎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.10" level="project" />
3030
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.10" level="project" />
3131
<orderEntry type="library" scope="TEST" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
32-
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-netty:0.7.0.RELEASE" level="project" />
33-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-http:4.1.13.Final" level="project" />
34-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec:4.1.13.Final" level="project" />
35-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler:4.1.13.Final" level="project" />
36-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-buffer:4.1.13.Final" level="project" />
37-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport:4.1.13.Final" level="project" />
38-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-resolver:4.1.13.Final" level="project" />
39-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler-proxy:4.1.13.Final" level="project" />
40-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-socks:4.1.13.Final" level="project" />
41-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-epoll:4.1.13.Final" level="project" />
42-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-common:4.1.13.Final" level="project" />
43-
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-unix-common:4.1.13.Final" level="project" />
32+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-netty:0.7.1.RELEASE" level="project" />
33+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-http:4.1.16.Final" level="project" />
34+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec:4.1.16.Final" level="project" />
35+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler:4.1.16.Final" level="project" />
36+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-buffer:4.1.16.Final" level="project" />
37+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport:4.1.16.Final" level="project" />
38+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-resolver:4.1.16.Final" level="project" />
39+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler-proxy:4.1.16.Final" level="project" />
40+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-socks:4.1.16.Final" level="project" />
41+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-epoll:4.1.16.Final" level="project" />
42+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-common:4.1.16.Final" level="project" />
43+
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-unix-common:4.1.16.Final" 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 & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -49,70 +49,14 @@
4949
<immutables.version>2.5.6</immutables.version>
5050
<java-semver.version>0.9.0</java-semver.version>
5151
<jjwt.version>0.9.0</jjwt.version>
52-
<netty.version>4.1.13.Final</netty.version> <!-- TODO: Remove once https://github.com/netty/netty/pull/7309 is available -->
5352
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5453
<reactor-core.version>3.1.0.RELEASE</reactor-core.version>
55-
<reactor-netty.version>0.7.0.RELEASE</reactor-netty.version>
54+
<reactor-netty.version>0.7.1.RELEASE</reactor-netty.version>
5655
<wire.version>2.2.0</wire.version>
5756
</properties>
5857

5958
<dependencyManagement>
6059
<dependencies>
61-
<dependency>
62-
<groupId>io.netty</groupId>
63-
<artifactId>netty-buffer</artifactId>
64-
<version>${netty.version}</version>
65-
</dependency>
66-
<dependency>
67-
<groupId>io.netty</groupId>
68-
<artifactId>netty-codec</artifactId>
69-
<version>${netty.version}</version>
70-
</dependency>
71-
<dependency>
72-
<groupId>io.netty</groupId>
73-
<artifactId>netty-codec-http</artifactId>
74-
<version>${netty.version}</version>
75-
</dependency>
76-
<dependency>
77-
<groupId>io.netty</groupId>
78-
<artifactId>netty-codec-socks</artifactId>
79-
<version>${netty.version}</version>
80-
</dependency>
81-
<dependency>
82-
<groupId>io.netty</groupId>
83-
<artifactId>netty-common</artifactId>
84-
<version>${netty.version}</version>
85-
</dependency>
86-
<dependency>
87-
<groupId>io.netty</groupId>
88-
<artifactId>netty-handler</artifactId>
89-
<version>${netty.version}</version>
90-
</dependency>
91-
<dependency>
92-
<groupId>io.netty</groupId>
93-
<artifactId>netty-handler-proxy</artifactId>
94-
<version>${netty.version}</version>
95-
</dependency>
96-
<dependency>
97-
<groupId>io.netty</groupId>
98-
<artifactId>netty-resolver</artifactId>
99-
<version>${netty.version}</version>
100-
</dependency>
101-
<dependency>
102-
<groupId>io.netty</groupId>
103-
<artifactId>netty-transport</artifactId>
104-
<version>${netty.version}</version>
105-
</dependency>
106-
<dependency>
107-
<groupId>io.netty</groupId>
108-
<artifactId>netty-transport-native-epoll</artifactId>
109-
<version>${netty.version}</version>
110-
</dependency>
111-
<dependency>
112-
<groupId>io.netty</groupId>
113-
<artifactId>netty-transport-native-unix-common</artifactId>
114-
<version>${netty.version}</version>
115-
</dependency>
11660
<dependency>
11761
<groupId>com.github.zafarkhaja</groupId>
11862
<artifactId>java-semver</artifactId>

0 commit comments

Comments
 (0)