From 9b32dc0f1d2d9a8e7575d730f1ff1978ae926f41 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 6 May 2021 09:08:14 -0700 Subject: [PATCH 1/3] Upgrade Azure SDK and Jackson 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 --- buildSrc/version.properties | 4 +- .../licenses/jackson-core-2.10.4.jar.sha1 | 1 - .../licenses/jackson-core-2.12.2.jar.sha1 | 1 + .../licenses/jackson-core-2.10.4.jar.sha1 | 1 - .../licenses/jackson-core-2.12.2.jar.sha1 | 1 + .../jackson-dataformat-cbor-2.10.4.jar.sha1 | 1 - .../jackson-dataformat-cbor-2.12.2.jar.sha1 | 1 + .../jackson-dataformat-smile-2.10.4.jar.sha1 | 1 - .../jackson-dataformat-smile-2.12.2.jar.sha1 | 1 + .../jackson-dataformat-yaml-2.10.4.jar.sha1 | 1 - .../jackson-dataformat-yaml-2.12.2.jar.sha1 | 1 + .../licenses/snakeyaml-1.26.jar.sha1 | 1 - .../licenses/snakeyaml-1.27.jar.sha1 | 1 + .../jackson-annotations-2.10.4.jar.sha1 | 1 - .../jackson-annotations-2.12.2.jar.sha1 | 1 + .../licenses/jackson-databind-2.10.4.jar.sha1 | 1 - .../licenses/jackson-databind-2.12.2.jar.sha1 | 1 + .../jackson-annotations-2.10.4.jar.sha1 | 1 - .../jackson-annotations-2.12.2.jar.sha1 | 1 + .../licenses/jackson-databind-2.10.4.jar.sha1 | 1 - .../licenses/jackson-databind-2.12.2.jar.sha1 | 1 + plugins/repository-azure/build.gradle | 62 ++++++++++++------- .../licenses/azure-core-1.10.0.jar.sha1 | 1 - .../licenses/azure-core-1.15.0.jar.sha1 | 1 + .../azure-core-http-netty-1.6.3.jar.sha1 | 1 - .../azure-core-http-netty-1.9.1.jar.sha1 | 1 + .../azure-storage-common-12.11.0.jar.sha1 | 1 + .../azure-storage-common-12.9.0.jar.sha1 | 1 - .../jackson-annotations-2.10.4.jar.sha1 | 1 - .../jackson-annotations-2.12.2.jar.sha1 | 1 + .../licenses/jackson-databind-2.10.4.jar.sha1 | 1 - .../licenses/jackson-databind-2.12.2.jar.sha1 | 1 + .../jackson-dataformat-xml-2.10.4.jar.sha1 | 1 - .../jackson-dataformat-xml-2.12.2.jar.sha1 | 1 + .../jackson-datatype-jsr310-2.10.4.jar.sha1 | 1 - .../jackson-datatype-jsr310-2.12.2.jar.sha1 | 1 + ...on-module-jaxb-annotations-2.10.4.jar.sha1 | 1 - ...on-module-jaxb-annotations-2.12.2.jar.sha1 | 1 + .../netty-buffer-4.1.49.Final.jar.sha1 | 1 - .../netty-buffer-4.1.60.Final.jar.sha1 | 1 + .../netty-codec-4.1.49.Final.jar.sha1 | 1 - .../netty-codec-4.1.60.Final.jar.sha1 | 1 + .../netty-codec-dns-4.1.60.Final.jar.sha1 | 1 + .../netty-codec-http-4.1.49.Final.jar.sha1 | 1 - .../netty-codec-http-4.1.60.Final.jar.sha1 | 1 + .../netty-codec-http2-4.1.49.Final.jar.sha1 | 1 - .../netty-codec-http2-4.1.60.Final.jar.sha1 | 1 + .../netty-codec-socks-4.1.49.Final.jar.sha1 | 1 - .../netty-codec-socks-4.1.60.Final.jar.sha1 | 1 + .../netty-common-4.1.49.Final.jar.sha1 | 1 - .../netty-common-4.1.60.Final.jar.sha1 | 1 + .../netty-handler-4.1.49.Final.jar.sha1 | 1 - .../netty-handler-4.1.60.Final.jar.sha1 | 1 + .../netty-handler-proxy-4.1.49.Final.jar.sha1 | 1 - .../netty-handler-proxy-4.1.60.Final.jar.sha1 | 1 + .../netty-resolver-4.1.49.Final.jar.sha1 | 1 - .../netty-resolver-4.1.60.Final.jar.sha1 | 1 + .../netty-resolver-dns-4.1.60.Final.jar.sha1 | 1 + ...ver-dns-native-macos-4.1.60.Final.jar.sha1 | 1 + .../netty-transport-4.1.49.Final.jar.sha1 | 1 - .../netty-transport-4.1.60.Final.jar.sha1 | 1 + ...t-native-unix-common-4.1.60.Final.jar.sha1 | 1 + .../reactor-core-3.3.10.RELEASE.jar.sha1 | 1 - .../licenses/reactor-core-3.4.3.jar.sha1 | 1 + .../reactor-netty-0.9.12.RELEASE.jar.sha1 | 1 - .../licenses/reactor-netty-1.0.4.jar.sha1 | 1 + .../reactor-netty-core-1.0.4.jar.sha1 | 1 + .../reactor-netty-http-1.0.4.jar.sha1 | 1 + .../licenses/woodstox-core-6.0.2.jar.sha1 | 1 - .../licenses/woodstox-core-6.2.4.jar.sha1 | 1 + .../jackson-annotations-2.10.4.jar.sha1 | 1 - .../jackson-annotations-2.12.2.jar.sha1 | 1 + .../licenses/jackson-databind-2.10.4.jar.sha1 | 1 - .../licenses/jackson-databind-2.12.2.jar.sha1 | 1 + .../licenses/jackson-core-2.10.4.jar.sha1 | 1 - .../licenses/jackson-core-2.12.2.jar.sha1 | 1 + .../jackson-dataformat-cbor-2.10.4.jar.sha1 | 1 - .../jackson-dataformat-cbor-2.12.2.jar.sha1 | 1 + .../licenses/jackson-core-2.10.4.jar.sha1 | 1 - .../licenses/jackson-core-2.12.2.jar.sha1 | 1 + .../licenses/jackson-core-2.10.4.jar.sha1 | 1 - .../licenses/jackson-core-2.12.2.jar.sha1 | 1 + .../licenses/jackson-core-2.10.4.jar.sha1 | 1 - .../licenses/jackson-core-2.12.2.jar.sha1 | 1 + 84 files changed, 84 insertions(+), 64 deletions(-) delete mode 100644 client/sniffer/licenses/jackson-core-2.10.4.jar.sha1 create mode 100644 client/sniffer/licenses/jackson-core-2.12.2.jar.sha1 delete mode 100644 libs/x-content/licenses/jackson-core-2.10.4.jar.sha1 create mode 100644 libs/x-content/licenses/jackson-core-2.12.2.jar.sha1 delete mode 100644 libs/x-content/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 create mode 100644 libs/x-content/licenses/jackson-dataformat-cbor-2.12.2.jar.sha1 delete mode 100644 libs/x-content/licenses/jackson-dataformat-smile-2.10.4.jar.sha1 create mode 100644 libs/x-content/licenses/jackson-dataformat-smile-2.12.2.jar.sha1 delete mode 100644 libs/x-content/licenses/jackson-dataformat-yaml-2.10.4.jar.sha1 create mode 100644 libs/x-content/licenses/jackson-dataformat-yaml-2.12.2.jar.sha1 delete mode 100644 libs/x-content/licenses/snakeyaml-1.26.jar.sha1 create mode 100644 libs/x-content/licenses/snakeyaml-1.27.jar.sha1 delete mode 100644 modules/ingest-geoip/licenses/jackson-annotations-2.10.4.jar.sha1 create mode 100644 modules/ingest-geoip/licenses/jackson-annotations-2.12.2.jar.sha1 delete mode 100644 modules/ingest-geoip/licenses/jackson-databind-2.10.4.jar.sha1 create mode 100644 modules/ingest-geoip/licenses/jackson-databind-2.12.2.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/jackson-annotations-2.10.4.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/jackson-annotations-2.12.2.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/jackson-databind-2.10.4.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/jackson-databind-2.12.2.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/azure-core-1.10.0.jar.sha1 create mode 100644 plugins/repository-azure/licenses/azure-core-1.15.0.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/azure-core-http-netty-1.6.3.jar.sha1 create mode 100644 plugins/repository-azure/licenses/azure-core-http-netty-1.9.1.jar.sha1 create mode 100644 plugins/repository-azure/licenses/azure-storage-common-12.11.0.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/azure-storage-common-12.9.0.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/jackson-annotations-2.10.4.jar.sha1 create mode 100644 plugins/repository-azure/licenses/jackson-annotations-2.12.2.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/jackson-databind-2.10.4.jar.sha1 create mode 100644 plugins/repository-azure/licenses/jackson-databind-2.12.2.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/jackson-dataformat-xml-2.10.4.jar.sha1 create mode 100644 plugins/repository-azure/licenses/jackson-dataformat-xml-2.12.2.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/jackson-datatype-jsr310-2.10.4.jar.sha1 create mode 100644 plugins/repository-azure/licenses/jackson-datatype-jsr310-2.12.2.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.10.4.jar.sha1 create mode 100644 plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.12.2.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-buffer-4.1.49.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-buffer-4.1.60.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-codec-4.1.49.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-codec-4.1.60.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-codec-dns-4.1.60.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-codec-http-4.1.49.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-codec-http-4.1.60.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-codec-http2-4.1.49.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-codec-http2-4.1.60.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-codec-socks-4.1.49.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-codec-socks-4.1.60.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-common-4.1.49.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-common-4.1.60.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-handler-4.1.49.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-handler-4.1.60.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-handler-proxy-4.1.49.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-handler-proxy-4.1.60.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-resolver-4.1.49.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-resolver-4.1.60.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-resolver-dns-4.1.60.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-resolver-dns-native-macos-4.1.60.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-transport-4.1.49.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-transport-4.1.60.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.60.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/reactor-core-3.3.10.RELEASE.jar.sha1 create mode 100644 plugins/repository-azure/licenses/reactor-core-3.4.3.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/reactor-netty-0.9.12.RELEASE.jar.sha1 create mode 100644 plugins/repository-azure/licenses/reactor-netty-1.0.4.jar.sha1 create mode 100644 plugins/repository-azure/licenses/reactor-netty-core-1.0.4.jar.sha1 create mode 100644 plugins/repository-azure/licenses/reactor-netty-http-1.0.4.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/woodstox-core-6.0.2.jar.sha1 create mode 100644 plugins/repository-azure/licenses/woodstox-core-6.2.4.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/jackson-annotations-2.10.4.jar.sha1 create mode 100644 plugins/repository-s3/licenses/jackson-annotations-2.12.2.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/jackson-databind-2.10.4.jar.sha1 create mode 100644 plugins/repository-s3/licenses/jackson-databind-2.12.2.jar.sha1 delete mode 100644 x-pack/plugin/sql/jdbc/licenses/jackson-core-2.10.4.jar.sha1 create mode 100644 x-pack/plugin/sql/jdbc/licenses/jackson-core-2.12.2.jar.sha1 delete mode 100644 x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 create mode 100644 x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.12.2.jar.sha1 delete mode 100644 x-pack/plugin/sql/sql-action/licenses/jackson-core-2.10.4.jar.sha1 create mode 100644 x-pack/plugin/sql/sql-action/licenses/jackson-core-2.12.2.jar.sha1 delete mode 100644 x-pack/plugin/sql/sql-client/licenses/jackson-core-2.10.4.jar.sha1 create mode 100644 x-pack/plugin/sql/sql-client/licenses/jackson-core-2.12.2.jar.sha1 delete mode 100644 x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.10.4.jar.sha1 create mode 100644 x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.12.2.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index a29b67359f198..c8f61c38a9c60 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -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 diff --git a/client/sniffer/licenses/jackson-core-2.10.4.jar.sha1 b/client/sniffer/licenses/jackson-core-2.10.4.jar.sha1 deleted file mode 100644 index f83a4ac442b33..0000000000000 --- a/client/sniffer/licenses/jackson-core-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8796585e716440d6dd5128b30359932a9eb74d0d \ No newline at end of file diff --git a/client/sniffer/licenses/jackson-core-2.12.2.jar.sha1 b/client/sniffer/licenses/jackson-core-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..953c420544bd5 --- /dev/null +++ b/client/sniffer/licenses/jackson-core-2.12.2.jar.sha1 @@ -0,0 +1 @@ +8df50138521d05561a308ec2799cc8dda20c06df \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-core-2.10.4.jar.sha1 b/libs/x-content/licenses/jackson-core-2.10.4.jar.sha1 deleted file mode 100644 index f83a4ac442b33..0000000000000 --- a/libs/x-content/licenses/jackson-core-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8796585e716440d6dd5128b30359932a9eb74d0d \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-core-2.12.2.jar.sha1 b/libs/x-content/licenses/jackson-core-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..953c420544bd5 --- /dev/null +++ b/libs/x-content/licenses/jackson-core-2.12.2.jar.sha1 @@ -0,0 +1 @@ +8df50138521d05561a308ec2799cc8dda20c06df \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 deleted file mode 100644 index d34470c70b916..0000000000000 --- a/libs/x-content/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c854bb2d46138198cb5d4aae86ef6c04b8bc1e70 \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-cbor-2.12.2.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-cbor-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..0a1d23830b327 --- /dev/null +++ b/libs/x-content/licenses/jackson-dataformat-cbor-2.12.2.jar.sha1 @@ -0,0 +1 @@ +71866a16d9678d8d7718baea0a28c7d0e1a67360 \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-smile-2.10.4.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-smile-2.10.4.jar.sha1 deleted file mode 100644 index a8611e152f971..0000000000000 --- a/libs/x-content/licenses/jackson-dataformat-smile-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c872c2e224cfdcc5481037d477f5890f05c001b4 \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-smile-2.12.2.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-smile-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..bdad17e1c7a4c --- /dev/null +++ b/libs/x-content/licenses/jackson-dataformat-smile-2.12.2.jar.sha1 @@ -0,0 +1 @@ +110be3a2ac0acf51e68967669db47ca9a507e057 \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-yaml-2.10.4.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-yaml-2.10.4.jar.sha1 deleted file mode 100644 index 5fe3ec1a7e3a4..0000000000000 --- a/libs/x-content/licenses/jackson-dataformat-yaml-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8a7f3c6b640bd89214807af6d8160b4b3b16af93 \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-yaml-2.12.2.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-yaml-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..3455d5aadd435 --- /dev/null +++ b/libs/x-content/licenses/jackson-dataformat-yaml-2.12.2.jar.sha1 @@ -0,0 +1 @@ +8c549fb29f390f6fd0c20cf0a1d83f7e38dc7ffb \ No newline at end of file diff --git a/libs/x-content/licenses/snakeyaml-1.26.jar.sha1 b/libs/x-content/licenses/snakeyaml-1.26.jar.sha1 deleted file mode 100644 index fde3aba8edad0..0000000000000 --- a/libs/x-content/licenses/snakeyaml-1.26.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a78a8747147d2c5807683e76ec2b633e95c14fe9 \ No newline at end of file diff --git a/libs/x-content/licenses/snakeyaml-1.27.jar.sha1 b/libs/x-content/licenses/snakeyaml-1.27.jar.sha1 new file mode 100644 index 0000000000000..36080993df858 --- /dev/null +++ b/libs/x-content/licenses/snakeyaml-1.27.jar.sha1 @@ -0,0 +1 @@ +359d62567480b07a679dc643f82fc926b100eed5 \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-annotations-2.10.4.jar.sha1 b/modules/ingest-geoip/licenses/jackson-annotations-2.10.4.jar.sha1 deleted file mode 100644 index 0c548bb0e7711..0000000000000 --- a/modules/ingest-geoip/licenses/jackson-annotations-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6ae6028aff033f194c9710ad87c224ccaadeed6c \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-annotations-2.12.2.jar.sha1 b/modules/ingest-geoip/licenses/jackson-annotations-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..8e6b8be3e084d --- /dev/null +++ b/modules/ingest-geoip/licenses/jackson-annotations-2.12.2.jar.sha1 @@ -0,0 +1 @@ +0a770cc4c0a1fb0bfd8a150a6a0004e42bc99fca \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.10.4.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.10.4.jar.sha1 deleted file mode 100644 index 27d5a72cd27af..0000000000000 --- a/modules/ingest-geoip/licenses/jackson-databind-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -76e9152e93d4cf052f93a64596f633ba5b1c8ed9 \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.12.2.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..8e574b75a883f --- /dev/null +++ b/modules/ingest-geoip/licenses/jackson-databind-2.12.2.jar.sha1 @@ -0,0 +1 @@ +5f9d79e09ebf5d54a46e9f4543924cf7ae7654e0 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-annotations-2.10.4.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-annotations-2.10.4.jar.sha1 deleted file mode 100644 index 0c548bb0e7711..0000000000000 --- a/plugins/discovery-ec2/licenses/jackson-annotations-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6ae6028aff033f194c9710ad87c224ccaadeed6c \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-annotations-2.12.2.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-annotations-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..8e6b8be3e084d --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-annotations-2.12.2.jar.sha1 @@ -0,0 +1 @@ +0a770cc4c0a1fb0bfd8a150a6a0004e42bc99fca \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.10.4.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.10.4.jar.sha1 deleted file mode 100644 index 27d5a72cd27af..0000000000000 --- a/plugins/discovery-ec2/licenses/jackson-databind-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -76e9152e93d4cf052f93a64596f633ba5b1c8ed9 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.12.2.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..8e574b75a883f --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-databind-2.12.2.jar.sha1 @@ -0,0 +1 @@ +5f9d79e09ebf5d54a46e9f4543924cf7ae7654e0 \ No newline at end of file diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index de3e3813b0ecf..57d942ba406c4 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -22,17 +22,18 @@ 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', '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', ] @@ -54,6 +55,7 @@ dependencies { 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}" @@ -65,19 +67,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}" @@ -107,6 +115,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' } @@ -240,6 +249,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', @@ -248,14 +259,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', @@ -265,13 +285,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( @@ -297,11 +315,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 diff --git a/plugins/repository-azure/licenses/azure-core-1.10.0.jar.sha1 b/plugins/repository-azure/licenses/azure-core-1.10.0.jar.sha1 deleted file mode 100644 index 87047850d545e..0000000000000 --- a/plugins/repository-azure/licenses/azure-core-1.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d5e1258ba153b5e27c90b7c9cad262e6fc171d24 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-core-1.15.0.jar.sha1 b/plugins/repository-azure/licenses/azure-core-1.15.0.jar.sha1 new file mode 100644 index 0000000000000..4d38a67ede29a --- /dev/null +++ b/plugins/repository-azure/licenses/azure-core-1.15.0.jar.sha1 @@ -0,0 +1 @@ +9b09ba7b632e1765ed24438e4f77439986960d1c \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-core-http-netty-1.6.3.jar.sha1 b/plugins/repository-azure/licenses/azure-core-http-netty-1.6.3.jar.sha1 deleted file mode 100644 index 59ae7ea8c65b4..0000000000000 --- a/plugins/repository-azure/licenses/azure-core-http-netty-1.6.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1c72bdc36faad65f53dd160becc38dd93a7356e2 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-core-http-netty-1.9.1.jar.sha1 b/plugins/repository-azure/licenses/azure-core-http-netty-1.9.1.jar.sha1 new file mode 100644 index 0000000000000..c1fbd78d70d4e --- /dev/null +++ b/plugins/repository-azure/licenses/azure-core-http-netty-1.9.1.jar.sha1 @@ -0,0 +1 @@ +b78134e2715eaef150ae3786806ff640bd0439ba \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-storage-common-12.11.0.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-common-12.11.0.jar.sha1 new file mode 100644 index 0000000000000..7b425be415e88 --- /dev/null +++ b/plugins/repository-azure/licenses/azure-storage-common-12.11.0.jar.sha1 @@ -0,0 +1 @@ +a566e6c8a4099af0265f21f20ea712e355deb295 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-storage-common-12.9.0.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-common-12.9.0.jar.sha1 deleted file mode 100644 index f486ffca2bb46..0000000000000 --- a/plugins/repository-azure/licenses/azure-storage-common-12.9.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -42d0439a676e51bb1dea809c60e8a925bb07477c \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-annotations-2.10.4.jar.sha1 b/plugins/repository-azure/licenses/jackson-annotations-2.10.4.jar.sha1 deleted file mode 100644 index 0c548bb0e7711..0000000000000 --- a/plugins/repository-azure/licenses/jackson-annotations-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6ae6028aff033f194c9710ad87c224ccaadeed6c \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-annotations-2.12.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-annotations-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..8e6b8be3e084d --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-annotations-2.12.2.jar.sha1 @@ -0,0 +1 @@ +0a770cc4c0a1fb0bfd8a150a6a0004e42bc99fca \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-databind-2.10.4.jar.sha1 b/plugins/repository-azure/licenses/jackson-databind-2.10.4.jar.sha1 deleted file mode 100644 index 27d5a72cd27af..0000000000000 --- a/plugins/repository-azure/licenses/jackson-databind-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -76e9152e93d4cf052f93a64596f633ba5b1c8ed9 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-databind-2.12.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-databind-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..8e574b75a883f --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-databind-2.12.2.jar.sha1 @@ -0,0 +1 @@ +5f9d79e09ebf5d54a46e9f4543924cf7ae7654e0 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-dataformat-xml-2.10.4.jar.sha1 b/plugins/repository-azure/licenses/jackson-dataformat-xml-2.10.4.jar.sha1 deleted file mode 100644 index b079e3798154d..0000000000000 --- a/plugins/repository-azure/licenses/jackson-dataformat-xml-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ffd80322264922e7edb6b35139ec1f2f55824156 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-dataformat-xml-2.12.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-dataformat-xml-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..4a95dfceeb805 --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-dataformat-xml-2.12.2.jar.sha1 @@ -0,0 +1 @@ +dac1d21b5fe602d492273d35eb28918a91fc5412 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.10.4.jar.sha1 b/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.10.4.jar.sha1 deleted file mode 100644 index 33135389f24df..0000000000000 --- a/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -de00203e6fee3493c8978a0064a3dda2e8373545 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.12.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..e01942eb4ab44 --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.12.2.jar.sha1 @@ -0,0 +1 @@ +00012e36d12f47b4648e2cfe0b12bdcc2c4649bf \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.10.4.jar.sha1 b/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.10.4.jar.sha1 deleted file mode 100644 index ef26c940dbbe1..0000000000000 --- a/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -68364602aed552c0dcfc5743b393bad95c85b009 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.12.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..4283eed674744 --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.12.2.jar.sha1 @@ -0,0 +1 @@ +f226bd0766b4e81493822e8c81eaa6cab27e589f \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-buffer-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-buffer-4.1.49.Final.jar.sha1 deleted file mode 100644 index 14da1fbad92f1..0000000000000 --- a/plugins/repository-azure/licenses/netty-buffer-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8e819a81bca88d1e88137336f64531a53db0a4ad \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-buffer-4.1.60.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-buffer-4.1.60.Final.jar.sha1 new file mode 100644 index 0000000000000..3e3bd1ad5cb64 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-buffer-4.1.60.Final.jar.sha1 @@ -0,0 +1 @@ +9d213d090deeca2541ad6827eb3345bcd6e1e701 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-4.1.49.Final.jar.sha1 deleted file mode 100644 index 6353dc0b7ada3..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -20218de83c906348283f548c255650fd06030424 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-4.1.60.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-4.1.60.Final.jar.sha1 new file mode 100644 index 0000000000000..3c713a4dc2168 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-4.1.60.Final.jar.sha1 @@ -0,0 +1 @@ +b740d51babe3312a33b505cd8b62c02f3731b2e3 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.60.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.60.Final.jar.sha1 new file mode 100644 index 0000000000000..d2d4723a373eb --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-dns-4.1.60.Final.jar.sha1 @@ -0,0 +1 @@ +7abc81f9d79f5dc1d734e5174c8cfaf8a32cf981 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-http-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http-4.1.49.Final.jar.sha1 deleted file mode 100644 index 07651dd7f7682..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-http-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4f30dbc462b26c588dffc0eb7552caef1a0f549e \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-http-4.1.60.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http-4.1.60.Final.jar.sha1 new file mode 100644 index 0000000000000..e30e5964887f1 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-http-4.1.60.Final.jar.sha1 @@ -0,0 +1 @@ +354ca712f909fcd9d8a22e16bf84afcfdc44ec8d \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.49.Final.jar.sha1 deleted file mode 100644 index d67715bbbe877..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-http2-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ca35293757f80cd2460c80791757db261615dbe7 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.60.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.60.Final.jar.sha1 new file mode 100644 index 0000000000000..aca08cbd7f058 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-http2-4.1.60.Final.jar.sha1 @@ -0,0 +1 @@ +23b13e78d704f337b12000d1ad27dbdb2aa07ba1 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.49.Final.jar.sha1 deleted file mode 100644 index ef90665257b09..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-socks-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -df75527823f9fd13f6bd9d9098bd9eb786dcafb5 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.60.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.60.Final.jar.sha1 new file mode 100644 index 0000000000000..536861a2fbf86 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-socks-4.1.60.Final.jar.sha1 @@ -0,0 +1 @@ +6f4573281df659265bd709fd10471c3e00ef6c70 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-common-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-common-4.1.49.Final.jar.sha1 deleted file mode 100644 index 2c0aee66a9914..0000000000000 --- a/plugins/repository-azure/licenses/netty-common-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -927c8563a1662d869b145e70ce82ad89100f2c90 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-common-4.1.60.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-common-4.1.60.Final.jar.sha1 new file mode 100644 index 0000000000000..96dec0a38a848 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-common-4.1.60.Final.jar.sha1 @@ -0,0 +1 @@ +44540113f7148f1014be879663501db8da1c37b0 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-handler-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-4.1.49.Final.jar.sha1 deleted file mode 100644 index c6e2ae4fa045c..0000000000000 --- a/plugins/repository-azure/licenses/netty-handler-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c73443adb9d085d5dc2d5b7f3bdd91d5963976f7 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-handler-4.1.60.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-4.1.60.Final.jar.sha1 new file mode 100644 index 0000000000000..a5226839b74fc --- /dev/null +++ b/plugins/repository-azure/licenses/netty-handler-4.1.60.Final.jar.sha1 @@ -0,0 +1 @@ +14e28bab0173be10c9631a85069636a0d0221dfe \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.49.Final.jar.sha1 deleted file mode 100644 index 024a87fe382a6..0000000000000 --- a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6a2064cc62c7d18719742e1e101199c04c66356c \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.60.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.60.Final.jar.sha1 new file mode 100644 index 0000000000000..f4d121fb967ef --- /dev/null +++ b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.60.Final.jar.sha1 @@ -0,0 +1 @@ +2352f12826400e5db64b36fd951508ce9a61c196 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-resolver-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-4.1.49.Final.jar.sha1 deleted file mode 100644 index 986895a8ecf31..0000000000000 --- a/plugins/repository-azure/licenses/netty-resolver-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eb81e1f0eaa99e75983bf3d28cae2b103e0f3a34 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-resolver-4.1.60.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-4.1.60.Final.jar.sha1 new file mode 100644 index 0000000000000..d6dea392cdbce --- /dev/null +++ b/plugins/repository-azure/licenses/netty-resolver-4.1.60.Final.jar.sha1 @@ -0,0 +1 @@ +caba5004618d27386ee9d5ee8b23b09b6548fb0b \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.60.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.60.Final.jar.sha1 new file mode 100644 index 0000000000000..137ecab23da0f --- /dev/null +++ b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.60.Final.jar.sha1 @@ -0,0 +1 @@ +45950bf7fd55ef3c536131ed3ce00c3c2b7f27ce \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-native-macos-4.1.60.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-native-macos-4.1.60.Final.jar.sha1 new file mode 100644 index 0000000000000..6c267d128e4fb --- /dev/null +++ b/plugins/repository-azure/licenses/netty-resolver-dns-native-macos-4.1.60.Final.jar.sha1 @@ -0,0 +1 @@ +37bafe5e51557c7c1cdfc2a528cb4be74917b985 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-transport-4.1.49.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-4.1.49.Final.jar.sha1 deleted file mode 100644 index 175b8c84a8824..0000000000000 --- a/plugins/repository-azure/licenses/netty-transport-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -415ea7f326635743aec952fe2349ca45959e94a7 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-transport-4.1.60.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-4.1.60.Final.jar.sha1 new file mode 100644 index 0000000000000..b36785451bed0 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-transport-4.1.60.Final.jar.sha1 @@ -0,0 +1 @@ +94350c81cc7a78212fb0f52a500f22d1aa9c44d8 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.60.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.60.Final.jar.sha1 new file mode 100644 index 0000000000000..a3f0502b6aa43 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.60.Final.jar.sha1 @@ -0,0 +1 @@ +fad098b98df67e50135c67e4a26af56c7800daf4 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-core-3.3.10.RELEASE.jar.sha1 b/plugins/repository-azure/licenses/reactor-core-3.3.10.RELEASE.jar.sha1 deleted file mode 100644 index 181cb897756ed..0000000000000 --- a/plugins/repository-azure/licenses/reactor-core-3.3.10.RELEASE.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f5787f994a9a810c0986418232e06fcf4afc1216 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-core-3.4.3.jar.sha1 b/plugins/repository-azure/licenses/reactor-core-3.4.3.jar.sha1 new file mode 100644 index 0000000000000..c46ae8142608b --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-core-3.4.3.jar.sha1 @@ -0,0 +1 @@ +df23dbdf95f892f7a04292d040fd8b308bd66602 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-0.9.12.RELEASE.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-0.9.12.RELEASE.jar.sha1 deleted file mode 100644 index 92f7fafc27375..0000000000000 --- a/plugins/repository-azure/licenses/reactor-netty-0.9.12.RELEASE.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -41022546d07f1499fb9d8617bba4a1a89d3549db \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-1.0.4.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-1.0.4.jar.sha1 new file mode 100644 index 0000000000000..7b910bb1a76de --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-1.0.4.jar.sha1 @@ -0,0 +1 @@ +563ceb3577b7537695a7325835cb6942cc931715 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.0.4.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.0.4.jar.sha1 new file mode 100644 index 0000000000000..a343dc7b797dd --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-core-1.0.4.jar.sha1 @@ -0,0 +1 @@ +bed12fc287e17a7daf2ef62e4a4afe9b593a940e \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.0.4.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.0.4.jar.sha1 new file mode 100644 index 0000000000000..05e6b87ecbd32 --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-http-1.0.4.jar.sha1 @@ -0,0 +1 @@ +7d14c304426cda3e6c7d55102bd04a78d2337814 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/woodstox-core-6.0.2.jar.sha1 b/plugins/repository-azure/licenses/woodstox-core-6.0.2.jar.sha1 deleted file mode 100644 index 7d2fa5254ef55..0000000000000 --- a/plugins/repository-azure/licenses/woodstox-core-6.0.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bbd163bbdb4d6340298b61a6789cc174fb589868 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/woodstox-core-6.2.4.jar.sha1 b/plugins/repository-azure/licenses/woodstox-core-6.2.4.jar.sha1 new file mode 100644 index 0000000000000..15f15488fca43 --- /dev/null +++ b/plugins/repository-azure/licenses/woodstox-core-6.2.4.jar.sha1 @@ -0,0 +1 @@ +16b9f8ab972e67eb21872ea2c40046249d543989 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-annotations-2.10.4.jar.sha1 b/plugins/repository-s3/licenses/jackson-annotations-2.10.4.jar.sha1 deleted file mode 100644 index 0c548bb0e7711..0000000000000 --- a/plugins/repository-s3/licenses/jackson-annotations-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6ae6028aff033f194c9710ad87c224ccaadeed6c \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-annotations-2.12.2.jar.sha1 b/plugins/repository-s3/licenses/jackson-annotations-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..8e6b8be3e084d --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-annotations-2.12.2.jar.sha1 @@ -0,0 +1 @@ +0a770cc4c0a1fb0bfd8a150a6a0004e42bc99fca \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-databind-2.10.4.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.10.4.jar.sha1 deleted file mode 100644 index 27d5a72cd27af..0000000000000 --- a/plugins/repository-s3/licenses/jackson-databind-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -76e9152e93d4cf052f93a64596f633ba5b1c8ed9 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-databind-2.12.2.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..8e574b75a883f --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-databind-2.12.2.jar.sha1 @@ -0,0 +1 @@ +5f9d79e09ebf5d54a46e9f4543924cf7ae7654e0 \ No newline at end of file diff --git a/x-pack/plugin/sql/jdbc/licenses/jackson-core-2.10.4.jar.sha1 b/x-pack/plugin/sql/jdbc/licenses/jackson-core-2.10.4.jar.sha1 deleted file mode 100644 index f83a4ac442b33..0000000000000 --- a/x-pack/plugin/sql/jdbc/licenses/jackson-core-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8796585e716440d6dd5128b30359932a9eb74d0d \ No newline at end of file diff --git a/x-pack/plugin/sql/jdbc/licenses/jackson-core-2.12.2.jar.sha1 b/x-pack/plugin/sql/jdbc/licenses/jackson-core-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..953c420544bd5 --- /dev/null +++ b/x-pack/plugin/sql/jdbc/licenses/jackson-core-2.12.2.jar.sha1 @@ -0,0 +1 @@ +8df50138521d05561a308ec2799cc8dda20c06df \ No newline at end of file diff --git a/x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 b/x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 deleted file mode 100644 index d34470c70b916..0000000000000 --- a/x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c854bb2d46138198cb5d4aae86ef6c04b8bc1e70 \ No newline at end of file diff --git a/x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.12.2.jar.sha1 b/x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..0a1d23830b327 --- /dev/null +++ b/x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.12.2.jar.sha1 @@ -0,0 +1 @@ +71866a16d9678d8d7718baea0a28c7d0e1a67360 \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-action/licenses/jackson-core-2.10.4.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/jackson-core-2.10.4.jar.sha1 deleted file mode 100644 index f83a4ac442b33..0000000000000 --- a/x-pack/plugin/sql/sql-action/licenses/jackson-core-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8796585e716440d6dd5128b30359932a9eb74d0d \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-action/licenses/jackson-core-2.12.2.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/jackson-core-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..953c420544bd5 --- /dev/null +++ b/x-pack/plugin/sql/sql-action/licenses/jackson-core-2.12.2.jar.sha1 @@ -0,0 +1 @@ +8df50138521d05561a308ec2799cc8dda20c06df \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-client/licenses/jackson-core-2.10.4.jar.sha1 b/x-pack/plugin/sql/sql-client/licenses/jackson-core-2.10.4.jar.sha1 deleted file mode 100644 index f83a4ac442b33..0000000000000 --- a/x-pack/plugin/sql/sql-client/licenses/jackson-core-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8796585e716440d6dd5128b30359932a9eb74d0d \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-client/licenses/jackson-core-2.12.2.jar.sha1 b/x-pack/plugin/sql/sql-client/licenses/jackson-core-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..953c420544bd5 --- /dev/null +++ b/x-pack/plugin/sql/sql-client/licenses/jackson-core-2.12.2.jar.sha1 @@ -0,0 +1 @@ +8df50138521d05561a308ec2799cc8dda20c06df \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.10.4.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.10.4.jar.sha1 deleted file mode 100644 index f83a4ac442b33..0000000000000 --- a/x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8796585e716440d6dd5128b30359932a9eb74d0d \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.12.2.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..953c420544bd5 --- /dev/null +++ b/x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.12.2.jar.sha1 @@ -0,0 +1 @@ +8df50138521d05561a308ec2799cc8dda20c06df \ No newline at end of file From c1cdf5fd174463fde1ef744a569b1d1142edb054 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 6 May 2021 14:31:51 -0700 Subject: [PATCH 2/3] remove hack --- .../azure-storage-blob/build.gradle | 47 ------------------- plugins/repository-azure/build.gradle | 9 +--- 2 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 plugins/repository-azure/azure-storage-blob/build.gradle diff --git a/plugins/repository-azure/azure-storage-blob/build.gradle b/plugins/repository-azure/azure-storage-blob/build.gradle deleted file mode 100644 index 1101ac2cd9bef..0000000000000 --- a/plugins/repository-azure/azure-storage-blob/build.gradle +++ /dev/null @@ -1,47 +0,0 @@ -import org.elasticsearch.gradle.internal.JavaClassPublicifier; - -apply plugin: 'elasticsearch.java' -apply plugin: 'com.github.johnrengelman.shadow' - -configurations { - originalJar { - transitive = false - } -} - -dependencies { - originalJar "com.azure:azure-storage-blob:${project.parent.versions.azure}" - implementation "com.azure:azure-storage-blob:${project.parent.versions.azure}" -} - -// We have to rewrite the service classes to make them public to avoid -// granting the permission "java.lang.reflect.ReflectPermission" "newProxyInPackage" -// to this plugin. -// -// There are plans to make those public in the azure sdk side, but in the meanwhile -// we just do this workaround -// https://github.com/Azure/azure-sdk-for-java/issues/12829#issuecomment-736755543 -List classesToRewrite = ['com/azure/storage/blob/implementation/AppendBlobsImpl$AppendBlobsService.class', - 'com/azure/storage/blob/implementation/BlobsImpl$BlobsService.class', - 'com/azure/storage/blob/implementation/BlockBlobsImpl$BlockBlobsService.class', - 'com/azure/storage/blob/implementation/ContainersImpl$ContainersService.class', - 'com/azure/storage/blob/implementation/DirectorysImpl$DirectorysService.class', - 'com/azure/storage/blob/implementation/PageBlobsImpl$PageBlobsService.class', - 'com/azure/storage/blob/implementation/ServicesImpl$ServicesService.class'] - -tasks.register('extractClientClasses', Copy).configure { - from({ zipTree(configurations.originalJar.singleFile) }) { - include "com/azure/storage/blob/implementation/**" - } - into project.file('build/original') -} - -def modifiedOutput = project.layout.buildDirectory.dir('modified') -def makePublic = tasks.register('makeClientClassesPublic', JavaClassPublicifier) { - dependsOn 'extractClientClasses' - classFiles = classesToRewrite - inputDir = project.layout.buildDirectory.dir('original') - outputDir = modifiedOutput -} - -sourceSets.main.output.dir(modifiedOutput, builtBy: makePublic) diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index 57d942ba406c4..7ce9a20ac0597 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -38,15 +38,8 @@ versions << [ ] 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}" From 469aa44592ee7a93823f66bdbd981463bef13e42 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 6 May 2021 14:48:30 -0700 Subject: [PATCH 3/3] add avro dep --- plugins/repository-azure/build.gradle | 2 ++ .../licenses/azure-storage-blob-12.11.0.jar.sha1 | 1 + .../licenses/azure-storage-internal-avro-12.0.3.jar.sha1 | 1 + 3 files changed, 4 insertions(+) create mode 100644 plugins/repository-azure/licenses/azure-storage-blob-12.11.0.jar.sha1 create mode 100644 plugins/repository-azure/licenses/azure-storage-internal-avro-12.0.3.jar.sha1 diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index 7ce9a20ac0597..c88d8e227ada6 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -25,6 +25,7 @@ versions << [ 'azure': '12.11.0', 'azureCore': '1.15.0', 'azureCoreHttpNetty': '1.9.1', + 'azureAvro': '12.0.3', 'jakartaActivation': '1.2.1', 'jakartaXMLBind': '2.3.2', @@ -42,6 +43,7 @@ dependencies { 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}" diff --git a/plugins/repository-azure/licenses/azure-storage-blob-12.11.0.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-blob-12.11.0.jar.sha1 new file mode 100644 index 0000000000000..9605780e2f2fc --- /dev/null +++ b/plugins/repository-azure/licenses/azure-storage-blob-12.11.0.jar.sha1 @@ -0,0 +1 @@ +698e69649a927c60e6a1981e89b0e55677a1f8ff \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-storage-internal-avro-12.0.3.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-internal-avro-12.0.3.jar.sha1 new file mode 100644 index 0000000000000..93800adda5c29 --- /dev/null +++ b/plugins/repository-azure/licenses/azure-storage-internal-avro-12.0.3.jar.sha1 @@ -0,0 +1 @@ +9e7327f5b25dee8f92374bbcdabb1081bd896af0 \ No newline at end of file