From b2c685469ce52efc9f2476b87d515ef9c2cfa391 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 27 May 2021 07:55:18 -0700 Subject: [PATCH 1/9] Upgrade Azure SDK and Jackson (#72833) (#72995) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Co-authored-by: Francisco Fernández Castaño --- 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 + .../azure-storage-blob/build.gradle | 47 ------------ plugins/repository-azure/build.gradle | 71 ++++++++++++------- .../licenses/azure-core-1.10.0.jar.sha1 | 1 - .../licenses/azure-core-1.16.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-blob-12.11.1.jar.sha1 | 1 + .../azure-storage-common-12.11.1.jar.sha1 | 1 + .../azure-storage-common-12.9.0.jar.sha1 | 1 - ...zure-storage-internal-avro-12.0.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 + .../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.63.Final.jar.sha1 | 1 + .../netty-codec-4.1.49.Final.jar.sha1 | 1 - .../netty-codec-4.1.63.Final.jar.sha1 | 1 + .../netty-codec-dns-4.1.63.Final.jar.sha1 | 1 + .../netty-codec-http-4.1.49.Final.jar.sha1 | 1 - .../netty-codec-http-4.1.63.Final.jar.sha1 | 1 + .../netty-codec-http2-4.1.49.Final.jar.sha1 | 1 - .../netty-codec-http2-4.1.63.Final.jar.sha1 | 1 + .../netty-codec-socks-4.1.49.Final.jar.sha1 | 1 - .../netty-codec-socks-4.1.63.Final.jar.sha1 | 1 + .../netty-common-4.1.49.Final.jar.sha1 | 1 - .../netty-common-4.1.63.Final.jar.sha1 | 1 + .../netty-handler-4.1.49.Final.jar.sha1 | 1 - .../netty-handler-4.1.63.Final.jar.sha1 | 1 + .../netty-handler-proxy-4.1.49.Final.jar.sha1 | 1 - .../netty-handler-proxy-4.1.63.Final.jar.sha1 | 1 + .../netty-resolver-4.1.49.Final.jar.sha1 | 1 - .../netty-resolver-4.1.63.Final.jar.sha1 | 1 + .../netty-resolver-dns-4.1.63.Final.jar.sha1 | 1 + .../netty-transport-4.1.49.Final.jar.sha1 | 1 - .../netty-transport-4.1.63.Final.jar.sha1 | 1 + ...t-native-unix-common-4.1.63.Final.jar.sha1 | 1 + .../reactor-core-3.3.10.RELEASE.jar.sha1 | 1 - .../licenses/reactor-core-3.4.5.jar.sha1 | 1 + .../reactor-netty-0.9.12.RELEASE.jar.sha1 | 1 - .../licenses/reactor-netty-1.0.6.jar.sha1 | 1 + .../reactor-netty-core-1.0.6.jar.sha1 | 1 + .../reactor-netty-http-1.0.6.jar.sha1 | 1 + .../licenses/woodstox-core-6.0.2.jar.sha1 | 1 - .../licenses/woodstox-core-6.2.4.jar.sha1 | 1 + .../azure/AzureClientProvider.java | 34 +++++---- .../azure/AzureRepositoryPlugin.java | 13 ++++ .../plugin-metadata/plugin-security.policy | 5 ++ .../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 + 89 files changed, 129 insertions(+), 128 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/azure-storage-blob/build.gradle delete mode 100644 plugins/repository-azure/licenses/azure-core-1.10.0.jar.sha1 create mode 100644 plugins/repository-azure/licenses/azure-core-1.16.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-blob-12.11.1.jar.sha1 create mode 100644 plugins/repository-azure/licenses/azure-storage-common-12.11.1.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/azure-storage-common-12.9.0.jar.sha1 create mode 100644 plugins/repository-azure/licenses/azure-storage-internal-avro-12.0.4.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.63.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.63.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-codec-dns-4.1.63.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.63.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.63.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.63.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.63.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.63.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.63.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.63.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-resolver-dns-4.1.63.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.63.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.63.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.5.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.6.jar.sha1 create mode 100644 plugins/repository-azure/licenses/reactor-netty-core-1.0.6.jar.sha1 create mode 100644 plugins/repository-azure/licenses/reactor-netty-http-1.0.6.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 9ad07e7bb61f8..da06e9dbe9e37 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/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 fd17a9ffa52c6..8e2618fcbbb4e 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -22,38 +22,35 @@ 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', + 'azureNetty': '4.1.63.Final', + '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}" @@ -63,19 +60,24 @@ 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-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}" @@ -105,6 +107,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' } @@ -238,6 +241,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', @@ -246,14 +251,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,7 +279,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) { @@ -335,9 +350,11 @@ tasks.named("thirdPartyAudit").configure { 'reactor.core.publisher.MultiProducerRingBuffer', 'reactor.core.publisher.RingBufferFields', + + 'javax.activation.MailcapCommandMap', + 'javax.activation.MimetypesFileTypeMap', + '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.16.0.jar.sha1 b/plugins/repository-azure/licenses/azure-core-1.16.0.jar.sha1 new file mode 100644 index 0000000000000..c338532043815 --- /dev/null +++ b/plugins/repository-azure/licenses/azure-core-1.16.0.jar.sha1 @@ -0,0 +1 @@ +4942bfa35a89a1fc9cabd18427a9b450d392215b \ 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-blob-12.11.1.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-blob-12.11.1.jar.sha1 new file mode 100644 index 0000000000000..b7114857449f6 --- /dev/null +++ b/plugins/repository-azure/licenses/azure-storage-blob-12.11.1.jar.sha1 @@ -0,0 +1 @@ +ac89edaa19ee481c832970e944af16b3b772881a \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-storage-common-12.11.1.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-common-12.11.1.jar.sha1 new file mode 100644 index 0000000000000..86e795bf2b9bc --- /dev/null +++ b/plugins/repository-azure/licenses/azure-storage-common-12.11.1.jar.sha1 @@ -0,0 +1 @@ +61b336d02e1d8839d68db47d884574fe41535e04 \ 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/azure-storage-internal-avro-12.0.4.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-internal-avro-12.0.4.jar.sha1 new file mode 100644 index 0000000000000..7b086febb3673 --- /dev/null +++ b/plugins/repository-azure/licenses/azure-storage-internal-avro-12.0.4.jar.sha1 @@ -0,0 +1 @@ +39733586ba04415ce64b186e17e1f8d9e28f2972 \ 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.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-buffer-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..d472369d69bc0 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-buffer-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +40028ce5ac7c43f1c9a1439f74637cad04013e23 \ 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.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..8bfbe331c55c9 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +d4d2fccea88c80e56d59ce1053c53df0f9f4f5db \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..0d878e271dd56 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-dns-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +91c445232b12e13bf6757579a39bab81e1233af5 \ 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.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..0279e286e318d --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-http-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +f8c9b159dcb76452dc98a370a5511ff993670419 \ 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.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..ad44612f004a3 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-http2-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +294e90696d8d6e20c889511d2484b37158cb9caa \ 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.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..8a7f988798303 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-socks-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +97707b764c9287836dcf626dd03c81f3bbfc86c6 \ 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.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-common-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..54e103f1d8b5f --- /dev/null +++ b/plugins/repository-azure/licenses/netty-common-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +e1206b46384d4dcbecee2901f18ce65ecf02e8a4 \ 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.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..ae180d9ae4016 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-handler-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +879a43c2325b08e92e8967218b6ddb0ed4b7a0d3 \ 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.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..bede283973185 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +d8cbdc537d75f219c04a057b984b2f0b55c1dbff \ 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.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..eb6858e75cc21 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-resolver-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +d07cd47c101dfa655d6d5cc304d523742fd78ca8 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..9a14a2e73102b --- /dev/null +++ b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +f44dc8ed52ff8528a88c157879c9baffe464fa46 \ 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.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..c41cdc86c51c8 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-transport-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +09a8bbe1ba082c9434e6f524d3864a53f340f2df \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.63.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..7b47441ef5d9a --- /dev/null +++ b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +85bd91382ec54b300ad3ff59efccbb4fccb22a88 \ 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.5.jar.sha1 b/plugins/repository-azure/licenses/reactor-core-3.4.5.jar.sha1 new file mode 100644 index 0000000000000..011a1f162a537 --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-core-3.4.5.jar.sha1 @@ -0,0 +1 @@ +c8adeb48f74b16c2dfb4f06a880820b9eaed50cf \ 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.6.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-1.0.6.jar.sha1 new file mode 100644 index 0000000000000..7d93a719037cb --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-1.0.6.jar.sha1 @@ -0,0 +1 @@ +82e9508698715725c3e1882d3056cd3a743d6bfc \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.0.6.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.0.6.jar.sha1 new file mode 100644 index 0000000000000..bcbf8c15fe60a --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-core-1.0.6.jar.sha1 @@ -0,0 +1 @@ +c24e7e989913d50c2ed592892e55ce1284364ac4 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.0.6.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.0.6.jar.sha1 new file mode 100644 index 0000000000000..f1cbbf2eb81d8 --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-http-1.0.6.jar.sha1 @@ -0,0 +1 @@ +6a76dd233bdb1e6dc5364ae1b5c8627c2cb0288f \ 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-azure/src/main/java/org/elasticsearch/repositories/azure/AzureClientProvider.java b/plugins/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureClientProvider.java index 8143c30e59896..e40e97ef1ccea 100644 --- a/plugins/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureClientProvider.java +++ b/plugins/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureClientProvider.java @@ -28,6 +28,7 @@ import io.netty.channel.ChannelOption; import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.resolver.DefaultAddressResolverGroup; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.common.component.AbstractLifecycleComponent; @@ -87,6 +88,7 @@ class AzureClientProvider extends AbstractLifecycleComponent { private final EventLoopGroup eventLoopGroup; private final ConnectionProvider connectionProvider; private final ByteBufAllocator byteBufAllocator; + private final reactor.netty.http.client.HttpClient nettyHttpClient; private final ClientLogger clientLogger = new ClientLogger(AzureClientProvider.class); private volatile boolean closed = false; @@ -94,12 +96,14 @@ class AzureClientProvider extends AbstractLifecycleComponent { String reactorExecutorName, EventLoopGroup eventLoopGroup, ConnectionProvider connectionProvider, - ByteBufAllocator byteBufAllocator) { + ByteBufAllocator byteBufAllocator, + reactor.netty.http.client.HttpClient nettyHttpClient) { this.threadPool = threadPool; this.reactorExecutorName = reactorExecutorName; this.eventLoopGroup = eventLoopGroup; this.connectionProvider = connectionProvider; this.byteBufAllocator = byteBufAllocator; + this.nettyHttpClient = nettyHttpClient; } static int eventLoopThreadsFromSettings(Settings settings) { @@ -117,7 +121,7 @@ static AzureClientProvider create(ThreadPool threadPool, Settings settings) { final TimeValue openConnectionTimeout = OPEN_CONNECTION_TIMEOUT.get(settings); final TimeValue maxIdleTime = MAX_IDLE_TIME.get(settings); - ConnectionProvider provider = + ConnectionProvider connectionProvider = ConnectionProvider.builder("azure-sdk-connection-pool") .maxConnections(MAX_OPEN_CONNECTIONS.get(settings)) .pendingAcquireMaxCount(PENDING_CONNECTION_QUEUE_SIZE) // This determines the max outstanding queued requests @@ -127,9 +131,22 @@ static AzureClientProvider create(ThreadPool threadPool, Settings settings) { ByteBufAllocator pooledByteBufAllocator = createByteBufAllocator(); + reactor.netty.http.client.HttpClient nettyHttpClient = reactor.netty.http.client.HttpClient.create(connectionProvider) + .runOn(eventLoopGroup) + .option(ChannelOption.ALLOCATOR, pooledByteBufAllocator) + .resolver(DefaultAddressResolverGroup.INSTANCE) + .port(80) + .wiretap(false); + // Just to verify that this executor exists threadPool.executor(REPOSITORY_THREAD_POOL_NAME); - return new AzureClientProvider(threadPool, REPOSITORY_THREAD_POOL_NAME, eventLoopGroup, provider, pooledByteBufAllocator); + return new AzureClientProvider(threadPool, + REPOSITORY_THREAD_POOL_NAME, + eventLoopGroup, + connectionProvider, + pooledByteBufAllocator, + nettyHttpClient + ); } private static ByteBufAllocator createByteBufAllocator() { @@ -160,17 +177,6 @@ AzureBlobServiceClient createClient(AzureStorageSettings settings, throw new IllegalStateException("AzureClientProvider is already closed"); } - reactor.netty.http.client.HttpClient nettyHttpClient = reactor.netty.http.client.HttpClient.create(connectionProvider); - nettyHttpClient = nettyHttpClient - .port(80) - .wiretap(false); - - nettyHttpClient = nettyHttpClient.tcpConfiguration(tcpClient -> { - tcpClient = tcpClient.runOn(eventLoopGroup); - tcpClient = tcpClient.option(ChannelOption.ALLOCATOR, byteBufAllocator); - return tcpClient; - }); - final HttpClient httpClient = new NettyAsyncHttpClientBuilder(nettyHttpClient) .disableBufferCopy(true) .proxy(proxyOptions) diff --git a/plugins/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureRepositoryPlugin.java b/plugins/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureRepositoryPlugin.java index d60d1ebc471e5..0f481c0aa0073 100644 --- a/plugins/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureRepositoryPlugin.java +++ b/plugins/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureRepositoryPlugin.java @@ -34,6 +34,8 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.watcher.ResourceWatcherService; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -53,6 +55,17 @@ public class AzureRepositoryPlugin extends Plugin implements RepositoryPlugin, R // Trigger static initialization with the plugin class loader // so we have access to the proper xml parser JacksonAdapter.createDefaultSerializerAdapter(); + + // Even though we don't use it, we need to force static init + // of the default resolver which reads /etc/hosts so it doesn't init later + AccessController.doPrivileged((PrivilegedAction) () -> { + try { + Class.forName("io.netty.resolver.HostsFileEntriesResolver"); + } catch (Exception e) { + throw new RuntimeException(e); + } + return null; + }); } // protected for testing diff --git a/plugins/repository-azure/src/main/plugin-metadata/plugin-security.policy b/plugins/repository-azure/src/main/plugin-metadata/plugin-security.policy index 8bc2c35fd170b..ced54e7bb17ef 100644 --- a/plugins/repository-azure/src/main/plugin-metadata/plugin-security.policy +++ b/plugins/repository-azure/src/main/plugin-metadata/plugin-security.policy @@ -14,4 +14,9 @@ grant { // Used by jackson bean deserialization permission java.lang.RuntimePermission "accessDeclaredMembers"; permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; + // needed by netty dns resolver + permission java.io.FilePermission "/etc/hosts", "read"; + permission java.io.FilePermission "/etc/resolv.conf", "read"; + permission java.io.FilePermission "/etc/resolver", "read"; + permission java.io.FilePermission "/etc/resolver/-", "read"; }; 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 b81824e9c483e7ddb4043ad91f872f96d947b036 Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Thu, 27 May 2021 10:40:08 -0700 Subject: [PATCH 2/9] Remove dependency on azure shadowjar since it's no longer required --- buildSrc/src/main/groovy/elasticsearch.ide.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/elasticsearch.ide.gradle b/buildSrc/src/main/groovy/elasticsearch.ide.gradle index 135ff14e8ba2d..09c16adcb433a 100644 --- a/buildSrc/src/main/groovy/elasticsearch.ide.gradle +++ b/buildSrc/src/main/groovy/elasticsearch.ide.gradle @@ -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 { From 4c1d01cefd8193ab6d97aa970e020bb7229bf1d2 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 27 May 2021 11:01:42 -0700 Subject: [PATCH 3/9] fix excludes --- plugins/repository-azure/build.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index 8e2618fcbbb4e..b2b5478e3ac8f 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -296,8 +296,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', @@ -348,12 +346,6 @@ 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', - - 'javax.activation.MailcapCommandMap', - 'javax.activation.MimetypesFileTypeMap', - 'reactor.core.publisher.Traces$SharedSecretsCallSiteSupplierFactory$TracingException', ) } From 2d5da6c5e66ac26a28c97d7250eafb839e93a683 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 27 May 2021 12:54:15 -0700 Subject: [PATCH 4/9] update shas --- .../snapshot-tool/licenses/jackson-annotations-2.10.4.jar.sha1 | 1 - x-pack/snapshot-tool/licenses/jackson-core-2.10.4.jar.sha1 | 1 - x-pack/snapshot-tool/licenses/jackson-databind-2.10.4.jar.sha1 | 1 - 3 files changed, 3 deletions(-) delete mode 100644 x-pack/snapshot-tool/licenses/jackson-annotations-2.10.4.jar.sha1 delete mode 100644 x-pack/snapshot-tool/licenses/jackson-core-2.10.4.jar.sha1 delete mode 100644 x-pack/snapshot-tool/licenses/jackson-databind-2.10.4.jar.sha1 diff --git a/x-pack/snapshot-tool/licenses/jackson-annotations-2.10.4.jar.sha1 b/x-pack/snapshot-tool/licenses/jackson-annotations-2.10.4.jar.sha1 deleted file mode 100644 index 0c548bb0e7711..0000000000000 --- a/x-pack/snapshot-tool/licenses/jackson-annotations-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6ae6028aff033f194c9710ad87c224ccaadeed6c \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/jackson-core-2.10.4.jar.sha1 b/x-pack/snapshot-tool/licenses/jackson-core-2.10.4.jar.sha1 deleted file mode 100644 index f83a4ac442b33..0000000000000 --- a/x-pack/snapshot-tool/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/snapshot-tool/licenses/jackson-databind-2.10.4.jar.sha1 b/x-pack/snapshot-tool/licenses/jackson-databind-2.10.4.jar.sha1 deleted file mode 100644 index 27d5a72cd27af..0000000000000 --- a/x-pack/snapshot-tool/licenses/jackson-databind-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -76e9152e93d4cf052f93a64596f633ba5b1c8ed9 \ No newline at end of file From 1ed2c4eeaa631757caebe7bfbd5209a48b96cef9 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 27 May 2021 13:37:57 -0700 Subject: [PATCH 5/9] add more shas --- .../snapshot-tool/licenses/jackson-annotations-2.12.2.jar.sha1 | 1 + x-pack/snapshot-tool/licenses/jackson-core-2.12.2.jar.sha1 | 1 + x-pack/snapshot-tool/licenses/jackson-databind-2.12.2.jar.sha1 | 1 + 3 files changed, 3 insertions(+) create mode 100644 x-pack/snapshot-tool/licenses/jackson-annotations-2.12.2.jar.sha1 create mode 100644 x-pack/snapshot-tool/licenses/jackson-core-2.12.2.jar.sha1 create mode 100644 x-pack/snapshot-tool/licenses/jackson-databind-2.12.2.jar.sha1 diff --git a/x-pack/snapshot-tool/licenses/jackson-annotations-2.12.2.jar.sha1 b/x-pack/snapshot-tool/licenses/jackson-annotations-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..8e6b8be3e084d --- /dev/null +++ b/x-pack/snapshot-tool/licenses/jackson-annotations-2.12.2.jar.sha1 @@ -0,0 +1 @@ +0a770cc4c0a1fb0bfd8a150a6a0004e42bc99fca \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/jackson-core-2.12.2.jar.sha1 b/x-pack/snapshot-tool/licenses/jackson-core-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..953c420544bd5 --- /dev/null +++ b/x-pack/snapshot-tool/licenses/jackson-core-2.12.2.jar.sha1 @@ -0,0 +1 @@ +8df50138521d05561a308ec2799cc8dda20c06df \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/jackson-databind-2.12.2.jar.sha1 b/x-pack/snapshot-tool/licenses/jackson-databind-2.12.2.jar.sha1 new file mode 100644 index 0000000000000..8e574b75a883f --- /dev/null +++ b/x-pack/snapshot-tool/licenses/jackson-databind-2.12.2.jar.sha1 @@ -0,0 +1 @@ +5f9d79e09ebf5d54a46e9f4543924cf7ae7654e0 \ No newline at end of file From 9e7c879461b4fb44f26ada16e5494c94efdbb9b9 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 27 May 2021 15:11:27 -0700 Subject: [PATCH 6/9] remove azure specific netty version for 7.x --- plugins/repository-azure/build.gradle | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index b2b5478e3ac8f..8ac4fe07eca1b 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -32,7 +32,6 @@ versions << [ 'stax2API': '4.2', 'woodstox': '6.2.4', - 'azureNetty': '4.1.63.Final', 'reactorNetty': '1.0.6', 'reactorCore': '3.4.5', 'reactiveStreams': '1.0.3', @@ -60,19 +59,19 @@ dependencies { api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}" // 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-transport:${versions.azureNetty}" - api "io.netty:netty-transport-native-unix-common:${versions.azureNetty}" + 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-common:${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}" From 263c06a2e5a85ac3b78f277dd839118ad72e65ea Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 27 May 2021 15:18:07 -0700 Subject: [PATCH 7/9] upgrade netty as well (must be done for 7.x) --- buildSrc/version.properties | 2 +- .../licenses/netty-buffer-4.1.49.Final.jar.sha1 | 1 - .../licenses/netty-buffer-4.1.63.Final.jar.sha1 | 1 + .../transport-netty4/licenses/netty-codec-4.1.49.Final.jar.sha1 | 1 - .../transport-netty4/licenses/netty-codec-4.1.63.Final.jar.sha1 | 1 + .../licenses/netty-codec-http-4.1.49.Final.jar.sha1 | 1 - .../licenses/netty-codec-http-4.1.63.Final.jar.sha1 | 1 + .../licenses/netty-common-4.1.49.Final.jar.sha1 | 1 - .../licenses/netty-common-4.1.63.Final.jar.sha1 | 1 + .../licenses/netty-handler-4.1.49.Final.jar.sha1 | 1 - .../licenses/netty-handler-4.1.63.Final.jar.sha1 | 1 + .../licenses/netty-resolver-4.1.49.Final.jar.sha1 | 1 - .../licenses/netty-resolver-4.1.63.Final.jar.sha1 | 1 + .../licenses/netty-transport-4.1.49.Final.jar.sha1 | 1 - .../licenses/netty-transport-4.1.63.Final.jar.sha1 | 1 + .../transport-nio/licenses/netty-buffer-4.1.49.Final.jar.sha1 | 1 - .../transport-nio/licenses/netty-buffer-4.1.63.Final.jar.sha1 | 1 + .../transport-nio/licenses/netty-codec-4.1.49.Final.jar.sha1 | 1 - .../transport-nio/licenses/netty-codec-4.1.63.Final.jar.sha1 | 1 + .../licenses/netty-codec-http-4.1.49.Final.jar.sha1 | 1 - .../licenses/netty-codec-http-4.1.63.Final.jar.sha1 | 1 + .../transport-nio/licenses/netty-common-4.1.49.Final.jar.sha1 | 1 - .../transport-nio/licenses/netty-common-4.1.63.Final.jar.sha1 | 1 + .../transport-nio/licenses/netty-handler-4.1.49.Final.jar.sha1 | 1 - .../transport-nio/licenses/netty-handler-4.1.63.Final.jar.sha1 | 1 + .../transport-nio/licenses/netty-resolver-4.1.49.Final.jar.sha1 | 1 - .../transport-nio/licenses/netty-resolver-4.1.63.Final.jar.sha1 | 1 + .../licenses/netty-transport-4.1.49.Final.jar.sha1 | 1 - .../licenses/netty-transport-4.1.63.Final.jar.sha1 | 1 + 29 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.49.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.63.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.49.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.63.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.49.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.63.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.49.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.63.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.49.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.63.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.49.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.63.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.49.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.63.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.49.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.63.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.49.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.63.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.49.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.63.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-common-4.1.49.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-common-4.1.63.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.49.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.63.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.49.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.63.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.49.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.63.Final.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index da06e9dbe9e37..30eae7b0141df 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -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 diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.49.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.49.Final.jar.sha1 deleted file mode 100644 index 14da1fbad92f1..0000000000000 --- a/modules/transport-netty4/licenses/netty-buffer-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8e819a81bca88d1e88137336f64531a53db0a4ad \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.63.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..d472369d69bc0 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-buffer-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +40028ce5ac7c43f1c9a1439f74637cad04013e23 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.49.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.49.Final.jar.sha1 deleted file mode 100644 index 6353dc0b7ada3..0000000000000 --- a/modules/transport-netty4/licenses/netty-codec-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -20218de83c906348283f548c255650fd06030424 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.63.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..8bfbe331c55c9 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +d4d2fccea88c80e56d59ce1053c53df0f9f4f5db \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.49.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.49.Final.jar.sha1 deleted file mode 100644 index 07651dd7f7682..0000000000000 --- a/modules/transport-netty4/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/modules/transport-netty4/licenses/netty-codec-http-4.1.63.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..0279e286e318d --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +f8c9b159dcb76452dc98a370a5511ff993670419 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.1.49.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.49.Final.jar.sha1 deleted file mode 100644 index 2c0aee66a9914..0000000000000 --- a/modules/transport-netty4/licenses/netty-common-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -927c8563a1662d869b145e70ce82ad89100f2c90 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.1.63.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..54e103f1d8b5f --- /dev/null +++ b/modules/transport-netty4/licenses/netty-common-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +e1206b46384d4dcbecee2901f18ce65ecf02e8a4 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.49.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.49.Final.jar.sha1 deleted file mode 100644 index c6e2ae4fa045c..0000000000000 --- a/modules/transport-netty4/licenses/netty-handler-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c73443adb9d085d5dc2d5b7f3bdd91d5963976f7 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.63.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..ae180d9ae4016 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-handler-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +879a43c2325b08e92e8967218b6ddb0ed4b7a0d3 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.49.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.49.Final.jar.sha1 deleted file mode 100644 index 986895a8ecf31..0000000000000 --- a/modules/transport-netty4/licenses/netty-resolver-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eb81e1f0eaa99e75983bf3d28cae2b103e0f3a34 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.63.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..eb6858e75cc21 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-resolver-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +d07cd47c101dfa655d6d5cc304d523742fd78ca8 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.49.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.49.Final.jar.sha1 deleted file mode 100644 index 175b8c84a8824..0000000000000 --- a/modules/transport-netty4/licenses/netty-transport-4.1.49.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -415ea7f326635743aec952fe2349ca45959e94a7 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.63.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..c41cdc86c51c8 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-transport-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +09a8bbe1ba082c9434e6f524d3864a53f340f2df \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.49.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.49.Final.jar.sha1 deleted file mode 100644 index 14da1fbad92f1..0000000000000 --- a/plugins/transport-nio/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/transport-nio/licenses/netty-buffer-4.1.63.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..d472369d69bc0 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-buffer-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +40028ce5ac7c43f1c9a1439f74637cad04013e23 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.49.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.49.Final.jar.sha1 deleted file mode 100644 index 6353dc0b7ada3..0000000000000 --- a/plugins/transport-nio/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/transport-nio/licenses/netty-codec-4.1.63.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..8bfbe331c55c9 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-codec-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +d4d2fccea88c80e56d59ce1053c53df0f9f4f5db \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.49.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.49.Final.jar.sha1 deleted file mode 100644 index 07651dd7f7682..0000000000000 --- a/plugins/transport-nio/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/transport-nio/licenses/netty-codec-http-4.1.63.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..0279e286e318d --- /dev/null +++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +f8c9b159dcb76452dc98a370a5511ff993670419 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-common-4.1.49.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.49.Final.jar.sha1 deleted file mode 100644 index 2c0aee66a9914..0000000000000 --- a/plugins/transport-nio/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/transport-nio/licenses/netty-common-4.1.63.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..54e103f1d8b5f --- /dev/null +++ b/plugins/transport-nio/licenses/netty-common-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +e1206b46384d4dcbecee2901f18ce65ecf02e8a4 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.49.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.49.Final.jar.sha1 deleted file mode 100644 index c6e2ae4fa045c..0000000000000 --- a/plugins/transport-nio/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/transport-nio/licenses/netty-handler-4.1.63.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..ae180d9ae4016 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-handler-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +879a43c2325b08e92e8967218b6ddb0ed4b7a0d3 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.49.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.49.Final.jar.sha1 deleted file mode 100644 index 986895a8ecf31..0000000000000 --- a/plugins/transport-nio/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/transport-nio/licenses/netty-resolver-4.1.63.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..eb6858e75cc21 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-resolver-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +d07cd47c101dfa655d6d5cc304d523742fd78ca8 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.49.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.49.Final.jar.sha1 deleted file mode 100644 index 175b8c84a8824..0000000000000 --- a/plugins/transport-nio/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/transport-nio/licenses/netty-transport-4.1.63.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.63.Final.jar.sha1 new file mode 100644 index 0000000000000..c41cdc86c51c8 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-transport-4.1.63.Final.jar.sha1 @@ -0,0 +1 @@ +09a8bbe1ba082c9434e6f524d3864a53f340f2df \ No newline at end of file From c23f0f79f7bd6be26562229f929ca04ae5392bfc Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 27 May 2021 15:55:13 -0700 Subject: [PATCH 8/9] add ignores --- modules/transport-netty4/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index 4246fdebfb7df..24cf748e31f28 100644 --- a/modules/transport-netty4/build.gradle +++ b/modules/transport-netty4/build.gradle @@ -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', From eaa6778ab98f4c8e9bad94b1cb7bee6aa852a64c Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 27 May 2021 15:56:11 -0700 Subject: [PATCH 9/9] more --- plugins/transport-nio/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle index 6accefce0fd28..1f34ac464ae50 100644 --- a/plugins/transport-nio/build.gradle +++ b/plugins/transport-nio/build.gradle @@ -123,6 +123,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', 'reactor.blockhound.BlockHound$Builder', 'reactor.blockhound.integration.BlockHoundIntegration'