Skip to content

Commit f454cef

Browse files
rjernstfcofdezmark-vieira
authored
Upgrade Azure SDK and Jackson (#72833) (#72995) (#73493)
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 backport #72995 backport #73011 Co-authored-by: Francisco Fernández Castaño <[email protected]> Co-authored-by: Mark Vieira <[email protected]>
1 parent 3182482 commit f454cef

File tree

126 files changed

+139
-143
lines changed

Some content is hidden

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

126 files changed

+139
-143
lines changed

buildSrc/src/main/groovy/elasticsearch.ide.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if (System.getProperty('idea.active') == 'true') {
9999
tasks.register('buildDependencyArtifacts') {
100100
group = 'ide'
101101
description = 'Builds artifacts needed as dependency for IDE modules'
102-
dependsOn ':plugins:repository-hdfs:hadoop-common:shadowJar', ':plugins:repository-azure:azure-storage-blob:shadowJar'
102+
dependsOn ':plugins:repository-hdfs:hadoop-common:shadowJar'
103103
}
104104

105105
idea {

buildSrc/version.properties

+3-3
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
@@ -20,7 +20,7 @@ slf4j = 1.6.2
2020
# when updating the JNA version, also update the version in buildSrc/build.gradle
2121
jna = 5.7.0-1
2222

23-
netty = 4.1.49.Final
23+
netty = 4.1.63.Final
2424
joda = 2.10.10
2525

2626
commons_lang3 = 3.9

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

modules/transport-netty4/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ tasks.named("thirdPartyAudit").configure {
122122
'io.netty.internal.tcnative.SSL',
123123
'io.netty.internal.tcnative.SSLContext',
124124
'io.netty.internal.tcnative.SSLPrivateKeyMethod',
125+
'io.netty.internal.tcnative.SSLSession',
126+
'io.netty.internal.tcnative.SSLSessionCache',
125127

126128
// from io.netty.handler.ssl.util.BouncyCastleSelfSignedCertGenerator (netty)
127129
'org.bouncycastle.cert.X509v3CertificateBuilder',

modules/transport-netty4/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

modules/transport-netty4/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

modules/transport-netty4/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

modules/transport-netty4/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

modules/transport-netty4/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

modules/transport-netty4/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

modules/transport-netty4/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

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

+31-23
Original file line numberDiff line numberDiff line change
@@ -22,38 +22,34 @@ 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+
'reactorNetty': '1.0.6',
36+
'reactorCore': '3.4.5',
3637
'reactiveStreams': '1.0.3',
3738
]
3839

3940
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-
}
4841
api "com.azure:azure-storage-common:${versions.azure}"
42+
api "com.azure:azure-storage-blob:${versions.azure}"
4943
api "com.azure:azure-core-http-netty:${versions.azureCoreHttpNetty}"
5044
api "com.azure:azure-core:${versions.azureCore}"
45+
api "com.azure:azure-storage-internal-avro:${versions.azureAvro}"
5146

5247
// jackson
5348
api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
5449
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
5550
api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
5651
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
52+
api "com.fasterxml.jackson:jackson-bom:${versions.jackson}"
5753

5854
// jackson xml
5955
api "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${versions.jackson}"
@@ -64,18 +60,23 @@ dependencies {
6460

6561
// netty
6662
api "io.netty:netty-buffer:${versions.netty}"
63+
api "io.netty:netty-codec:${versions.netty}"
64+
api "io.netty:netty-codec-dns:${versions.netty}"
6765
api "io.netty:netty-codec-http:${versions.netty}"
6866
api "io.netty:netty-codec-http2:${versions.netty}"
6967
api "io.netty:netty-codec-socks:${versions.netty}"
70-
api "io.netty:netty-codec:${versions.netty}"
7168
api "io.netty:netty-common:${versions.netty}"
72-
api "io.netty:netty-handler-proxy:${versions.netty}"
7369
api "io.netty:netty-handler:${versions.netty}"
70+
api "io.netty:netty-handler-proxy:${versions.netty}"
7471
api "io.netty:netty-resolver:${versions.netty}"
72+
api "io.netty:netty-resolver-dns:${versions.netty}"
7573
api "io.netty:netty-transport:${versions.netty}"
74+
api "io.netty:netty-transport-native-unix-common:${versions.netty}"
7675

7776
// reactor
7877
api "io.projectreactor.netty:reactor-netty:${versions.reactorNetty}"
78+
api "io.projectreactor.netty:reactor-netty-core:${versions.reactorNetty}"
79+
api "io.projectreactor.netty:reactor-netty-http:${versions.reactorNetty}"
7980
api "io.projectreactor:reactor-core:${versions.reactorCore}"
8081
api "org.reactivestreams:reactive-streams:${versions.reactiveStreams}"
8182

@@ -105,6 +106,7 @@ tasks.named("dependencyLicenses").configure {
105106
mapping from: /netty-.*/, to: 'netty'
106107
mapping from: /jaxb-.*/, to: 'jaxb'
107108
mapping from: /stax-.*/, to: 'stax'
109+
mapping from: /reactor-netty-.*/, to: 'reactor-netty'
108110
mapping from: /reactive-streams.*/, to: 'reactive-streams'
109111
}
110112

@@ -238,6 +240,8 @@ tasks.named("thirdPartyAudit").configure {
238240
'io.netty.internal.tcnative.CertificateVerifier',
239241
'io.netty.internal.tcnative.SessionTicketKey',
240242
'io.netty.internal.tcnative.SniHostNameMatcher',
243+
'io.netty.internal.tcnative.SSLSession',
244+
'io.netty.internal.tcnative.SSLSessionCache',
241245

242246
// from io.netty.util.internal.Hidden (netty-common optional dependency)
243247
'reactor.blockhound.BlockHound$Builder',
@@ -246,14 +250,23 @@ tasks.named("thirdPartyAudit").configure {
246250
// it uses NIO
247251
'io.netty.channel.kqueue.KQueue',
248252
'io.netty.channel.kqueue.KQueueDatagramChannel',
253+
'io.netty.channel.kqueue.KQueueDomainSocketChannel',
249254
'io.netty.channel.kqueue.KQueueEventLoopGroup',
255+
'io.netty.channel.kqueue.KQueueServerDomainSocketChannel',
250256
'io.netty.channel.kqueue.KQueueServerSocketChannel',
251257
'io.netty.channel.kqueue.KQueueSocketChannel',
252258
'io.netty.channel.epoll.Epoll',
253259
'io.netty.channel.epoll.EpollDatagramChannel',
260+
'io.netty.channel.epoll.EpollDomainSocketChannel',
254261
'io.netty.channel.epoll.EpollEventLoopGroup',
262+
'io.netty.channel.epoll.EpollServerDomainSocketChannel',
255263
'io.netty.channel.epoll.EpollServerSocketChannel',
256264
'io.netty.channel.epoll.EpollSocketChannel',
265+
'io.netty.incubator.channel.uring.IOUring',
266+
'io.netty.incubator.channel.uring.IOUringDatagramChannel',
267+
'io.netty.incubator.channel.uring.IOUringEventLoopGroup',
268+
'io.netty.incubator.channel.uring.IOUringServerSocketChannel',
269+
'io.netty.incubator.channel.uring.IOUringSocketChannel',
257270

258271
// from reactor.netty.http.server.HttpServer (reactor-netty)
259272
'io.netty.handler.codec.haproxy.HAProxyMessage',
@@ -265,7 +278,8 @@ tasks.named("thirdPartyAudit").configure {
265278

266279
'org.slf4j.impl.StaticLoggerBinder',
267280
'org.slf4j.impl.StaticMDCBinder',
268-
'org.slf4j.impl.StaticMarkerBinder'
281+
'org.slf4j.impl.StaticMarkerBinder',
282+
'com.ctc.wstx.shaded.msv_core.driver.textui.Driver',
269283
)
270284

271285
if (BuildParams.runtimeJavaVersion <= JavaVersion.VERSION_1_8) {
@@ -281,8 +295,6 @@ tasks.named("thirdPartyAudit").configure {
281295
)
282296
} else {
283297
ignoreMissingClasses(
284-
'com.sun.org.apache.xml.internal.resolver.Catalog',
285-
'com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver',
286298
'javax.activation.DataHandler',
287299
'javax.activation.DataSource',
288300
'javax.xml.bind.JAXBElement',
@@ -333,11 +345,7 @@ tasks.named("thirdPartyAudit").configure {
333345
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
334346
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
335347

336-
'reactor.core.publisher.MultiProducerRingBuffer',
337-
'reactor.core.publisher.RingBufferFields',
338348
'reactor.core.publisher.Traces$SharedSecretsCallSiteSupplierFactory$TracingException',
339-
'reactor.core.publisher.UnsafeSequence',
340-
'reactor.core.publisher.UnsafeSupport'
341349
)
342350
}
343351
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.

0 commit comments

Comments
 (0)