Skip to content

Commit

Permalink
Upgrade Azure SDK and Jackson (elastic#72833)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
rjernst committed May 12, 2021
1 parent 0937c3f commit 645ca16
Show file tree
Hide file tree
Showing 87 changed files with 89 additions and 119 deletions.
4 changes: 2 additions & 2 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 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

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.

73 changes: 41 additions & 32 deletions plugins/repository-azure/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,38 +22,35 @@ esplugin {
}

versions << [
'azure': '12.9.0',
'azureCore': '1.10.0',
'azureCoreHttpNetty': '1.6.3',
'azure': '12.11.0',
'azureCore': '1.15.0',
'azureCoreHttpNetty': '1.9.1',
'azureAvro': '12.0.3',

'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',
'azureNetty': '4.1.60.Final',
'reactorNetty': '1.0.4',
'reactorCore': '3.4.3',
'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 @@ -65,19 +62,25 @@ dependencies {
api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"

// netty
api "io.netty:netty-buffer:${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-resolver:${versions.netty}"
api "io.netty:netty-transport:${versions.netty}"
api "io.netty:netty-buffer:${versions.azureNetty}"
api "io.netty:netty-codec:${versions.azureNetty}"
api "io.netty:netty-codec-dns:${versions.azureNetty}"
api "io.netty:netty-codec-http:${versions.azureNetty}"
api "io.netty:netty-codec-http2:${versions.azureNetty}"
api "io.netty:netty-codec-socks:${versions.azureNetty}"
api "io.netty:netty-common:${versions.azureNetty}"
api "io.netty:netty-handler:${versions.azureNetty}"
api "io.netty:netty-handler-proxy:${versions.azureNetty}"
api "io.netty:netty-resolver:${versions.azureNetty}"
api "io.netty:netty-resolver-dns:${versions.azureNetty}"
api "io.netty:netty-resolver-dns-native-macos:${versions.azureNetty}"
api "io.netty:netty-transport:${versions.azureNetty}"
api "io.netty:netty-transport-native-unix-common:${versions.azureNetty}"

// 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 @@ -107,6 +110,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 @@ -240,6 +244,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 @@ -248,14 +254,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,13 +280,11 @@ tasks.named("thirdPartyAudit").configure {
'org.osgi.framework.BundleActivator',
'org.osgi.framework.BundleContext',

// from com.ctc.wstx.shaded.msv_core.driver.textui.Driver (woodstox-core)
'com.sun.org.apache.xml.internal.resolver.Catalog',
'com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver',

'org.slf4j.impl.StaticLoggerBinder',
'org.slf4j.impl.StaticMDCBinder',
'org.slf4j.impl.StaticMarkerBinder',

'com.ctc.wstx.shaded.msv_core.driver.textui.Driver'
)

ignoreViolations(
Expand All @@ -297,11 +310,7 @@ tasks.named("thirdPartyAudit").configure {
'javax.activation.MailcapCommandMap',
'javax.activation.MimetypesFileTypeMap',

'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 @@
9b09ba7b632e1765ed24438e4f77439986960d1c

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

This file was deleted.

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

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b740d51babe3312a33b505cd8b62c02f3731b2e3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7abc81f9d79f5dc1d734e5174c8cfaf8a32cf981

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
caba5004618d27386ee9d5ee8b23b09b6548fb0b
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
45950bf7fd55ef3c536131ed3ce00c3c2b7f27ce
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
37bafe5e51557c7c1cdfc2a528cb4be74917b985

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
94350c81cc7a78212fb0f52a500f22d1aa9c44d8
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fad098b98df67e50135c67e4a26af56c7800daf4
Loading

0 comments on commit 645ca16

Please sign in to comment.