Upgrade Azure SDK and Jackson (elastic#72833) (elastic#72995)

This commit upgrades the Azure SDK to 12.11.0 and Jackson to 2.12.2. The Jackson upgrade must happen at the same time due to Azure depending on this new version of Jackson. closes elastic#66555 closes elastic#67214 Co-authored-by: Francisco Fernández Castaño <[email protected]>
rjernst · May 27, 2021 · 6c4c4a0 · 6c4c4a0
1 parent d405d99
commit 6c4c4a0
Show file tree

Hide file tree

Showing 89 changed files with 125 additions and 133 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -9,8 +9,8 @@ checkstyle = 8.39
 # optional dependencies
 spatial4j         = 0.7
 jts               = 1.15.0
-jackson           = 2.10.4
-snakeyaml         = 1.26
+jackson           = 2.12.2
+snakeyaml         = 1.27
 icu4j             = 62.1
 supercsv          = 2.4.0
 # when updating log4j, please update also docs/java-api/index.asciidoc

diff --git a/client/sniffer/licenses/jackson-core-2.10.4.jar.sha1 b/client/sniffer/licenses/jackson-core-2.10.4.jar.sha1
diff --git a/client/sniffer/licenses/jackson-core-2.12.2.jar.sha1 b/client/sniffer/licenses/jackson-core-2.12.2.jar.sha1
@@ -0,0 +1 @@
+8df50138521d05561a308ec2799cc8dda20c06df
diff --git a/libs/x-content/licenses/jackson-core-2.10.4.jar.sha1 b/libs/x-content/licenses/jackson-core-2.10.4.jar.sha1
diff --git a/libs/x-content/licenses/jackson-core-2.12.2.jar.sha1 b/libs/x-content/licenses/jackson-core-2.12.2.jar.sha1
@@ -0,0 +1 @@
+8df50138521d05561a308ec2799cc8dda20c06df
diff --git a/libs/x-content/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1
diff --git a/libs/x-content/licenses/jackson-dataformat-cbor-2.12.2.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-cbor-2.12.2.jar.sha1
@@ -0,0 +1 @@
+71866a16d9678d8d7718baea0a28c7d0e1a67360
diff --git a/libs/x-content/licenses/jackson-dataformat-smile-2.10.4.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-smile-2.10.4.jar.sha1
diff --git a/libs/x-content/licenses/jackson-dataformat-smile-2.12.2.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-smile-2.12.2.jar.sha1
@@ -0,0 +1 @@
+110be3a2ac0acf51e68967669db47ca9a507e057
diff --git a/libs/x-content/licenses/jackson-dataformat-yaml-2.10.4.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-yaml-2.10.4.jar.sha1
diff --git a/libs/x-content/licenses/jackson-dataformat-yaml-2.12.2.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-yaml-2.12.2.jar.sha1
@@ -0,0 +1 @@
+8c549fb29f390f6fd0c20cf0a1d83f7e38dc7ffb
diff --git a/libs/x-content/licenses/snakeyaml-1.26.jar.sha1 b/libs/x-content/licenses/snakeyaml-1.26.jar.sha1
diff --git a/libs/x-content/licenses/snakeyaml-1.27.jar.sha1 b/libs/x-content/licenses/snakeyaml-1.27.jar.sha1
@@ -0,0 +1 @@
+359d62567480b07a679dc643f82fc926b100eed5
diff --git a/modules/ingest-geoip/licenses/jackson-annotations-2.10.4.jar.sha1 b/modules/ingest-geoip/licenses/jackson-annotations-2.10.4.jar.sha1
diff --git a/modules/ingest-geoip/licenses/jackson-annotations-2.12.2.jar.sha1 b/modules/ingest-geoip/licenses/jackson-annotations-2.12.2.jar.sha1
@@ -0,0 +1 @@
+0a770cc4c0a1fb0bfd8a150a6a0004e42bc99fca
diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.10.4.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.10.4.jar.sha1
diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.12.2.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.12.2.jar.sha1
@@ -0,0 +1 @@
+5f9d79e09ebf5d54a46e9f4543924cf7ae7654e0
diff --git a/plugins/discovery-ec2/licenses/jackson-annotations-2.10.4.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-annotations-2.10.4.jar.sha1
diff --git a/plugins/discovery-ec2/licenses/jackson-annotations-2.12.2.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-annotations-2.12.2.jar.sha1
@@ -0,0 +1 @@
+0a770cc4c0a1fb0bfd8a150a6a0004e42bc99fca
diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.10.4.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.10.4.jar.sha1
diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.12.2.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.12.2.jar.sha1
@@ -0,0 +1 @@
+5f9d79e09ebf5d54a46e9f4543924cf7ae7654e0
diff --git a/plugins/repository-azure/azure-storage-blob/build.gradle b/plugins/repository-azure/azure-storage-blob/build.gradle
diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle
@@ -22,38 +22,35 @@ esplugin {
 }
 
 versions << [
-  'azure': '12.9.0',
-  'azureCore': '1.10.0',
-  'azureCoreHttpNetty': '1.6.3',
+  'azure': '12.11.1',
+  'azureCore': '1.16.0',
+  'azureCoreHttpNetty': '1.9.1',
+  'azureAvro': '12.0.4',
 
   'jakartaActivation': '1.2.1',
   'jakartaXMLBind': '2.3.2',
   'stax2API': '4.2',
-  'woodstox': '6.0.2',
+  'woodstox': '6.2.4',
 
-  'reactorNetty': '0.9.12.RELEASE',
-  'reactorCore': '3.3.10.RELEASE',
+  'azureNetty': '4.1.63.Final',
+  'reactorNetty': '1.0.6',
+  'reactorCore': '3.4.5',
   'reactiveStreams': '1.0.3',
 ]
 
 dependencies {
-  api project(path: 'azure-storage-blob', configuration: 'shadow')
-  if (isEclipse) {
-    /*
-     * Eclipse can't pick up the shadow dependency so we point it at *something*
-     * so it can compile things.
-     */
-    api project(path: 'azure-storage-blob')
-  }
   api "com.azure:azure-storage-common:${versions.azure}"
+  api "com.azure:azure-storage-blob:${versions.azure}"
   api "com.azure:azure-core-http-netty:${versions.azureCoreHttpNetty}"
   api "com.azure:azure-core:${versions.azureCore}"
+  api "com.azure:azure-storage-internal-avro:${versions.azureAvro}"
 
   // jackson
   api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
   api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
   api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
   api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
+  api "com.fasterxml.jackson:jackson-bom:${versions.jackson}"
 
   // jackson xml
   api "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${versions.jackson}"
@@ -65,19 +62,24 @@ dependencies {
   api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
 
   // netty
-  api "io.netty:netty-buffer:${versions.netty}"
-  api "io.netty:netty-codec-http:${versions.netty}"
-  api "io.netty:netty-codec-http2:${versions.netty}"
-  api "io.netty:netty-codec-socks:${versions.netty}"
-  api "io.netty:netty-codec:${versions.netty}"
-  api "io.netty:netty-common:${versions.netty}"
-  api "io.netty:netty-handler-proxy:${versions.netty}"
-  api "io.netty:netty-handler:${versions.netty}"
-  api "io.netty:netty-resolver:${versions.netty}"
-  api "io.netty:netty-transport:${versions.netty}"
+  api "io.netty:netty-buffer:${versions.azureNetty}"
+  api "io.netty:netty-codec:${versions.azureNetty}"
+  api "io.netty:netty-codec-dns:${versions.azureNetty}"
+  api "io.netty:netty-codec-http:${versions.azureNetty}"
+  api "io.netty:netty-codec-http2:${versions.azureNetty}"
+  api "io.netty:netty-codec-socks:${versions.azureNetty}"
+  api "io.netty:netty-common:${versions.azureNetty}"
+  api "io.netty:netty-handler:${versions.azureNetty}"
+  api "io.netty:netty-handler-proxy:${versions.azureNetty}"
+  api "io.netty:netty-resolver:${versions.azureNetty}"
+  api "io.netty:netty-resolver-dns:${versions.azureNetty}"
+  api "io.netty:netty-transport:${versions.azureNetty}"
+  api "io.netty:netty-transport-native-unix-common:${versions.azureNetty}"
 
   // reactor
   api "io.projectreactor.netty:reactor-netty:${versions.reactorNetty}"
+  api "io.projectreactor.netty:reactor-netty-core:${versions.reactorNetty}"
+  api "io.projectreactor.netty:reactor-netty-http:${versions.reactorNetty}"
   api "io.projectreactor:reactor-core:${versions.reactorCore}"
   api "org.reactivestreams:reactive-streams:${versions.reactiveStreams}"
 
@@ -107,6 +109,7 @@ tasks.named("dependencyLicenses").configure {
   mapping from: /netty-.*/, to: 'netty'
   mapping from: /jaxb-.*/, to: 'jaxb'
   mapping from: /stax-.*/, to: 'stax'
+  mapping from: /reactor-netty-.*/, to: 'reactor-netty'
   mapping from: /reactive-streams.*/, to: 'reactive-streams'
 }
 
@@ -240,6 +243,8 @@ tasks.named("thirdPartyAudit").configure {
     'io.netty.internal.tcnative.CertificateVerifier',
     'io.netty.internal.tcnative.SessionTicketKey',
     'io.netty.internal.tcnative.SniHostNameMatcher',
+    'io.netty.internal.tcnative.SSLSession',
+    'io.netty.internal.tcnative.SSLSessionCache',
 
     // from io.netty.util.internal.Hidden (netty-common optional dependency)
     'reactor.blockhound.BlockHound$Builder',
@@ -248,14 +253,23 @@ tasks.named("thirdPartyAudit").configure {
     // it uses NIO
     'io.netty.channel.kqueue.KQueue',
     'io.netty.channel.kqueue.KQueueDatagramChannel',
+    'io.netty.channel.kqueue.KQueueDomainSocketChannel',
     'io.netty.channel.kqueue.KQueueEventLoopGroup',
+    'io.netty.channel.kqueue.KQueueServerDomainSocketChannel',
     'io.netty.channel.kqueue.KQueueServerSocketChannel',
     'io.netty.channel.kqueue.KQueueSocketChannel',
     'io.netty.channel.epoll.Epoll',
     'io.netty.channel.epoll.EpollDatagramChannel',
+    'io.netty.channel.epoll.EpollDomainSocketChannel',
     'io.netty.channel.epoll.EpollEventLoopGroup',
+    'io.netty.channel.epoll.EpollServerDomainSocketChannel',
     'io.netty.channel.epoll.EpollServerSocketChannel',
     'io.netty.channel.epoll.EpollSocketChannel',
+    'io.netty.incubator.channel.uring.IOUring',
+    'io.netty.incubator.channel.uring.IOUringDatagramChannel',
+    'io.netty.incubator.channel.uring.IOUringEventLoopGroup',
+    'io.netty.incubator.channel.uring.IOUringServerSocketChannel',
+    'io.netty.incubator.channel.uring.IOUringSocketChannel',
 
     // from reactor.netty.http.server.HttpServer (reactor-netty)
     'io.netty.handler.codec.haproxy.HAProxyMessage',
@@ -265,13 +279,11 @@ tasks.named("thirdPartyAudit").configure {
     'org.osgi.framework.BundleActivator',
     'org.osgi.framework.BundleContext',
 
-    // from com.ctc.wstx.shaded.msv_core.driver.textui.Driver (woodstox-core)
-    'com.sun.org.apache.xml.internal.resolver.Catalog',
-    'com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver',
-
     'org.slf4j.impl.StaticLoggerBinder',
     'org.slf4j.impl.StaticMDCBinder',
     'org.slf4j.impl.StaticMarkerBinder',
+
+    'com.ctc.wstx.shaded.msv_core.driver.textui.Driver',
   )
 
   ignoreViolations(
@@ -297,11 +309,7 @@ tasks.named("thirdPartyAudit").configure {
     'javax.activation.MailcapCommandMap',
     'javax.activation.MimetypesFileTypeMap',
 
-    'reactor.core.publisher.MultiProducerRingBuffer',
-    'reactor.core.publisher.RingBufferFields',
     'reactor.core.publisher.Traces$SharedSecretsCallSiteSupplierFactory$TracingException',
-    'reactor.core.publisher.UnsafeSequence',
-    'reactor.core.publisher.UnsafeSupport'
   )
 }
 boolean useFixture = false

diff --git a/plugins/repository-azure/licenses/azure-core-1.10.0.jar.sha1 b/plugins/repository-azure/licenses/azure-core-1.10.0.jar.sha1
diff --git a/plugins/repository-azure/licenses/azure-core-1.16.0.jar.sha1 b/plugins/repository-azure/licenses/azure-core-1.16.0.jar.sha1
@@ -0,0 +1 @@
+4942bfa35a89a1fc9cabd18427a9b450d392215b
diff --git a/plugins/repository-azure/licenses/azure-core-http-netty-1.6.3.jar.sha1 b/plugins/repository-azure/licenses/azure-core-http-netty-1.6.3.jar.sha1
diff --git a/plugins/repository-azure/licenses/azure-core-http-netty-1.9.1.jar.sha1 b/plugins/repository-azure/licenses/azure-core-http-netty-1.9.1.jar.sha1
@@ -0,0 +1 @@
+b78134e2715eaef150ae3786806ff640bd0439ba
diff --git a/plugins/repository-azure/licenses/azure-storage-blob-12.11.1.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-blob-12.11.1.jar.sha1
@@ -0,0 +1 @@
+ac89edaa19ee481c832970e944af16b3b772881a
diff --git a/plugins/repository-azure/licenses/azure-storage-common-12.11.1.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-common-12.11.1.jar.sha1
@@ -0,0 +1 @@
+61b336d02e1d8839d68db47d884574fe41535e04
diff --git a/plugins/repository-azure/licenses/azure-storage-common-12.9.0.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-common-12.9.0.jar.sha1
diff --git a/plugins/repository-azure/licenses/azure-storage-internal-avro-12.0.4.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-internal-avro-12.0.4.jar.sha1
@@ -0,0 +1 @@
+39733586ba04415ce64b186e17e1f8d9e28f2972
diff --git a/plugins/repository-azure/licenses/jackson-annotations-2.10.4.jar.sha1 b/plugins/repository-azure/licenses/jackson-annotations-2.10.4.jar.sha1
diff --git a/plugins/repository-azure/licenses/jackson-annotations-2.12.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-annotations-2.12.2.jar.sha1
@@ -0,0 +1 @@
+0a770cc4c0a1fb0bfd8a150a6a0004e42bc99fca
diff --git a/plugins/repository-azure/licenses/jackson-databind-2.10.4.jar.sha1 b/plugins/repository-azure/licenses/jackson-databind-2.10.4.jar.sha1
diff --git a/plugins/repository-azure/licenses/jackson-databind-2.12.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-databind-2.12.2.jar.sha1
@@ -0,0 +1 @@
+5f9d79e09ebf5d54a46e9f4543924cf7ae7654e0
diff --git a/plugins/repository-azure/licenses/jackson-dataformat-xml-2.10.4.jar.sha1 b/plugins/repository-azure/licenses/jackson-dataformat-xml-2.10.4.jar.sha1
diff --git a/plugins/repository-azure/licenses/jackson-dataformat-xml-2.12.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-dataformat-xml-2.12.2.jar.sha1
@@ -0,0 +1 @@
+dac1d21b5fe602d492273d35eb28918a91fc5412
diff --git a/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.10.4.jar.sha1 b/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.10.4.jar.sha1
diff --git a/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.12.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.12.2.jar.sha1
@@ -0,0 +1 @@
+00012e36d12f47b4648e2cfe0b12bdcc2c4649bf
diff --git a/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.10.4.jar.sha1 b/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.10.4.jar.sha1
diff --git a/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.12.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.12.2.jar.sha1
@@ -0,0 +1 @@
+f226bd0766b4e81493822e8c81eaa6cab27e589f
diff --git a/plugins/repository-azure/licenses/netty-buffer-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-buffer-4.1.49.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-buffer-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-buffer-4.1.63.Final.jar.sha1
@@ -0,0 +1 @@
+40028ce5ac7c43f1c9a1439f74637cad04013e23
diff --git a/plugins/repository-azure/licenses/netty-codec-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-4.1.49.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-codec-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-4.1.63.Final.jar.sha1
@@ -0,0 +1 @@
+d4d2fccea88c80e56d59ce1053c53df0f9f4f5db
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.63.Final.jar.sha1
@@ -0,0 +1 @@
+91c445232b12e13bf6757579a39bab81e1233af5
diff --git a/plugins/repository-azure/licenses/netty-codec-http-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http-4.1.49.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-codec-http-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http-4.1.63.Final.jar.sha1
@@ -0,0 +1 @@
+f8c9b159dcb76452dc98a370a5511ff993670419
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.49.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.63.Final.jar.sha1
@@ -0,0 +1 @@
+294e90696d8d6e20c889511d2484b37158cb9caa
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.49.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.63.Final.jar.sha1
@@ -0,0 +1 @@
+97707b764c9287836dcf626dd03c81f3bbfc86c6
diff --git a/plugins/repository-azure/licenses/netty-common-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-common-4.1.49.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-common-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-common-4.1.63.Final.jar.sha1
@@ -0,0 +1 @@
+e1206b46384d4dcbecee2901f18ce65ecf02e8a4
diff --git a/plugins/repository-azure/licenses/netty-handler-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-4.1.49.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-handler-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-4.1.63.Final.jar.sha1
@@ -0,0 +1 @@
+879a43c2325b08e92e8967218b6ddb0ed4b7a0d3
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.49.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.63.Final.jar.sha1
@@ -0,0 +1 @@
+d8cbdc537d75f219c04a057b984b2f0b55c1dbff
diff --git a/plugins/repository-azure/licenses/netty-resolver-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-4.1.49.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-resolver-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-4.1.63.Final.jar.sha1
@@ -0,0 +1 @@
+d07cd47c101dfa655d6d5cc304d523742fd78ca8
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.63.Final.jar.sha1
@@ -0,0 +1 @@
+f44dc8ed52ff8528a88c157879c9baffe464fa46
diff --git a/plugins/repository-azure/licenses/netty-transport-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-4.1.49.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-transport-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-4.1.63.Final.jar.sha1
@@ -0,0 +1 @@
+09a8bbe1ba082c9434e6f524d3864a53f340f2df
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.63.Final.jar.sha1
@@ -0,0 +1 @@
+85bd91382ec54b300ad3ff59efccbb4fccb22a88
diff --git a/plugins/repository-azure/licenses/reactor-core-3.3.10.RELEASE.jar.sha1 b/plugins/repository-azure/licenses/reactor-core-3.3.10.RELEASE.jar.sha1