Skip to content

Commit

Permalink
Upgrade Azure SDK and Jackson (elastic#72833) (elastic#72995) (elasti…
Browse files Browse the repository at this point in the history
…c#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 elastic#66555
closes elastic#67214

backport elastic#72995
backport elastic#73011

Co-authored-by: Francisco Fernández Castaño <[email protected]>
Co-authored-by: Mark Vieira <[email protected]>
  • Loading branch information
3 people authored May 27, 2021
1 parent 3182482 commit f454cef
Show file tree
Hide file tree
Showing 126 changed files with 139 additions and 143 deletions.
2 changes: 1 addition & 1 deletion buildSrc/src/main/groovy/elasticsearch.ide.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ if (System.getProperty('idea.active') == 'true') {
tasks.register('buildDependencyArtifacts') {
group = 'ide'
description = 'Builds artifacts needed as dependency for IDE modules'
dependsOn ':plugins:repository-hdfs:hadoop-common:shadowJar', ':plugins:repository-azure:azure-storage-blob:shadowJar'
dependsOn ':plugins:repository-hdfs:hadoop-common:shadowJar'
}

idea {
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ checkstyle = 8.39
# optional dependencies
spatial4j = 0.7
jts = 1.15.0
jackson = 2.10.4
snakeyaml = 1.26
jackson = 2.12.2
snakeyaml = 1.27
icu4j = 62.1
supercsv = 2.4.0
# when updating log4j, please update also docs/java-api/index.asciidoc
Expand All @@ -20,7 +20,7 @@ slf4j = 1.6.2
# when updating the JNA version, also update the version in buildSrc/build.gradle
jna = 5.7.0-1

netty = 4.1.49.Final
netty = 4.1.63.Final
joda = 2.10.10

commons_lang3 = 3.9
Expand Down
1 change: 0 additions & 1 deletion client/sniffer/licenses/jackson-core-2.10.4.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions client/sniffer/licenses/jackson-core-2.12.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8df50138521d05561a308ec2799cc8dda20c06df
1 change: 0 additions & 1 deletion libs/x-content/licenses/jackson-core-2.10.4.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions libs/x-content/licenses/jackson-core-2.12.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8df50138521d05561a308ec2799cc8dda20c06df

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
71866a16d9678d8d7718baea0a28c7d0e1a67360

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
110be3a2ac0acf51e68967669db47ca9a507e057

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8c549fb29f390f6fd0c20cf0a1d83f7e38dc7ffb
1 change: 0 additions & 1 deletion libs/x-content/licenses/snakeyaml-1.26.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions libs/x-content/licenses/snakeyaml-1.27.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
359d62567480b07a679dc643f82fc926b100eed5

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0a770cc4c0a1fb0bfd8a150a6a0004e42bc99fca

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5f9d79e09ebf5d54a46e9f4543924cf7ae7654e0
2 changes: 2 additions & 0 deletions modules/transport-netty4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ tasks.named("thirdPartyAudit").configure {
'io.netty.internal.tcnative.SSL',
'io.netty.internal.tcnative.SSLContext',
'io.netty.internal.tcnative.SSLPrivateKeyMethod',
'io.netty.internal.tcnative.SSLSession',
'io.netty.internal.tcnative.SSLSessionCache',

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
40028ce5ac7c43f1c9a1439f74637cad04013e23

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d4d2fccea88c80e56d59ce1053c53df0f9f4f5db

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f8c9b159dcb76452dc98a370a5511ff993670419

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e1206b46384d4dcbecee2901f18ce65ecf02e8a4

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
879a43c2325b08e92e8967218b6ddb0ed4b7a0d3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d07cd47c101dfa655d6d5cc304d523742fd78ca8

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
09a8bbe1ba082c9434e6f524d3864a53f340f2df

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0a770cc4c0a1fb0bfd8a150a6a0004e42bc99fca

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5f9d79e09ebf5d54a46e9f4543924cf7ae7654e0
47 changes: 0 additions & 47 deletions plugins/repository-azure/azure-storage-blob/build.gradle

This file was deleted.

54 changes: 31 additions & 23 deletions plugins/repository-azure/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,38 +22,34 @@ esplugin {
}

versions << [
'azure': '12.9.0',
'azureCore': '1.10.0',
'azureCoreHttpNetty': '1.6.3',
'azure': '12.11.1',
'azureCore': '1.16.0',
'azureCoreHttpNetty': '1.9.1',
'azureAvro': '12.0.4',

'jakartaActivation': '1.2.1',
'jakartaXMLBind': '2.3.2',
'stax2API': '4.2',
'woodstox': '6.0.2',
'woodstox': '6.2.4',

'reactorNetty': '0.9.12.RELEASE',
'reactorCore': '3.3.10.RELEASE',
'reactorNetty': '1.0.6',
'reactorCore': '3.4.5',
'reactiveStreams': '1.0.3',
]

dependencies {
api project(path: 'azure-storage-blob', configuration: 'shadow')
if (isEclipse) {
/*
* Eclipse can't pick up the shadow dependency so we point it at *something*
* so it can compile things.
*/
api project(path: 'azure-storage-blob')
}
api "com.azure:azure-storage-common:${versions.azure}"
api "com.azure:azure-storage-blob:${versions.azure}"
api "com.azure:azure-core-http-netty:${versions.azureCoreHttpNetty}"
api "com.azure:azure-core:${versions.azureCore}"
api "com.azure:azure-storage-internal-avro:${versions.azureAvro}"

// 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.core:jackson-databind:${versions.jackson}"
api "com.fasterxml.jackson:jackson-bom:${versions.jackson}"

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

// netty
api "io.netty:netty-buffer:${versions.netty}"
api "io.netty:netty-codec:${versions.netty}"
api "io.netty:netty-codec-dns:${versions.netty}"
api "io.netty:netty-codec-http:${versions.netty}"
api "io.netty:netty-codec-http2:${versions.netty}"
api "io.netty:netty-codec-socks:${versions.netty}"
api "io.netty:netty-codec:${versions.netty}"
api "io.netty:netty-common:${versions.netty}"
api "io.netty:netty-handler-proxy:${versions.netty}"
api "io.netty:netty-handler:${versions.netty}"
api "io.netty:netty-handler-proxy:${versions.netty}"
api "io.netty:netty-resolver:${versions.netty}"
api "io.netty:netty-resolver-dns:${versions.netty}"
api "io.netty:netty-transport:${versions.netty}"
api "io.netty:netty-transport-native-unix-common:${versions.netty}"

// reactor
api "io.projectreactor.netty:reactor-netty:${versions.reactorNetty}"
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}"

Expand Down Expand Up @@ -105,6 +106,7 @@ tasks.named("dependencyLicenses").configure {
mapping from: /netty-.*/, to: 'netty'
mapping from: /jaxb-.*/, to: 'jaxb'
mapping from: /stax-.*/, to: 'stax'
mapping from: /reactor-netty-.*/, to: 'reactor-netty'
mapping from: /reactive-streams.*/, to: 'reactive-streams'
}

Expand Down Expand Up @@ -238,6 +240,8 @@ tasks.named("thirdPartyAudit").configure {
'io.netty.internal.tcnative.CertificateVerifier',
'io.netty.internal.tcnative.SessionTicketKey',
'io.netty.internal.tcnative.SniHostNameMatcher',
'io.netty.internal.tcnative.SSLSession',
'io.netty.internal.tcnative.SSLSessionCache',

// from io.netty.util.internal.Hidden (netty-common optional dependency)
'reactor.blockhound.BlockHound$Builder',
Expand All @@ -246,14 +250,23 @@ tasks.named("thirdPartyAudit").configure {
// it uses NIO
'io.netty.channel.kqueue.KQueue',
'io.netty.channel.kqueue.KQueueDatagramChannel',
'io.netty.channel.kqueue.KQueueDomainSocketChannel',
'io.netty.channel.kqueue.KQueueEventLoopGroup',
'io.netty.channel.kqueue.KQueueServerDomainSocketChannel',
'io.netty.channel.kqueue.KQueueServerSocketChannel',
'io.netty.channel.kqueue.KQueueSocketChannel',
'io.netty.channel.epoll.Epoll',
'io.netty.channel.epoll.EpollDatagramChannel',
'io.netty.channel.epoll.EpollDomainSocketChannel',
'io.netty.channel.epoll.EpollEventLoopGroup',
'io.netty.channel.epoll.EpollServerDomainSocketChannel',
'io.netty.channel.epoll.EpollServerSocketChannel',
'io.netty.channel.epoll.EpollSocketChannel',
'io.netty.incubator.channel.uring.IOUring',
'io.netty.incubator.channel.uring.IOUringDatagramChannel',
'io.netty.incubator.channel.uring.IOUringEventLoopGroup',
'io.netty.incubator.channel.uring.IOUringServerSocketChannel',
'io.netty.incubator.channel.uring.IOUringSocketChannel',

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

'org.slf4j.impl.StaticLoggerBinder',
'org.slf4j.impl.StaticMDCBinder',
'org.slf4j.impl.StaticMarkerBinder'
'org.slf4j.impl.StaticMarkerBinder',
'com.ctc.wstx.shaded.msv_core.driver.textui.Driver',
)

if (BuildParams.runtimeJavaVersion <= JavaVersion.VERSION_1_8) {
Expand All @@ -281,8 +295,6 @@ tasks.named("thirdPartyAudit").configure {
)
} else {
ignoreMissingClasses(
'com.sun.org.apache.xml.internal.resolver.Catalog',
'com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver',
'javax.activation.DataHandler',
'javax.activation.DataSource',
'javax.xml.bind.JAXBElement',
Expand Down Expand Up @@ -333,11 +345,7 @@ tasks.named("thirdPartyAudit").configure {
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',

'reactor.core.publisher.MultiProducerRingBuffer',
'reactor.core.publisher.RingBufferFields',
'reactor.core.publisher.Traces$SharedSecretsCallSiteSupplierFactory$TracingException',
'reactor.core.publisher.UnsafeSequence',
'reactor.core.publisher.UnsafeSupport'
)
}
boolean useFixture = false
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4942bfa35a89a1fc9cabd18427a9b450d392215b

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b78134e2715eaef150ae3786806ff640bd0439ba
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ac89edaa19ee481c832970e944af16b3b772881a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
61b336d02e1d8839d68db47d884574fe41535e04

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
39733586ba04415ce64b186e17e1f8d9e28f2972

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0a770cc4c0a1fb0bfd8a150a6a0004e42bc99fca

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5f9d79e09ebf5d54a46e9f4543924cf7ae7654e0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dac1d21b5fe602d492273d35eb28918a91fc5412

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
00012e36d12f47b4648e2cfe0b12bdcc2c4649bf

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f226bd0766b4e81493822e8c81eaa6cab27e589f

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
40028ce5ac7c43f1c9a1439f74637cad04013e23

This file was deleted.

Loading

0 comments on commit f454cef

Please sign in to comment.