Upgrade Azure SDK

docs/changelog/111225.yaml

@@ -0,0 +1,5 @@
+pr: 111225
+summary: Upgrade Azure SDK
+area: Snapshot/Restore
+type: upgrade
+issues: []

gradle/verification-metadata.xml

@@ -119,29 +119,39 @@
             <sha256 value="bc818ee3015f7cea73d5a603fc7a542ad82ebb5799e406d9abc81ac42caa90f0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.azure" name="azure-core" version="1.34.0">
-         <artifact name="azure-core-1.34.0.jar">
-            <sha256 value="74f02bbac2dd5485b4e3b3fb7b8cb70232039af27014a7d2938d0c186e051e40" origin="Generated by Gradle"/>
+      <component group="com.azure" name="azure-core" version="1.50.0">
+         <artifact name="azure-core-1.50.0.jar">
+            <sha256 value="71ef89bafb09b2e8df66e0d422e1809f1d9325d68e45fa74980b416f48b90cef" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.azure" name="azure-core-http-netty" version="1.12.7">
-         <artifact name="azure-core-http-netty-1.12.7.jar">
-            <sha256 value="24d15d722bef5be7065b835ff413ab045136bd5a3927a00647cfa7413bea3bce" origin="Generated by Gradle"/>
+      <component group="com.azure" name="azure-core-http-netty" version="1.15.1">
+         <artifact name="azure-core-http-netty-1.15.1.jar">
+            <sha256 value="e07002835364c67a9267fd019ee1019dc9ea865491b6b1d4f9b8c8809fc1bae7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.azure" name="azure-storage-blob" version="12.20.1">
-         <artifact name="azure-storage-blob-12.20.1.jar">
-            <sha256 value="9a568f03f555cd3dc7c46fed557ea65a0aa00b5eaff1e47e3e21462a863504ba" origin="Generated by Gradle"/>
+      <component group="com.azure" name="azure-json" version="1.1.0">
+         <artifact name="azure-json-1.1.0.jar">
+            <sha256 value="114af9b1459c9c93190b2a82f427c0e93fbbb28896fc57f2585a9b821275ca56" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.azure" name="azure-storage-common" version="12.19.1">
-         <artifact name="azure-storage-common-12.19.1.jar">
-            <sha256 value="0e67a261c1088b9d688d7461e27da95f6830bdde713420b0d783ae1025c4d384" origin="Generated by Gradle"/>
+      <component group="com.azure" name="azure-storage-blob" version="12.26.1">
+         <artifact name="azure-storage-blob-12.26.1.jar">
+            <sha256 value="9345bcae2c9a727b3bce2b715faa484caa0f3195aacbc9577a3dd055ac1cde1e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.azure" name="azure-storage-internal-avro" version="12.5.3">
-         <artifact name="azure-storage-internal-avro-12.5.3.jar">
-            <sha256 value="7cbebf7710808f3689fb6acf1384e710e13ecd74bfedbe6fa8cb467eaa156d83" origin="Generated by Gradle"/>
+      <component group="com.azure" name="azure-storage-common" version="12.26.0">
+         <artifact name="azure-storage-common-12.26.0.jar">
+            <sha256 value="a11c44c699ed1a112fd7a7001e3964062bd9366de70b4822e4c776b4587a3e2f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.azure" name="azure-storage-internal-avro" version="12.11.1">
+         <artifact name="azure-storage-internal-avro-12.11.1.jar">
+            <sha256 value="f66862923abcf5f652d3c2ca069ebbcefbb244ca74e78bf734b96b8933087631" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.azure" name="azure-xml" version="1.0.0">
+         <artifact name="azure-xml-1.0.0.jar">
+            <sha256 value="438b90eb6f8efa78e06efda132ecd7592b6fb451cc7110bdf202aa17d16a3da7" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.bettercloud" name="vault-java-driver" version="4.1.0">
@@ -271,11 +281,6 @@
             <sha256 value="91adcd3dcf5fd9a16499934e7536a23d456692a0093e3d4fd52f138c3936348c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.15.4">
-         <artifact name="jackson-annotations-2.15.4.jar">
-            <sha256 value="f204ebbd552614a22b8531ffe350d47f8fd42c45bb60517c07974dc27a5a1dd3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.10.5">
          <artifact name="jackson-core-2.10.5.jar">
             <sha256 value="2656010d1e921ac69b76fc7e0c0f5a6b14aca62fa9603e78831e6148eb7c77ba" origin="Generated by Gradle"/>
@@ -296,11 +301,6 @@
             <sha256 value="5b483f68fa9dd6aa37da37d1f79dd5c4b9464238f4f0660a242cb6b5c724950c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.15.4">
-         <artifact name="jackson-core-2.15.4.jar">
-            <sha256 value="8dc9210dd285db366f45f518dd1e6a9ccfeb0f1a8e184a899fe96d29edf1fd94" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.10.5.1">
          <artifact name="jackson-databind-2.10.5.1.jar">
             <sha256 value="f93db83891a53e8d268e2cc8fcd88ead2981edc2163e35c2a52c88d9ab57b4a0" origin="Generated by Gradle"/>
@@ -341,14 +341,9 @@
             <sha256 value="bc9d5020ffce81eca245c9148054600134a209b3d279d7be38fa4f2c07f7a505" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-xml" version="2.13.4">
-         <artifact name="jackson-dataformat-xml-2.13.4.jar">
-            <sha256 value="76fbf0cedd51af6a13aba39c27c8c29a5a280dc24ee66577d559e4660d8709ce" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-xml" version="2.15.4">
-         <artifact name="jackson-dataformat-xml-2.15.4.jar">
-            <sha256 value="90d8109cda7b90c494a7bfde44e96e2fa25021191b67a5924dfa5cbd698025c3" origin="Generated by Gradle"/>
+      <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-xml" version="2.15.0">
+         <artifact name="jackson-dataformat-xml-2.15.0.jar">
+            <sha256 value="e3137c89b08d0c3d9f7dfeae11d5b941b310f5f7bfdea90063f29c0b3b1f6807" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.14.2">
@@ -361,14 +356,9 @@
             <sha256 value="691a0a605de15ea610180317331957fe6f7e91f45471ee45cbf9832d74291c31" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" version="2.13.4">
-         <artifact name="jackson-datatype-jsr310-2.13.4.jar">
-            <sha256 value="5ad75d210bacc17271925da28e1f393aaf8c83f6c92fbe5b2ed61954b84decf7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" version="2.15.4">
-         <artifact name="jackson-datatype-jsr310-2.15.4.jar">
-            <sha256 value="472498cbba2726012ff82f86fc8feef9593663bda1a695a17db804a63fa733ff" origin="Generated by Gradle"/>
+      <component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" version="2.15.0">
+         <artifact name="jackson-datatype-jsr310-2.15.0.jar">
+            <sha256 value="d5deb92d59668a8de0ac8da818d5d9c0fdfb4db6b2f1d66a779fe357f310d648" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.fasterxml.jackson.jaxrs" name="jackson-jaxrs-base" version="2.10.5">
@@ -386,14 +376,9 @@
             <sha256 value="994a0a510a35d55a869567807075736597da97e9d36ad1ebaff5e37def5a55d3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.fasterxml.jackson.module" name="jackson-module-jaxb-annotations" version="2.13.4">
-         <artifact name="jackson-module-jaxb-annotations-2.13.4.jar">
-            <sha256 value="b23725fd92b783e3ddc149d23f565b9da5bdfc98361be81488ff4e45e6735ba1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.fasterxml.jackson.module" name="jackson-module-jaxb-annotations" version="2.15.4">
-         <artifact name="jackson-module-jaxb-annotations-2.15.4.jar">
-            <sha256 value="20bf4d2ce22fa76c6feba48dc2e770bfeb313a36f984e00e3403af405e1c83b2" origin="Generated by Gradle"/>
+      <component group="com.fasterxml.jackson.module" name="jackson-module-jaxb-annotations" version="2.15.0">
+         <artifact name="jackson-module-jaxb-annotations-2.15.0.jar">
+            <sha256 value="7f2083eb676dfbcfb380f4e634ad41b9ba6f25d6bb5a462465d8adc83faca0d5" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.fasterxml.woodstox" name="woodstox-core" version="5.3.0">
@@ -1471,19 +1456,19 @@
             <sha256 value="3cabdae2244c999addebb8c31ae452fbdc874b4f26a163539954b8eeb5d6acc6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.projectreactor" name="reactor-core" version="3.4.34">
-         <artifact name="reactor-core-3.4.34.jar">
-            <sha256 value="b324c0921f97bd73a9aebffbf59ac45eeb48d9eab9bce67c23ad0bc83b513d87" origin="Generated by Gradle"/>
+      <component group="io.projectreactor" name="reactor-core" version="3.4.38">
+         <artifact name="reactor-core-3.4.38.jar">
+            <sha256 value="a9255f60d92e8fc58c3c87320cc439936e08227db65bd88eb97e844af853e608" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.projectreactor.netty" name="reactor-netty-core" version="1.0.39">
-         <artifact name="reactor-netty-core-1.0.39.jar">
-            <sha256 value="f7c2330852a7c2a96de4847eb1dc906a458c9573a2cdde3cefc69300c0c5c68c" origin="Generated by Gradle"/>
+      <component group="io.projectreactor.netty" name="reactor-netty-core" version="1.0.45">
+         <artifact name="reactor-netty-core-1.0.45.jar">
+            <sha256 value="b38fdbc0618bc193359bb32807bc17b691fed42259dd27aa02b18ddbcf2b0844" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.projectreactor.netty" name="reactor-netty-http" version="1.0.39">
-         <artifact name="reactor-netty-http-1.0.39.jar">
-            <sha256 value="399eeee2917e87044b0c64a47456c69bb85edec284a5643e4f6c67affecbbdcc" origin="Generated by Gradle"/>
+      <component group="io.projectreactor.netty" name="reactor-netty-http" version="1.0.45">
+         <artifact name="reactor-netty-http-1.0.45.jar">
+            <sha256 value="f657ebfcf8115008fa8c55e75200da886a45f22c488d82ddaaf013ffccb65205" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.sgr" name="s2-geometry-library-java" version="1.0.1">
@@ -1501,6 +1486,11 @@
             <sha256 value="69156304079bdeed9fc0ae3b39389f19b3cc4ba4443bc80508995394ead742ea" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="jakarta.xml.bind" name="jakarta.xml.bind-api" version="2.3.3">
+         <artifact name="jakarta.xml.bind-api-2.3.3.jar">
+            <sha256 value="c04539f472e9a6dd0c7685ea82d677282269ab8e7baca2e14500e381e0c6cec5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="javax.activation" name="activation" version="1.1">
          <artifact name="activation-1.1.jar">
             <sha256 value="2881c79c9d6ef01c58e62beea13e9d1ac8b8baa16f2fc198ad6e6776defdcdd3" origin="Generated by Gradle"/>

modules/repository-azure/build.gradle

@@ -17,65 +17,51 @@ esplugin {
 }
 
 versions << [
-  'azure': '12.20.1',
-  'azureCommon': '12.19.1',
-  'azureCore': '1.34.0',
-  'azureCoreHttpNetty': '1.12.7',
-  'azureJackson': '2.15.4',
-  'azureJacksonDatabind': '2.13.4.2',
-  'azureAvro': '12.5.3',
-
-  'jakartaActivation': '1.2.1',
-  'jakartaXMLBind': '2.3.2',
-  'stax2API': '4.2.1',
-  'woodstox': '6.4.0',
-
-  'reactorNetty': '1.0.39',
-  'reactorCore': '3.4.34',
-  'reactiveStreams': '1.0.4',
+  'azureReactorNetty': '1.0.45',
 ]
 
 dependencies {
-  api "com.azure:azure-storage-blob:${versions.azure}"
-  api "com.azure:azure-storage-common:${versions.azureCommon}"
-  api "com.azure:azure-core-http-netty:${versions.azureCoreHttpNetty}"
-  api "com.azure:azure-core:${versions.azureCore}"
-  // jackson
-  api "com.fasterxml.jackson.core:jackson-core:${versions.azureJackson}"
-  api "com.fasterxml.jackson.core:jackson-databind:${versions.azureJacksonDatabind}"
-  api "com.fasterxml.jackson.core:jackson-annotations:${versions.azureJackson}"
-
-  // jackson xml
-  api "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${versions.azureJackson}"
-  api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.azureJackson}"
-  api "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${versions.azureJackson}"
-  api "jakarta.activation:jakarta.activation-api:${versions.jakartaActivation}"
-  // The SDK uses javax.xml bindings
-  api "jakarta.xml.bind:jakarta.xml.bind-api:${versions.jakartaXMLBind}"
-  api "org.codehaus.woodstox:stax2-api:${versions.stax2API}"
-  api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
-
-  // netty
+  // Microsoft
+  api "com.azure:azure-core-http-netty:1.15.1"
+  api "com.azure:azure-core:1.50.0"
+  api "com.azure:azure-json:1.1.0"
+  api "com.azure:azure-storage-blob:12.26.1"
+  api "com.azure:azure-storage-common:12.26.0"
+  api "com.azure:azure-storage-internal-avro:12.11.1"
+  api "com.azure:azure-xml:1.0.0"
+
+  // 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.dataformat:jackson-dataformat-xml:${versions.jackson}"
+  api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.jackson}"
+  api "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${versions.jackson}"
+
+  // Netty
   api "io.netty:netty-codec-dns:${versions.netty}"
   api "io.netty:netty-codec-http2:${versions.netty}"
   api "io.netty:netty-codec-socks:${versions.netty}"
   api "io.netty:netty-handler-proxy:${versions.netty}"
   api "io.netty:netty-resolver-dns:${versions.netty}"
 
-  // reactor
-  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}"
+  // Reactor
+  api "io.projectreactor.netty:reactor-netty-core:${versions.azureReactorNetty}"
+  api "io.projectreactor.netty:reactor-netty-http:${versions.azureReactorNetty}"
+  api "io.projectreactor:reactor-core:3.4.38"
+  api "org.reactivestreams:reactive-streams:1.0.4"
+
+  // Others
+  api "com.fasterxml.woodstox:woodstox-core:6.4.0"
+  api "jakarta.activation:jakarta.activation-api:1.2.1"
+  api "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3"
+  api "org.codehaus.woodstox:stax2-api:4.2.1"
 
   implementation project(":modules:transport-netty4")
   implementation("org.slf4j:slf4j-api:${versions.slf4j}")
   runtimeOnly "org.slf4j:slf4j-nop:${versions.slf4j}"
 //  runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}") https://github.com/elastic/elasticsearch/issues/93714
 
-
-  runtimeOnly "com.azure:azure-storage-internal-avro:${versions.azureAvro}"
-
   testImplementation project(':test:fixtures:azure-fixture')
   yamlRestTestImplementation project(':test:fixtures:azure-fixture')
 }

modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureRepositoryPlugin.java

@@ -27,6 +27,8 @@
 import org.elasticsearch.threadpool.ScalingExecutorBuilder;
 import org.elasticsearch.xcontent.NamedXContentRegistry;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -42,9 +44,8 @@ public class AzureRepositoryPlugin extends Plugin implements RepositoryPlugin, R
     public static final String NETTY_EVENT_LOOP_THREAD_POOL_NAME = "azure_event_loop";
 
     static {
-        // Trigger static initialization with the plugin class loader
-        // so we have access to the proper xml parser
-        JacksonAdapter.createDefaultSerializerAdapter();
+        // Trigger static initialization with the plugin class loader so we have access to the proper xml parser
+        AccessController.doPrivileged((PrivilegedAction<Object>) JacksonAdapter::createDefaultSerializerAdapter);
     }
 
     // protected for testing