Home Explore Help
Sign In
lqb
/
elasticsearch
mirror of https://gitee.com/mirrors/elasticsearch.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Upgrade to Netty 4.1.38 (#45132)

* A number of fixes to buffer handling in the .37 and .38 -> we should stay up to date
Armin Braun 6 years ago
parent
e0f9d61bec
commit
fb508dba4a
31 changed files with 18 additions and 17 deletions
Split View Show Diff Stats
  1. 1 1
      buildSrc/version.properties
  2. 2 1
      modules/transport-netty4/build.gradle
  3. 0 1
      modules/transport-netty4/licenses/netty-buffer-4.1.36.Final.jar.sha1
  4. 1 0
      modules/transport-netty4/licenses/netty-buffer-4.1.38.Final.jar.sha1
  5. 0 1
      modules/transport-netty4/licenses/netty-codec-4.1.36.Final.jar.sha1
  6. 1 0
      modules/transport-netty4/licenses/netty-codec-4.1.38.Final.jar.sha1
  7. 0 1
      modules/transport-netty4/licenses/netty-codec-http-4.1.36.Final.jar.sha1
  8. 1 0
      modules/transport-netty4/licenses/netty-codec-http-4.1.38.Final.jar.sha1
  9. 0 1
      modules/transport-netty4/licenses/netty-common-4.1.36.Final.jar.sha1
  10. 1 0
      modules/transport-netty4/licenses/netty-common-4.1.38.Final.jar.sha1
  11. 0 1
      modules/transport-netty4/licenses/netty-handler-4.1.36.Final.jar.sha1
  12. 1 0
      modules/transport-netty4/licenses/netty-handler-4.1.38.Final.jar.sha1
  13. 0 1
      modules/transport-netty4/licenses/netty-resolver-4.1.36.Final.jar.sha1
  14. 1 0
      modules/transport-netty4/licenses/netty-resolver-4.1.38.Final.jar.sha1
  15. 0 1
      modules/transport-netty4/licenses/netty-transport-4.1.36.Final.jar.sha1
  16. 1 0
      modules/transport-netty4/licenses/netty-transport-4.1.38.Final.jar.sha1
  17. 1 1
      plugins/transport-nio/build.gradle
  18. 0 1
      plugins/transport-nio/licenses/netty-buffer-4.1.36.Final.jar.sha1
  19. 1 0
      plugins/transport-nio/licenses/netty-buffer-4.1.38.Final.jar.sha1
  20. 0 1
      plugins/transport-nio/licenses/netty-codec-4.1.36.Final.jar.sha1
  21. 1 0
      plugins/transport-nio/licenses/netty-codec-4.1.38.Final.jar.sha1
  22. 0 1
      plugins/transport-nio/licenses/netty-codec-http-4.1.36.Final.jar.sha1
  23. 1 0
      plugins/transport-nio/licenses/netty-codec-http-4.1.38.Final.jar.sha1
  24. 0 1
      plugins/transport-nio/licenses/netty-common-4.1.36.Final.jar.sha1
  25. 1 0
      plugins/transport-nio/licenses/netty-common-4.1.38.Final.jar.sha1
  26. 0 1
      plugins/transport-nio/licenses/netty-handler-4.1.36.Final.jar.sha1
  27. 1 0
      plugins/transport-nio/licenses/netty-handler-4.1.38.Final.jar.sha1
  28. 0 1
      plugins/transport-nio/licenses/netty-resolver-4.1.36.Final.jar.sha1
  29. 1 0
      plugins/transport-nio/licenses/netty-resolver-4.1.38.Final.jar.sha1
  30. 0 1
      plugins/transport-nio/licenses/netty-transport-4.1.36.Final.jar.sha1
  31. 1 0
      plugins/transport-nio/licenses/netty-transport-4.1.38.Final.jar.sha1

+ 1 - 1
buildSrc/version.properties
View File 

@@ -20,7 +20,7 @@ slf4j             = 1.6.2
 
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 
 jna               = 4.5.1
 
 
-netty             = 4.1.36.Final
 
+netty             = 4.1.38.Final
 
 joda              = 2.10.2
 
 
 # when updating this version, you need to ensure compatibility with:

+ 2 - 1
modules/transport-netty4/build.gradle
View File 

@@ -143,12 +143,13 @@ thirdPartyAudit {
 
         'net.jpountz.lz4.LZ4Compressor',
 
         'net.jpountz.lz4.LZ4Factory',
 
         'net.jpountz.lz4.LZ4FastDecompressor',
 
-        'net.jpountz.xxhash.StreamingXXHash32',
 
+        'net.jpountz.xxhash.XXHash32',
 
         'net.jpountz.xxhash.XXHashFactory',
 
         'io.netty.internal.tcnative.CertificateCallback',
 
         'io.netty.internal.tcnative.CertificateVerifier',
 
         'io.netty.internal.tcnative.SessionTicketKey',
 
         'io.netty.internal.tcnative.SniHostNameMatcher',
 
+        'io.netty.internal.tcnative.SSL',
 
         'org.eclipse.jetty.alpn.ALPN$ClientProvider',
 
         'org.eclipse.jetty.alpn.ALPN$ServerProvider',
 
         'org.eclipse.jetty.alpn.ALPN',

+ 0 - 1
modules/transport-netty4/licenses/netty-buffer-4.1.36.Final.jar.sha1
View File 

@@ -1 +0,0 @@
 
-7f2db0921dd57df4db076229830ab09bba713aeb

+ 1 - 0
modules/transport-netty4/licenses/netty-buffer-4.1.38.Final.jar.sha1
View File 

@@ -0,0 +1 @@
 
+d16cf15d29c409987cecde77407fbb6f1e16d262

+ 0 - 1
modules/transport-netty4/licenses/netty-codec-4.1.36.Final.jar.sha1
View File 

@@ -1 +0,0 @@
 
-8462116d327bb3d1ec24258071f2e7345a73dbfc

+ 1 - 0
modules/transport-netty4/licenses/netty-codec-4.1.38.Final.jar.sha1
View File 

@@ -0,0 +1 @@
 
+ccfbdfc727cbf702350572a0b12fe92185ebf162

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

@@ -1 +0,0 @@
 
-62b73d439dbddf3c0dde092b048580139695ab46

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

@@ -0,0 +1 @@
 
+4d55b3cdb74cd140d262de96987ebd369125a64c

+ 0 - 1
modules/transport-netty4/licenses/netty-common-4.1.36.Final.jar.sha1
View File 

@@ -1 +0,0 @@
 
-f6f38fde652a70ea579897edc80e52353e487ae6

+ 1 - 0
modules/transport-netty4/licenses/netty-common-4.1.38.Final.jar.sha1
View File 

@@ -0,0 +1 @@
 
+6f8aae763f743d91fb1ba1e9011dae0ef4f6ff34

+ 0 - 1
modules/transport-netty4/licenses/netty-handler-4.1.36.Final.jar.sha1
View File 

@@ -1 +0,0 @@
 
-1c38a5920a10c01b1cce4cdc964447ec76abf1b5

+ 1 - 0
modules/transport-netty4/licenses/netty-handler-4.1.38.Final.jar.sha1
View File 

@@ -0,0 +1 @@
 
+ebf1f2bd0dad5e16aa1fc48d32e5dbe507b38d53

+ 0 - 1
modules/transport-netty4/licenses/netty-resolver-4.1.36.Final.jar.sha1
View File 

@@ -1 +0,0 @@
 
-e4d243fbf4e6837fa294f892bf97149e18129100

+ 1 - 0
modules/transport-netty4/licenses/netty-resolver-4.1.38.Final.jar.sha1
View File 

@@ -0,0 +1 @@
 
+b00be4aa309e9b56e498191aa8c73e4f393759ed

+ 0 - 1
modules/transport-netty4/licenses/netty-transport-4.1.36.Final.jar.sha1
View File 

@@ -1 +0,0 @@
 
-8546e6be47be587acab86bbd106ca023678f07d9

+ 1 - 0
modules/transport-netty4/licenses/netty-transport-4.1.38.Final.jar.sha1
View File 

@@ -0,0 +1 @@
 
+cd8b612d5daa42d1be3bb3203e4857597d5db79b

+ 1 - 1
plugins/transport-nio/build.gradle
View File 

@@ -107,7 +107,7 @@ thirdPartyAudit {
 
         'net.jpountz.lz4.LZ4Compressor',
 
         'net.jpountz.lz4.LZ4Factory',
 
         'net.jpountz.lz4.LZ4FastDecompressor',
 
-        'net.jpountz.xxhash.StreamingXXHash32',
 
+        'net.jpountz.xxhash.XXHash32',
 
         'net.jpountz.xxhash.XXHashFactory',
 
         'org.eclipse.jetty.alpn.ALPN$ClientProvider',
 
         'org.eclipse.jetty.alpn.ALPN$ServerProvider',

+ 0 - 1
plugins/transport-nio/licenses/netty-buffer-4.1.36.Final.jar.sha1
View File 

@@ -1 +0,0 @@
 
-7f2db0921dd57df4db076229830ab09bba713aeb

+ 1 - 0
plugins/transport-nio/licenses/netty-buffer-4.1.38.Final.jar.sha1
View File 

@@ -0,0 +1 @@
 
+d16cf15d29c409987cecde77407fbb6f1e16d262

+ 0 - 1
plugins/transport-nio/licenses/netty-codec-4.1.36.Final.jar.sha1
View File 

@@ -1 +0,0 @@
 
-8462116d327bb3d1ec24258071f2e7345a73dbfc

+ 1 - 0
plugins/transport-nio/licenses/netty-codec-4.1.38.Final.jar.sha1
View File 

@@ -0,0 +1 @@
 
+ccfbdfc727cbf702350572a0b12fe92185ebf162

+ 0 - 1
plugins/transport-nio/licenses/netty-codec-http-4.1.36.Final.jar.sha1
View File 

@@ -1 +0,0 @@
 
-62b73d439dbddf3c0dde092b048580139695ab46

+ 1 - 0
plugins/transport-nio/licenses/netty-codec-http-4.1.38.Final.jar.sha1
View File 

@@ -0,0 +1 @@
 
+4d55b3cdb74cd140d262de96987ebd369125a64c

+ 0 - 1
plugins/transport-nio/licenses/netty-common-4.1.36.Final.jar.sha1
View File 

@@ -1 +0,0 @@
 
-f6f38fde652a70ea579897edc80e52353e487ae6

+ 1 - 0
plugins/transport-nio/licenses/netty-common-4.1.38.Final.jar.sha1
View File 

@@ -0,0 +1 @@
 
+6f8aae763f743d91fb1ba1e9011dae0ef4f6ff34

+ 0 - 1
plugins/transport-nio/licenses/netty-handler-4.1.36.Final.jar.sha1
View File 

@@ -1 +0,0 @@
 
-1c38a5920a10c01b1cce4cdc964447ec76abf1b5

+ 1 - 0
plugins/transport-nio/licenses/netty-handler-4.1.38.Final.jar.sha1
View File 

@@ -0,0 +1 @@
 
+ebf1f2bd0dad5e16aa1fc48d32e5dbe507b38d53

+ 0 - 1
plugins/transport-nio/licenses/netty-resolver-4.1.36.Final.jar.sha1
View File 

@@ -1 +0,0 @@
 
-e4d243fbf4e6837fa294f892bf97149e18129100

+ 1 - 0
plugins/transport-nio/licenses/netty-resolver-4.1.38.Final.jar.sha1
View File 

@@ -0,0 +1 @@
 
+b00be4aa309e9b56e498191aa8c73e4f393759ed

+ 0 - 1
plugins/transport-nio/licenses/netty-transport-4.1.36.Final.jar.sha1
View File 

@@ -1 +0,0 @@
 
-8546e6be47be587acab86bbd106ca023678f07d9

+ 1 - 0
plugins/transport-nio/licenses/netty-transport-4.1.38.Final.jar.sha1
View File 

@@ -0,0 +1 @@
 
+cd8b612d5daa42d1be3bb3203e4857597d5db79b