Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion driver-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative</artifactId>
<version>1.1.33.Fork18</version>
<version>1.1.33.Fork23</version>
<classifier>${os.detected.classifier}</classifier>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -269,6 +269,8 @@
<resource>META-INF/maven/io.netty/netty-common/pom.xml</resource>
<resource>META-INF/maven/io.netty/netty-handler/pom.properties</resource>
<resource>META-INF/maven/io.netty/netty-handler/pom.xml</resource>
<resource>META-INF/maven/io.netty/netty-resolver/pom.properties</resource>
<resource>META-INF/maven/io.netty/netty-resolver/pom.xml</resource>
<resource>META-INF/maven/io.netty/netty-transport/pom.properties</resource>
<resource>META-INF/maven/io.netty/netty-transport/pom.xml</resource>
</resources>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public Option[] getOptions() {
}

public static CompositeOption nettyBundles() {
final String nettyVersion = "4.0.33.Final";
final String nettyVersion = "4.1.6.Final";
return new CompositeOption() {

@Override
Expand All @@ -103,7 +103,8 @@ public Option[] getOptions() {
mavenBundle("io.netty", "netty-codec", nettyVersion),
mavenBundle("io.netty", "netty-common", nettyVersion),
mavenBundle("io.netty", "netty-handler", nettyVersion),
mavenBundle("io.netty", "netty-transport", nettyVersion)
mavenBundle("io.netty", "netty-transport", nettyVersion),
mavenBundle("io.netty", "netty-resolver", nettyVersion)
);
}
};
Expand Down
2 changes: 1 addition & 1 deletion manual/ssl/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ add it to your dependencies.

There are known runtime incompatibilities between newer versions of
netty-tcnative and the version of netty that the driver uses. For best
results, use version 1.1.33.Fork18.
results, use version 1.1.33.Fork23.

Using netty-tcnative requires JDK 1.7 or above and requires the presence of
OpenSSL on the system. It will not fall back to the JDK implementation.
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<log4j.version>1.2.17</log4j.version>
<slf4j-log4j12.version>1.7.6</slf4j-log4j12.version>
<guava.version>16.0.1</guava.version>
<netty.version>4.0.37.Final</netty.version>
<netty.version>4.1.6.Final</netty.version>
<metrics.version>3.1.2</metrics.version>
<snappy.version>1.1.2.6</snappy.version>
<lz4.version>1.3.0</lz4.version>
Expand Down