Revert "Upgrade Azure SDK and Jackson (#72833) (#72995)"

build-tools-internal/version.properties

@@ -9,8 +9,8 @@ checkstyle = 8.42
 # optional dependencies
 spatial4j         = 0.7
 jts               = 1.15.0
-jackson           = 2.12.2
-snakeyaml         = 1.27
+jackson           = 2.10.4
+snakeyaml         = 1.26
 icu4j             = 62.1
 supercsv          = 2.4.0
 # when updating log4j, please update also docs/java-api/index.asciidoc

client/sniffer/licenses/jackson-core-2.10.4.jar.sha1

@@ -0,0 +1 @@
+8796585e716440d6dd5128b30359932a9eb74d0d

libs/x-content/licenses/jackson-core-2.10.4.jar.sha1

@@ -0,0 +1 @@
+8796585e716440d6dd5128b30359932a9eb74d0d

libs/x-content/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1

@@ -0,0 +1 @@
+c854bb2d46138198cb5d4aae86ef6c04b8bc1e70

libs/x-content/licenses/jackson-dataformat-smile-2.10.4.jar.sha1

@@ -0,0 +1 @@
+c872c2e224cfdcc5481037d477f5890f05c001b4

libs/x-content/licenses/jackson-dataformat-yaml-2.10.4.jar.sha1

@@ -0,0 +1 @@
+8a7f3c6b640bd89214807af6d8160b4b3b16af93

libs/x-content/licenses/snakeyaml-1.26.jar.sha1

@@ -0,0 +1 @@
+a78a8747147d2c5807683e76ec2b633e95c14fe9

modules/ingest-geoip/licenses/jackson-annotations-2.10.4.jar.sha1

@@ -0,0 +1 @@
+6ae6028aff033f194c9710ad87c224ccaadeed6c

modules/ingest-geoip/licenses/jackson-databind-2.10.4.jar.sha1

@@ -0,0 +1 @@
+76e9152e93d4cf052f93a64596f633ba5b1c8ed9

plugins/discovery-ec2/licenses/jackson-annotations-2.10.4.jar.sha1

@@ -0,0 +1 @@
+6ae6028aff033f194c9710ad87c224ccaadeed6c

plugins/discovery-ec2/licenses/jackson-databind-2.10.4.jar.sha1

@@ -0,0 +1 @@
+76e9152e93d4cf052f93a64596f633ba5b1c8ed9

plugins/repository-azure/azure-storage-blob/build.gradle

@@ -0,0 +1,47 @@
+import org.elasticsearch.gradle.internal.JavaClassPublicifier;
+
+apply plugin: 'elasticsearch.java'
+apply plugin: 'com.github.johnrengelman.shadow'
+
+configurations {
+  originalJar {
+    transitive = false
+  }
+}
+
+dependencies {
+  originalJar "com.azure:azure-storage-blob:${project.parent.versions.azure}"
+  implementation "com.azure:azure-storage-blob:${project.parent.versions.azure}"
+}
+
+// We have to rewrite the service classes to make them public to avoid
+// granting the permission "java.lang.reflect.ReflectPermission" "newProxyInPackage"
+// to this plugin.
+//
+// There are plans to make those public in the azure sdk side, but in the meanwhile
+// we just do this workaround
+// https://github.com/Azure/azure-sdk-for-java/issues/12829#issuecomment-736755543
+List<String> classesToRewrite = ['com/azure/storage/blob/implementation/AppendBlobsImpl$AppendBlobsService.class',
+                                 'com/azure/storage/blob/implementation/BlobsImpl$BlobsService.class',
+                                 'com/azure/storage/blob/implementation/BlockBlobsImpl$BlockBlobsService.class',
+                                 'com/azure/storage/blob/implementation/ContainersImpl$ContainersService.class',
+                                 'com/azure/storage/blob/implementation/DirectorysImpl$DirectorysService.class',
+                                 'com/azure/storage/blob/implementation/PageBlobsImpl$PageBlobsService.class',
+                                 'com/azure/storage/blob/implementation/ServicesImpl$ServicesService.class']
+
+tasks.register('extractClientClasses', Copy).configure {
+  from({ zipTree(configurations.originalJar.singleFile) }) {
+    include "com/azure/storage/blob/implementation/**"
+  }
+  into project.file('build/original')
+}
+
+def modifiedOutput = project.layout.buildDirectory.dir('modified')
+def makePublic = tasks.register('makeClientClassesPublic', JavaClassPublicifier) {
+  dependsOn 'extractClientClasses'
+  classFiles = classesToRewrite
+  inputDir = project.layout.buildDirectory.dir('original')
+  outputDir = modifiedOutput
+}
+
+sourceSets.main.output.dir(modifiedOutput, builtBy: makePublic)

plugins/repository-azure/build.gradle

@@ -22,35 +22,38 @@ esplugin {
 }
 
 versions << [
-  'azure': '12.11.1',
-  'azureCore': '1.16.0',
-  'azureCoreHttpNetty': '1.9.1',
-  'azureAvro': '12.0.4',
+  'azure': '12.9.0',
+  'azureCore': '1.10.0',
+  'azureCoreHttpNetty': '1.6.3',
 
   'jakartaActivation': '1.2.1',
   'jakartaXMLBind': '2.3.2',
   'stax2API': '4.2',
-  'woodstox': '6.2.4',
+  'woodstox': '6.0.2',
 
-  'azureNetty': '4.1.63.Final',
-  'reactorNetty': '1.0.6',
-  'reactorCore': '3.4.5',
+  'reactorNetty': '0.9.12.RELEASE',
+  'reactorCore': '3.3.10.RELEASE',
   '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}"
@@ -62,24 +65,19 @@ dependencies {
   api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
 
   // 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}"
+  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}"
 
   // 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}"
 
@@ -109,7 +107,6 @@ 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'
 }
 
@@ -243,8 +240,6 @@ 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',
@@ -253,23 +248,14 @@ 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',
@@ -279,11 +265,13 @@ 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(
@@ -309,7 +297,11 @@ 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

plugins/repository-azure/licenses/azure-core-1.10.0.jar.sha1

@@ -0,0 +1 @@
+d5e1258ba153b5e27c90b7c9cad262e6fc171d24

plugins/repository-azure/licenses/azure-core-http-netty-1.6.3.jar.sha1

@@ -0,0 +1 @@
+1c72bdc36faad65f53dd160becc38dd93a7356e2

plugins/repository-azure/licenses/azure-storage-common-12.9.0.jar.sha1

@@ -0,0 +1 @@
+42d0439a676e51bb1dea809c60e8a925bb07477c

plugins/repository-azure/licenses/jackson-annotations-2.10.4.jar.sha1

@@ -0,0 +1 @@
+6ae6028aff033f194c9710ad87c224ccaadeed6c

plugins/repository-azure/licenses/jackson-databind-2.10.4.jar.sha1

@@ -0,0 +1 @@
+76e9152e93d4cf052f93a64596f633ba5b1c8ed9

plugins/repository-azure/licenses/jackson-dataformat-xml-2.10.4.jar.sha1

@@ -0,0 +1 @@
+ffd80322264922e7edb6b35139ec1f2f55824156

plugins/repository-azure/licenses/jackson-datatype-jsr310-2.10.4.jar.sha1

@@ -0,0 +1 @@
+de00203e6fee3493c8978a0064a3dda2e8373545

plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.10.4.jar.sha1

@@ -0,0 +1 @@
+68364602aed552c0dcfc5743b393bad95c85b009

plugins/repository-azure/licenses/netty-buffer-4.1.49.Final.jar.sha1

@@ -0,0 +1 @@
+8e819a81bca88d1e88137336f64531a53db0a4ad

plugins/repository-azure/licenses/netty-codec-4.1.49.Final.jar.sha1

@@ -0,0 +1 @@
+20218de83c906348283f548c255650fd06030424

plugins/repository-azure/licenses/netty-codec-http-4.1.49.Final.jar.sha1

@@ -0,0 +1 @@
+4f30dbc462b26c588dffc0eb7552caef1a0f549e

plugins/repository-azure/licenses/netty-codec-http2-4.1.49.Final.jar.sha1

@@ -0,0 +1 @@
+ca35293757f80cd2460c80791757db261615dbe7

plugins/repository-azure/licenses/netty-codec-socks-4.1.49.Final.jar.sha1

@@ -0,0 +1 @@
+df75527823f9fd13f6bd9d9098bd9eb786dcafb5

plugins/repository-azure/licenses/netty-common-4.1.49.Final.jar.sha1

@@ -0,0 +1 @@
+927c8563a1662d869b145e70ce82ad89100f2c90

plugins/repository-azure/licenses/netty-handler-4.1.49.Final.jar.sha1

@@ -0,0 +1 @@
+c73443adb9d085d5dc2d5b7f3bdd91d5963976f7

plugins/repository-azure/licenses/netty-handler-proxy-4.1.49.Final.jar.sha1

@@ -0,0 +1 @@
+6a2064cc62c7d18719742e1e101199c04c66356c

plugins/repository-azure/licenses/netty-resolver-4.1.49.Final.jar.sha1

@@ -0,0 +1 @@
+eb81e1f0eaa99e75983bf3d28cae2b103e0f3a34

plugins/repository-azure/licenses/netty-transport-4.1.49.Final.jar.sha1

@@ -0,0 +1 @@
+415ea7f326635743aec952fe2349ca45959e94a7

plugins/repository-azure/licenses/reactor-core-3.3.10.RELEASE.jar.sha1

@@ -0,0 +1 @@
+f5787f994a9a810c0986418232e06fcf4afc1216