Skip to content

Commit 351d234

Browse files
fcofdezfcofdez
authored
Upgrade Azure SDK to version 12.14.4 (#83884)
1 parent b841b5f commit 351d234

35 files changed

Lines changed: 76 additions & 104 deletions

‎modules/repository-azure/azure-storage-blob/build.gradle‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎modules/repository-azure/build.gradle‎

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,50 +23,47 @@ esplugin {
2323
}
2424

2525
versions << [
26-
'azure': '12.9.0',
27-
'azureCore': '1.10.0',
28-
'azureCoreHttpNetty': '1.6.3',
26+
'azure': '12.14.4',
27+
'azureCommon': '12.14.3',
28+
'azureCore': '1.25.0',
29+
'azureCoreHttpNetty': '1.11.7',
30+
'azureJackson': '2.13.2',
31+
'azureJacksonDatabind': '2.13.2.2',
2932

3033
'jakartaActivation': '1.2.1',
3134
'jakartaXMLBind': '2.3.2',
32-
'stax2API': '4.2',
33-
'woodstox': '6.0.2',
35+
'stax2API': '4.2.1',
36+
'woodstox': '6.2.7',
3437

35-
'reactorNetty': '0.9.12.RELEASE',
36-
'reactorCore': '3.3.10.RELEASE',
38+
'reactorNetty': '1.0.14',
39+
'reactorCore': '3.4.13',
3740
'reactiveStreams': '1.0.3',
3841
]
3942

4043
dependencies {
41-
api project(path: 'azure-storage-blob', configuration: 'shadow')
42-
if (isEclipse) {
43-
/*
44-
* Eclipse can't pick up the shadow dependency so we point it at *something*
45-
* so it can compile things.
46-
*/
47-
api project(path: 'azure-storage-blob')
48-
}
49-
api "com.azure:azure-storage-common:${versions.azure}"
44+
api "com.azure:azure-storage-blob:${versions.azure}"
45+
api "com.azure:azure-storage-common:${versions.azureCommon}"
5046
api "com.azure:azure-core-http-netty:${versions.azureCoreHttpNetty}"
5147
api "com.azure:azure-core:${versions.azureCore}"
5248

5349
// jackson
54-
api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
55-
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
56-
api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
57-
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
50+
api "com.fasterxml.jackson.core:jackson-core:${versions.azureJackson}"
51+
api "com.fasterxml.jackson.core:jackson-databind:${versions.azureJacksonDatabind}"
52+
api "com.fasterxml.jackson.core:jackson-annotations:${versions.azureJackson}"
5853

5954
// jackson xml
60-
api "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${versions.jackson}"
61-
api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.jackson}"
62-
api "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${versions.jackson}"
55+
api "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${versions.azureJackson}"
56+
api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.azureJackson}"
57+
api "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${versions.azureJackson}"
6358
api "jakarta.activation:jakarta.activation-api:${versions.jakartaActivation}"
59+
// The SDK uses javax.xml bindings
6460
api "jakarta.xml.bind:jakarta.xml.bind-api:${versions.jakartaXMLBind}"
6561
api "org.codehaus.woodstox:stax2-api:${versions.stax2API}"
6662
api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
6763

6864
// netty
6965
api "io.netty:netty-buffer:${versions.netty}"
66+
api "io.netty:netty-codec-dns:${versions.netty}"
7067
api "io.netty:netty-codec-http:${versions.netty}"
7168
api "io.netty:netty-codec-http2:${versions.netty}"
7269
api "io.netty:netty-codec-socks:${versions.netty}"
@@ -75,10 +72,13 @@ dependencies {
7572
api "io.netty:netty-handler-proxy:${versions.netty}"
7673
api "io.netty:netty-handler:${versions.netty}"
7774
api "io.netty:netty-resolver:${versions.netty}"
75+
api "io.netty:netty-resolver-dns:${versions.netty}"
7876
api "io.netty:netty-transport:${versions.netty}"
77+
api "io.netty:netty-transport-native-unix-common:${versions.netty}"
7978

8079
// reactor
81-
api "io.projectreactor.netty:reactor-netty:${versions.reactorNetty}"
80+
api "io.projectreactor.netty:reactor-netty-core:${versions.reactorNetty}"
81+
api "io.projectreactor.netty:reactor-netty-http:${versions.reactorNetty}"
8282
api "io.projectreactor:reactor-core:${versions.reactorCore}"
8383
api "org.reactivestreams:reactive-streams:${versions.reactiveStreams}"
8484

@@ -110,6 +110,7 @@ tasks.named("dependencyLicenses").configure {
110110
mapping from: /netty-.*/, to: 'netty'
111111
mapping from: /jaxb-.*/, to: 'jaxb'
112112
mapping from: /stax-.*/, to: 'stax'
113+
mapping from: /reactor-netty-.*/, to: 'reactor-netty'
113114
mapping from: /reactive-streams.*/, to: 'reactive-streams'
114115
}
115116

@@ -122,6 +123,11 @@ tasks.named("thirdPartyAudit").configure {
122123
'com.aayushatharva.brotli4j.encoder.Encoder$Mode',
123124
'com.aayushatharva.brotli4j.encoder.Encoder$Parameters',
124125

126+
'com.azure.storage.internal.avro.implementation.AvroObject',
127+
'com.azure.storage.internal.avro.implementation.AvroReader',
128+
'com.azure.storage.internal.avro.implementation.AvroReaderFactory',
129+
'com.azure.storage.internal.avro.implementation.schema.AvroSchema',
130+
125131
// from reactory-netty metric collection
126132
'io.micrometer.core.instrument.Clock',
127133
'io.micrometer.core.instrument.Counter',
@@ -255,11 +261,17 @@ tasks.named("thirdPartyAudit").configure {
255261
'io.netty.channel.kqueue.KQueueDatagramChannel',
256262
'io.netty.channel.kqueue.KQueueServerSocketChannel',
257263
'io.netty.channel.kqueue.KQueueSocketChannel',
264+
258265
'io.netty.channel.epoll.Epoll',
259266
'io.netty.channel.epoll.EpollDatagramChannel',
260267
'io.netty.channel.epoll.EpollServerSocketChannel',
261268
'io.netty.channel.epoll.EpollSocketChannel',
262269

270+
'io.netty.incubator.channel.uring.IOUring',
271+
'io.netty.incubator.channel.uring.IOUringDatagramChannel',
272+
'io.netty.incubator.channel.uring.IOUringServerSocketChannel',
273+
'io.netty.incubator.channel.uring.IOUringSocketChannel',
274+
263275
// from reactor.netty.http.server.HttpServer (reactor-netty)
264276
'io.netty.handler.codec.haproxy.HAProxyMessage',
265277
'io.netty.handler.codec.haproxy.HAProxyMessageDecoder',
@@ -269,8 +281,7 @@ tasks.named("thirdPartyAudit").configure {
269281
'org.osgi.framework.BundleContext',
270282

271283
// from com.ctc.wstx.shaded.msv_core.driver.textui.Driver (woodstox-core)
272-
'com.sun.org.apache.xml.internal.resolver.Catalog',
273-
'com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver',
284+
'com.ctc.wstx.shaded.msv_core.driver.textui.Driver',
274285
// [missing classes] SLF4j includes an optional class that depends on an extension class. see Log4jLogger#createConverter
275286
'org.slf4j.ext.EventData'
276287
)
@@ -297,12 +308,7 @@ tasks.named("thirdPartyAudit").configure {
297308

298309
'javax.activation.MailcapCommandMap',
299310
'javax.activation.MimetypesFileTypeMap',
300-
301-
'reactor.core.publisher.MultiProducerRingBuffer',
302-
'reactor.core.publisher.RingBufferFields',
303311
'reactor.core.publisher.Traces$SharedSecretsCallSiteSupplierFactory$TracingException',
304-
'reactor.core.publisher.UnsafeSequence',
305-
'reactor.core.publisher.UnsafeSupport'
306312
)
307313
}
308314
boolean useFixture = false

‎modules/repository-azure/licenses/azure-core-1.10.0.jar.sha1‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎modules/repository-azure/licenses/azure-core-1.25.0.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
85db86803538e6d01051ae9ee21f56684ea9995b

‎modules/repository-azure/licenses/azure-core-http-netty-1.11.7.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c6b14fcca3e75acc8dbe07ac101afd05d48a1647

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

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎modules/repository-azure/licenses/azure-storage-blob-12.14.4.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2b92020693d09e4980b96d278e8038a1087afea0

‎modules/repository-azure/licenses/azure-storage-common-12.14.3.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e8d6258aa8bf1594980c01294e60de74d13a815f

‎modules/repository-azure/licenses/azure-storage-common-12.9.0.jar.sha1‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎modules/repository-azure/licenses/jackson-annotations-2.10.4.jar.sha1‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)