8000 Merge pull request #800 from datastax/java1241 · kecmu/java-driver@7980ab9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7980ab9

Browse files
adutraadutra
authored
Merge pull request apache#800 from datastax/java1241
JAVA-1241: Upgrade Netty to 4.1.x
2 parents 668992b + f2468d3 commit 7980ab9

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

‎changelog/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
- [improvement] JAVA-1367: Make protocol negotiation more resilient.
99
- [bug] JAVA-1397: Handle duration as native datatype in protocol v5+.
1010
- [improvement] JAVA-1308: CodecRegistry performance improvements.
11+
- [improvement] JAVA-1241: Upgrade Netty to 4.1.x.
1112

1213
Merged from 3.1.x branch:
1314

‎driver-core/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<dependency>
143143
<groupId>io.netty</groupId>
144144
<artifactId>netty-tcnative</artifactId>
145-
<version>1.1.33.Fork18</version>
145+
<version>1.1.33.Fork26</version>
146146
<classifier>${os.detected.classifier}</classifier>
147147
<scope>test</scope>
148148
</dependency>
@@ -269,6 +269,8 @@
269269
<resource>META-INF/maven/io.netty/netty-common/pom.xml</resource>
270270
<resource>META-INF/maven/io.netty/netty-handler/pom.properties</resource>
271271
<resource>META-INF/maven/io.netty/netty-handler/pom.xml</resource>
272+
<resource>META-INF/maven/io.netty/netty-resolver/pom.properties</resource>
273+
<resource>META-INF/maven/io.netty/netty-resolver/pom.xml</resource>
272274
<resource>META-INF/maven/io.netty/netty-transport/pom.properties</resource>
273275
<resource>META-INF/maven/io.netty/netty-transport/pom.xml</resource>
274276
</resources>

‎driver-tests/osgi/src/test/java/com/datastax/driver/osgi/BundleOptions.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public Option[] getOptions() {
9393
}
9494

9595
public static CompositeOption nettyBundles() {
96-
final String nettyVersion = "4.0.33.Final";
96+
final String nettyVersion = "4.1.8.Final";
9797
return new CompositeOption() {
9898

9999
@Override
@@ -103,7 +103,8 @@ public Option[] getOptions() {
103103
mavenBundle("io.netty", "netty-codec", nettyVersion),
104104
mavenBundle("io.netty", "netty-common", nettyVersion),
105105
mavenBundle("io.netty", "netty-handler", nettyVersion),
106-
mavenBundle("io.netty", "netty-transport", nettyVersion)
106+
mavenBundle("io.netty", "netty-transport", nettyVersion),
107+
mavenBundle("io.netty", "netty-resolver", nettyVersion)
107108
);
108109
}
109110
};

‎manual/ssl/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ add it to your dependencies.
154154
155155
There are known runtime incompatibilities between newer versions of
156156
netty-tcnative and the version of netty that the driver uses. For best
157-
results, use version 1.1.33.Fork18.
157+
results, use version 1.1.33.Fork26.
158158
159159
Using netty-tcnative requires JDK 1.7 or above and requires the presence of
160160
OpenSSL on the system. It will not fall back to the JDK implementation.

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<log4j.version>1.2.17</log4j.version>
5252
<slf4j-log4j12.version>1.7.6</slf4j-log4j12.version>
5353
<guava.version>16.0.1</guava.version>
54-
<netty.version>4.0.37.Final</netty.version>
54+
<netty.version>4.1.8.Final</netty.version>
5555
<metrics.version>3.1.2</metrics.version>
5656
<snappy.version>1.1.2.6</snappy.version>
5757
<lz4.version>1.3.0</lz4.version>

0 commit comments

Comments
 (0)
0