8000 Revert "JAVA-1241: Upgrade Netty to 4.1.x" · kecmu/java-driver@25499d6 · GitHub
[go: up one dir, main page]
Skip to content< 8000 /a>

Commit 25499d6

Browse files
olim7tolim7t
committed
Revert "JAVA-1241: Upgrade Netty to 4.1.x"
This reverts commit f2468d3.
1 parent d336e5c commit 25499d6

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

‎changelog/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
- [improvement] JAVA-1310: Make mapper's ignored properties configurable.
2323
- [improvement] JAVA-1316: Add strategy for resolving properties into CQL names.
2424
- [bug] JAVA-1424: Handle new WRITE_FAILURE and READ_FAILURE format in v5 protocol.
25+
- revert JAVA-1241 (go back to Netty 4.0)
2526

2627
Merged from 3.1.x branch:
2728

‎driver-core/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,6 @@
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>
274272
<resource>META-INF/maven/io.netty/netty-transport/pom.properties</resource>
275273
<resource>META-INF/maven/io.netty/netty-transport/pom.xml</resource>
276274
</resources>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ 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),
107-
mavenBundle("io.netty", "netty-resolver", nettyVersion)
106+
mavenBundle("io.netty", "netty-transport", nettyVersion)
108107
);
109108
}
110109
};

‎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>19.0</guava.version>
54-
<netty.version>4.1.8.Final</netty.version>
54+
<netty.version>4.0.44.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