honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Netty 4.1.7 

This commit upgrades the Netty dependency to version 4.1.7.Final,
picking up some important bug fixes.

Relates #22587
This commit is contained in:
Jason Tedor 2017-01-12 10:58:21 -05:00 committed by GitHub
parent bdf836a286
commit 126efea56c
17 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/transport/src/test/java/org/elasticsearch/transport/client/PreBuiltTransportClientTests.java
View File

@ -41,8 +41,6 @@ public class PreBuiltTransportClientTests extends RandomizedTest {
@Test
public void testPluginInstalled() {
// TODO: remove when Netty 4.1.6 is upgraded to Netty 4.1.7 including https://github.com/netty/netty/pull/6068
assumeFalse(Constants.JRE_IS_MINIMUM_JAVA9);
try (TransportClient client = new PreBuiltTransportClient(Settings.EMPTY)) {
Settings settings = client.settings();
assertEquals(Netty4Plugin.NETTY_TRANSPORT_NAME, NetworkModule.HTTP_DEFAULT_TYPE_SETTING.get(settings));

17
modules/transport-netty4/build.gradle
View File

@ -33,13 +33,13 @@ compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-tr
dependencies {
// network stack
compile "io.netty:netty-buffer:4.1.6.Final"
compile "io.netty:netty-codec:4.1.6.Final"
compile "io.netty:netty-codec-http:4.1.6.Final"
compile "io.netty:netty-common:4.1.6.Final"
compile "io.netty:netty-handler:4.1.6.Final"
compile "io.netty:netty-resolver:4.1.6.Final"
compile "io.netty:netty-transport:4.1.6.Final"
compile "io.netty:netty-buffer:4.1.7.Final"
compile "io.netty:netty-codec:4.1.7.Final"
compile "io.netty:netty-codec-http:4.1.7.Final"
compile "io.netty:netty-common:4.1.7.Final"
compile "io.netty:netty-handler:4.1.7.Final"
compile "io.netty:netty-resolver:4.1.7.Final"
compile "io.netty:netty-transport:4.1.7.Final"
}
thirdPartyAudit.excludes = [
@ -131,9 +131,6 @@ thirdPartyAudit.excludes = [
'io.netty.util.internal.PlatformDependent0',
'io.netty.util.internal.PlatformDependent0$2',
'io.netty.util.internal.PlatformDependent0$3',
'io.netty.util.internal.UnsafeAtomicIntegerFieldUpdater',
'io.netty.util.internal.UnsafeAtomicLongFieldUpdater',
'io.netty.util.internal.UnsafeAtomicReferenceFieldUpdater',
'io.netty.util.internal.chmv8.ConcurrentHashMapV8',
'io.netty.util.internal.chmv8.ConcurrentHashMapV8$1',
'io.netty.util.internal.chmv8.ConcurrentHashMapV8$TreeBin',

1
modules/transport-netty4/licenses/netty-buffer-4.1.6.Final.jar.sha1
View File

@ -1 +0,0 @@
dc1a304ee7c448bfa241f60c41948db6f12b653b

1
modules/transport-netty4/licenses/netty-buffer-4.1.7.Final.jar.sha1 Normal file
View File

@ -0,0 +1 @@
65e89b4d0737cf1ed3eac2916ebf365f5312294c

1
modules/transport-netty4/licenses/netty-codec-4.1.6.Final.jar.sha1
View File

@ -1 +0,0 @@
086ce3c559af6759a0b991b9ad2faec20981e18e

1
modules/transport-netty4/licenses/netty-codec-4.1.7.Final.jar.sha1 Normal file
View File

@ -0,0 +1 @@
b3ecd69e7ab0eb2054b26ad3efb13c34204ffe19

1
modules/transport-netty4/licenses/netty-codec-http-4.1.6.Final.jar.sha1
View File

@ -1 +0,0 @@
ee6c65cb3f39f212241e9131dc05a837e776fd70

1
modules/transport-netty4/licenses/netty-codec-http-4.1.7.Final.jar.sha1 Normal file
View File

@ -0,0 +1 @@
9f957998c651e7b73d6dc878f704d81b4c085387

1
modules/transport-netty4/licenses/netty-common-4.1.6.Final.jar.sha1
View File

@ -1 +0,0 @@
654e4d8e87bc442be5c1d82d0369a3885f7168ea

1
modules/transport-netty4/licenses/netty-common-4.1.7.Final.jar.sha1 Normal file
View File

@ -0,0 +1 @@
06766071efa0426fb33101d1758a8d0e09d16ac7

1
modules/transport-netty4/licenses/netty-handler-4.1.6.Final.jar.sha1
View File

@ -1 +0,0 @@
a24e92d67e467a3b97ff63642ab56637990685fd

1
modules/transport-netty4/licenses/netty-handler-4.1.7.Final.jar.sha1 Normal file
View File

@ -0,0 +1 @@
6f7dfa01c1af4280c154213b6d548405df352df9

1
modules/transport-netty4/licenses/netty-resolver-4.1.6.Final.jar.sha1
View File

@ -1 +0,0 @@
2a1c97445b6aa544cd029faa72abfb3f85e9957e

1
modules/transport-netty4/licenses/netty-resolver-4.1.7.Final.jar.sha1 Normal file
View File

@ -0,0 +1 @@
077734f94029b47887f6f9392d1fc62729e155aa

1
modules/transport-netty4/licenses/netty-transport-4.1.6.Final.jar.sha1
View File

@ -1 +0,0 @@
4cba91ad2711c13a063d480f01edf70aa3f9387d

1
modules/transport-netty4/licenses/netty-transport-4.1.7.Final.jar.sha1 Normal file
View File

@ -0,0 +1 @@
469e86d4dda1dca8b88d2b1faa8e0f078243ba12

4
modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy
View File

@ -17,12 +17,12 @@
* under the License.
*/
grant codeBase "${codebase.netty-common-4.1.6.Final.jar}" {
grant codeBase "${codebase.netty-common-4.1.7.Final.jar}" {
// for reading the system-wide configuration for the backlog of established sockets
permission java.io.FilePermission "/proc/sys/net/core/somaxconn", "read";
};
grant codeBase "${codebase.netty-transport-4.1.6.Final.jar}" {
grant codeBase "${codebase.netty-transport-4.1.7.Final.jar}" {
// Netty NioEventLoop wants to change this, because of https://bugs.openjdk.java.net/browse/JDK-6427854
// the bug says it only happened rarely, and that its fixed, but apparently it still happens rarely!
permission java.util.PropertyPermission "sun.nio.ch.bugLevel", "write";