Merge branch '1.2' into 1.2-bc-fips

opensearch-project · Jan 12, 2022 · 5ebd120 · 5ebd120
2 parents 991f488 + c7e9b2d
commit 5ebd120
Show file tree

Hide file tree

Showing 43 changed files with 22 additions and 22 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -19,7 +19,7 @@ slf4j             = 1.6.2
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 5.5.0
 
-netty             = 4.1.69.Final
+netty             = 4.1.72.Final
 joda              = 2.10.4
 
 # when updating this version, you need to ensure compatibility with:

diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.69.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.69.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.72.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+f306eec3f79541f9b8af9c471a0d5b63b7996272
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.69.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.69.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.72.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+613c4019d687db4e9a5532564e442f83c4474ed7
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.69.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.69.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.72.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+a8f062d67303a5e4b2bc2ad48fb4fd8c99108e45
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.69.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.69.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.72.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+a55bac9c3af5f59828207b551a96ac19bbfc341e
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.69.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.69.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.72.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+9feee089fee606c64be90c0332db9aef1f7d8e46
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.69.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.69.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.72.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+4ff458458ea32ed1156086820b624a815fcbf2c0
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.69.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.69.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.72.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+99138b436a584879355aca8fe3c64b46227d5d79
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.69.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.69.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.72.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+43030c869832981a626458073e86070858747e06
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.69.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.69.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.72.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+4b269e666fbace27d2c1efa57703e99b09655822
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.69.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.69.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.72.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+d3bc427b6e2dc4bb6dc9d18d1cc47f8530970a8b
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.69.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.69.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.72.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+90de0fe610454d4296052ae36acb8a6a1d0333f1
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.69.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.69.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.72.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+a2fc945c3688e2b7d6ddb2c25f33832349657fa0
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.69.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.69.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.72.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+cedc023ffdcb68543b22a1ebc7960a160589aa09
diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.69.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.69.Final.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.72.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+86a69bf2f38d9f9f05c528e158f1532d3c6d625e
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.69.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.69.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.72.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+f306eec3f79541f9b8af9c471a0d5b63b7996272
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.69.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.69.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.72.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+613c4019d687db4e9a5532564e442f83c4474ed7
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.69.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.69.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.72.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+a8f062d67303a5e4b2bc2ad48fb4fd8c99108e45
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.69.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.69.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.72.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+a55bac9c3af5f59828207b551a96ac19bbfc341e
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.69.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.69.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.72.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+9feee089fee606c64be90c0332db9aef1f7d8e46
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.69.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.69.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.72.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+4ff458458ea32ed1156086820b624a815fcbf2c0
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.69.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.69.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.72.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.72.Final.jar.sha1
@@ -0,0 +1 @@
+99138b436a584879355aca8fe3c64b46227d5d79