Skip to content

Commit 6c4c4a0

Browse files
rjernstfcofdez
andauthored
Upgrade Azure SDK and Jackson (#72833) (#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 #66555 closes #67214 Co-authored-by: Francisco Fernández Castaño <[email protected]>
1 parent d405d99 commit 6c4c4a0

File tree

89 files changed

+125
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+125
-133
lines changed

buildSrc/version.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ checkstyle = 8.39
99
# optional dependencies
1010
spatial4j = 0.7
1111
jts = 1.15.0
12-
jackson = 2.10.4
13-
snakeyaml = 1.26
12+
jackson = 2.12.2
13+
snakeyaml = 1.27
1414
icu4j = 62.1
1515
supercsv = 2.4.0
1616
# when updating log4j, please update also docs/java-api/index.asciidoc

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8df50138521d05561a308ec2799cc8dda20c06df

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8df50138521d05561a308ec2799cc8dda20c06df

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
71866a16d9678d8d7718baea0a28c7d0e1a67360

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
110be3a2ac0acf51e68967669db47ca9a507e057

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8c549fb29f390f6fd0c20cf0a1d83f7e38dc7ffb

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
359d62567480b07a679dc643f82fc926b100eed5

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0a770cc4c0a1fb0bfd8a150a6a0004e42bc99fca

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5f9d79e09ebf5d54a46e9f4543924cf7ae7654e0

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0a770cc4c0a1fb0bfd8a150a6a0004e42bc99fca

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5f9d79e09ebf5d54a46e9f4543924cf7ae7654e0

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

-47
This file was deleted.

plugins/repository-azure/build.gradle

+40-32
Original file line numberDiff line numberDiff line change
@@ -22,38 +22,35 @@ esplugin {
2222
}
2323

2424
versions << [
25-
'azure': '12.9.0',
26-
'azureCore': '1.10.0',
27-
'azureCoreHttpNetty': '1.6.3',
25+
'azure': '12.11.1',
26+
'azureCore': '1.16.0',
27+
'azureCoreHttpNetty': '1.9.1',
28+
'azureAvro': '12.0.4',
2829

2930
'jakartaActivation': '1.2.1',
3031
'jakartaXMLBind': '2.3.2',
3132
'stax2API': '4.2',
32-
'woodstox': '6.0.2',
33+
'woodstox': '6.2.4',
3334

34-
'reactorNetty': '0.9.12.RELEASE',
35-
'reactorCore': '3.3.10.RELEASE',
35+
'azureNetty': '4.1.63.Final',
36+
'reactorNetty': '1.0.6',
37+
'reactorCore': '3.4.5',
3638
'reactiveStreams': '1.0.3',
3739
]
3840

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

5248
// jackson
5349
api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
5450
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
5551
api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
5652
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
53+
api "com.fasterxml.jackson:jackson-bom:${versions.jackson}"
5754

5855
// jackson xml
5956
api "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${versions.jackson}"
@@ -65,19 +62,24 @@ dependencies {
6562
api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
6663

6764
// netty
68-
api "io.netty:netty-buffer:${versions.netty}"
69-
api "io.netty:netty-codec-http:${versions.netty}"
70-
api "io.netty:netty-codec-http2:${versions.netty}"
71-
api "io.netty:netty-codec-socks:${versions.netty}"
72-
api "io.netty:netty-codec:${versions.netty}"
73-
api "io.netty:netty-common:${versions.netty}"
74-
api "io.netty:netty-handler-proxy:${versions.netty}"
75-
api "io.netty:netty-handler:${versions.netty}"
76-
api "io.netty:netty-resolver:${versions.netty}"
77-
api "io.netty:netty-transport:${versions.netty}"
65+
api "io.netty:netty-buffer:${versions.azureNetty}"
66+
api "io.netty:netty-codec:${versions.azureNetty}"
67+
api "io.netty:netty-codec-dns:${versions.azureNetty}"
68+
api "io.netty:netty-codec-http:${versions.azureNetty}"
69+
api "io.netty:netty-codec-http2:${versions.azureNetty}"
70+
api "io.netty:netty-codec-socks:${versions.azureNetty}"
71+
api "io.netty:netty-common:${versions.azureNetty}"
72+
api "io.netty:netty-handler:${versions.azureNetty}"
73+
api "io.netty:netty-handler-proxy:${versions.azureNetty}"
74+
api "io.netty:netty-resolver:${versions.azureNetty}"
75+
api "io.netty:netty-resolver-dns:${versions.azureNetty}"
76+
api "io.netty:netty-transport:${versions.azureNetty}"
77+
api "io.netty:netty-transport-native-unix-common:${versions.azureNetty}"
7878

7979
// reactor
8080
api "io.projectreactor.netty:reactor-netty:${versions.reactorNetty}"
81+
api "io.projectreactor.netty:reactor-netty-core:${versions.reactorNetty}"
82+
api "io.projectreactor.netty:reactor-netty-http:${versions.reactorNetty}"
8183
api "io.projectreactor:reactor-core:${versions.reactorCore}"
8284
api "org.reactivestreams:reactive-streams:${versions.reactiveStreams}"
8385

@@ -107,6 +109,7 @@ tasks.named("dependencyLicenses").configure {
107109
mapping from: /netty-.*/, to: 'netty'
108110
mapping from: /jaxb-.*/, to: 'jaxb'
109111
mapping from: /stax-.*/, to: 'stax'
112+
mapping from: /reactor-netty-.*/, to: 'reactor-netty'
110113
mapping from: /reactive-streams.*/, to: 'reactive-streams'
111114
}
112115

@@ -240,6 +243,8 @@ tasks.named("thirdPartyAudit").configure {
240243
'io.netty.internal.tcnative.CertificateVerifier',
241244
'io.netty.internal.tcnative.SessionTicketKey',
242245
'io.netty.internal.tcnative.SniHostNameMatcher',
246+
'io.netty.internal.tcnative.SSLSession',
247+
'io.netty.internal.tcnative.SSLSessionCache',
243248

244249
// from io.netty.util.internal.Hidden (netty-common optional dependency)
245250
'reactor.blockhound.BlockHound$Builder',
@@ -248,14 +253,23 @@ tasks.named("thirdPartyAudit").configure {
248253
// it uses NIO
249254
'io.netty.channel.kqueue.KQueue',
250255
'io.netty.channel.kqueue.KQueueDatagramChannel',
256+
'io.netty.channel.kqueue.KQueueDomainSocketChannel',
251257
'io.netty.channel.kqueue.KQueueEventLoopGroup',
258+
'io.netty.channel.kqueue.KQueueServerDomainSocketChannel',
252259
'io.netty.channel.kqueue.KQueueServerSocketChannel',
253260
'io.netty.channel.kqueue.KQueueSocketChannel',
254261
'io.netty.channel.epoll.Epoll',
255262
'io.netty.channel.epoll.EpollDatagramChannel',
263+
'io.netty.channel.epoll.EpollDomainSocketChannel',
256264
'io.netty.channel.epoll.EpollEventLoopGroup',
265+
'io.netty.channel.epoll.EpollServerDomainSocketChannel',
257266
'io.netty.channel.epoll.EpollServerSocketChannel',
258267
'io.netty.channel.epoll.EpollSocketChannel',
268+
'io.netty.incubator.channel.uring.IOUring',
269+
'io.netty.incubator.channel.uring.IOUringDatagramChannel',
270+
'io.netty.incubator.channel.uring.IOUringEventLoopGroup',
271+
'io.netty.incubator.channel.uring.IOUringServerSocketChannel',
272+
'io.netty.incubator.channel.uring.IOUringSocketChannel',
259273

260274
// from reactor.netty.http.server.HttpServer (reactor-netty)
261275
'io.netty.handler.codec.haproxy.HAProxyMessage',
@@ -265,13 +279,11 @@ tasks.named("thirdPartyAudit").configure {
265279
'org.osgi.framework.BundleActivator',
266280
'org.osgi.framework.BundleContext',
267281

268-
// from com.ctc.wstx.shaded.msv_core.driver.textui.Driver (woodstox-core)
269-
'com.sun.org.apache.xml.internal.resolver.Catalog',
270-
'com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver',
271-
272282
'org.slf4j.impl.StaticLoggerBinder',
273283
'org.slf4j.impl.StaticMDCBinder',
274284
'org.slf4j.impl.StaticMarkerBinder',
285+
286+
'com.ctc.wstx.shaded.msv_core.driver.textui.Driver',
275287
)
276288

277289
ignoreViolations(
@@ -297,11 +309,7 @@ tasks.named("thirdPartyAudit").configure {
297309
'javax.activation.MailcapCommandMap',
298310
'javax.activation.MimetypesFileTypeMap',
299311

300-
'reactor.core.publisher.MultiProducerRingBuffer',
301-
'reactor.core.publisher.RingBufferFields',
302312
'reactor.core.publisher.Traces$SharedSecretsCallSiteSupplierFactory$TracingException',
303-
'reactor.core.publisher.UnsafeSequence',
304-
'reactor.core.publisher.UnsafeSupport'
305313
)
306314
}
307315
boolean useFixture = false

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4942bfa35a89a1fc9cabd18427a9b450d392215b

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b78134e2715eaef150ae3786806ff640bd0439ba
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ac89edaa19ee481c832970e944af16b3b772881a
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
61b336d02e1d8839d68db47d884574fe41535e04

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
39733586ba04415ce64b186e17e1f8d9e28f2972

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0a770cc4c0a1fb0bfd8a150a6a0004e42bc99fca

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5f9d79e09ebf5d54a46e9f4543924cf7ae7654e0

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dac1d21b5fe602d492273d35eb28918a91fc5412

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
00012e36d12f47b4648e2cfe0b12bdcc2c4649bf

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f226bd0766b4e81493822e8c81eaa6cab27e589f

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
40028ce5ac7c43f1c9a1439f74637cad04013e23

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d4d2fccea88c80e56d59ce1053c53df0f9f4f5db
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
91c445232b12e13bf6757579a39bab81e1233af5

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f8c9b159dcb76452dc98a370a5511ff993670419

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
294e90696d8d6e20c889511d2484b37158cb9caa

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
97707b764c9287836dcf626dd03c81f3bbfc86c6

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e1206b46384d4dcbecee2901f18ce65ecf02e8a4

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
879a43c2325b08e92e8967218b6ddb0ed4b7a0d3

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d8cbdc537d75f219c04a057b984b2f0b55c1dbff

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d07cd47c101dfa655d6d5cc304d523742fd78ca8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f44dc8ed52ff8528a88c157879c9baffe464fa46

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
09a8bbe1ba082c9434e6f524d3864a53f340f2df
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
85bd91382ec54b300ad3ff59efccbb4fccb22a88

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

-1
This file was deleted.

0 commit comments

Comments
 (0)