Skip to content

Commit 645ca16

Browse files
committed
Upgrade Azure SDK and Jackson (elastic#72833)
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
1 parent 0937c3f commit 645ca16

File tree

87 files changed

+89
-119
lines changed

Some content is hidden

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

87 files changed

+89
-119
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

+41-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.0',
26+
'azureCore': '1.15.0',
27+
'azureCoreHttpNetty': '1.9.1',
28+
'azureAvro': '12.0.3',
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.60.Final',
36+
'reactorNetty': '1.0.4',
37+
'reactorCore': '3.4.3',
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,25 @@ 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-resolver-dns-native-macos:${versions.azureNetty}"
77+
api "io.netty:netty-transport:${versions.azureNetty}"
78+
api "io.netty:netty-transport-native-unix-common:${versions.azureNetty}"
7879

7980
// reactor
8081
api "io.projectreactor.netty:reactor-netty:${versions.reactorNetty}"
82+
api "io.projectreactor.netty:reactor-netty-core:${versions.reactorNetty}"
83+
api "io.projectreactor.netty:reactor-netty-http:${versions.reactorNetty}"
8184
api "io.projectreactor:reactor-core:${versions.reactorCore}"
8285
api "org.reactivestreams:reactive-streams:${versions.reactiveStreams}"
8386

@@ -107,6 +110,7 @@ tasks.named("dependencyLicenses").configure {
107110
mapping from: /netty-.*/, to: 'netty'
108111
mapping from: /jaxb-.*/, to: 'jaxb'
109112
mapping from: /stax-.*/, to: 'stax'
113+
mapping from: /reactor-netty-.*/, to: 'reactor-netty'
110114
mapping from: /reactive-streams.*/, to: 'reactive-streams'
111115
}
112116

@@ -240,6 +244,8 @@ tasks.named("thirdPartyAudit").configure {
240244
'io.netty.internal.tcnative.CertificateVerifier',
241245
'io.netty.internal.tcnative.SessionTicketKey',
242246
'io.netty.internal.tcnative.SniHostNameMatcher',
247+
'io.netty.internal.tcnative.SSLSession',
248+
'io.netty.internal.tcnative.SSLSessionCache',
243249

244250
// from io.netty.util.internal.Hidden (netty-common optional dependency)
245251
'reactor.blockhound.BlockHound$Builder',
@@ -248,14 +254,23 @@ tasks.named("thirdPartyAudit").configure {
248254
// it uses NIO
249255
'io.netty.channel.kqueue.KQueue',
250256
'io.netty.channel.kqueue.KQueueDatagramChannel',
257+
'io.netty.channel.kqueue.KQueueDomainSocketChannel',
251258
'io.netty.channel.kqueue.KQueueEventLoopGroup',
259+
'io.netty.channel.kqueue.KQueueServerDomainSocketChannel',
252260
'io.netty.channel.kqueue.KQueueServerSocketChannel',
253261
'io.netty.channel.kqueue.KQueueSocketChannel',
254262
'io.netty.channel.epoll.Epoll',
255263
'io.netty.channel.epoll.EpollDatagramChannel',
264+
'io.netty.channel.epoll.EpollDomainSocketChannel',
256265
'io.netty.channel.epoll.EpollEventLoopGroup',
266+
'io.netty.channel.epoll.EpollServerDomainSocketChannel',
257267
'io.netty.channel.epoll.EpollServerSocketChannel',
258268
'io.netty.channel.epoll.EpollSocketChannel',
269+
'io.netty.incubator.channel.uring.IOUring',
270+
'io.netty.incubator.channel.uring.IOUringDatagramChannel',
271+
'io.netty.incubator.channel.uring.IOUringEventLoopGroup',
272+
'io.netty.incubator.channel.uring.IOUringServerSocketChannel',
273+
'io.netty.incubator.channel.uring.IOUringSocketChannel',
259274

260275
// from reactor.netty.http.server.HttpServer (reactor-netty)
261276
'io.netty.handler.codec.haproxy.HAProxyMessage',
@@ -265,13 +280,11 @@ tasks.named("thirdPartyAudit").configure {
265280
'org.osgi.framework.BundleActivator',
266281
'org.osgi.framework.BundleContext',
267282

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-
272283
'org.slf4j.impl.StaticLoggerBinder',
273284
'org.slf4j.impl.StaticMDCBinder',
274285
'org.slf4j.impl.StaticMarkerBinder',
286+
287+
'com.ctc.wstx.shaded.msv_core.driver.textui.Driver'
275288
)
276289

277290
ignoreViolations(
@@ -297,11 +310,7 @@ tasks.named("thirdPartyAudit").configure {
297310
'javax.activation.MailcapCommandMap',
298311
'javax.activation.MimetypesFileTypeMap',
299312

300-
'reactor.core.publisher.MultiProducerRingBuffer',
301-
'reactor.core.publisher.RingBufferFields',
302313
'reactor.core.publisher.Traces$SharedSecretsCallSiteSupplierFactory$TracingException',
303-
'reactor.core.publisher.UnsafeSequence',
304-
'reactor.core.publisher.UnsafeSupport'
305314
)
306315
}
307316
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+
9b09ba7b632e1765ed24438e4f77439986960d1c

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+
698e69649a927c60e6a1981e89b0e55677a1f8ff
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a566e6c8a4099af0265f21f20ea712e355deb295

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+
9e7327f5b25dee8f92374bbcdabb1081bd896af0

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+
9d213d090deeca2541ad6827eb3345bcd6e1e701

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+
b740d51babe3312a33b505cd8b62c02f3731b2e3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7abc81f9d79f5dc1d734e5174c8cfaf8a32cf981

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+
354ca712f909fcd9d8a22e16bf84afcfdc44ec8d

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+
23b13e78d704f337b12000d1ad27dbdb2aa07ba1

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+
6f4573281df659265bd709fd10471c3e00ef6c70

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+
44540113f7148f1014be879663501db8da1c37b0

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+
14e28bab0173be10c9631a85069636a0d0221dfe

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+
2352f12826400e5db64b36fd951508ce9a61c196

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+
caba5004618d27386ee9d5ee8b23b09b6548fb0b
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
45950bf7fd55ef3c536131ed3ce00c3c2b7f27ce
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
37bafe5e51557c7c1cdfc2a528cb4be74917b985

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+
94350c81cc7a78212fb0f52a500f22d1aa9c44d8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fad098b98df67e50135c67e4a26af56c7800daf4

0 commit comments

Comments
 (0)