From 2820d0adab881b6c337547d31a9bbe87e969a2ed Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Mon, 1 Nov 2021 13:53:38 -0400 Subject: [PATCH 1/4] Update jackson and azure This grabs a new version of jackson and snakeyaml to get some bug fixes. It also updates azure to stay compatible with the new jackson. Closes #66555 Closes #67214 Closes #80142 --- .../src/main/groovy/elasticsearch.ide.gradle | 2 +- build-tools-internal/version.properties | 4 +- .../licenses/jackson-core-2.10.4.jar.sha1 | 1 - .../licenses/jackson-core-2.13.0.jar.sha1 | 1 + .../jackson-annotations-2.10.4.jar.sha1 | 1 - .../jackson-annotations-2.13.0.jar.sha1 | 1 + .../licenses/jackson-databind-2.10.4.jar.sha1 | 1 - .../licenses/jackson-databind-2.13.0.jar.sha1 | 1 + .../licenses/jackson-core-2.10.4.jar.sha1 | 1 - .../licenses/jackson-core-2.13.0.jar.sha1 | 1 + .../jackson-dataformat-cbor-2.10.4.jar.sha1 | 1 - .../jackson-dataformat-cbor-2.13.0.jar.sha1 | 1 + .../jackson-dataformat-smile-2.10.4.jar.sha1 | 1 - .../jackson-dataformat-smile-2.13.0.jar.sha1 | 1 + .../jackson-dataformat-yaml-2.10.4.jar.sha1 | 1 - .../jackson-dataformat-yaml-2.13.0.jar.sha1 | 1 + .../licenses/snakeyaml-1.26.jar.sha1 | 1 - .../licenses/snakeyaml-1.29.jar.sha1 | 1 + .../jackson-annotations-2.10.4.jar.sha1 | 1 - .../jackson-annotations-2.13.0.jar.sha1 | 1 + .../licenses/jackson-databind-2.10.4.jar.sha1 | 1 - .../licenses/jackson-databind-2.13.0.jar.sha1 | 1 + .../jackson-annotations-2.10.4.jar.sha1 | 1 - .../jackson-annotations-2.13.0.jar.sha1 | 1 + .../licenses/jackson-databind-2.10.4.jar.sha1 | 1 - .../licenses/jackson-databind-2.13.0.jar.sha1 | 1 + plugins/repository-azure/build.gradle | 55 +++++++++++-------- .../licenses/azure-core-1.10.0.jar.sha1 | 1 - .../licenses/azure-core-1.21.0.jar.sha1 | 1 + .../azure-core-http-netty-1.11.1.jar.sha1 | 1 + .../azure-core-http-netty-1.6.3.jar.sha1 | 1 - .../azure-storage-blob-12.14.0.jar.sha1 | 1 + .../azure-storage-common-12.14.0.jar.sha1 | 1 + .../azure-storage-common-12.9.0.jar.sha1 | 1 - ...zure-storage-internal-avro-12.1.1.jar.sha1 | 1 + .../jackson-annotations-2.10.4.jar.sha1 | 1 - .../jackson-annotations-2.13.0.jar.sha1 | 1 + .../licenses/jackson-databind-2.10.4.jar.sha1 | 1 - .../licenses/jackson-databind-2.13.0.jar.sha1 | 1 + .../jackson-dataformat-xml-2.10.4.jar.sha1 | 1 - .../jackson-dataformat-xml-2.13.0.jar.sha1 | 1 + .../jackson-datatype-jsr310-2.10.4.jar.sha1 | 1 - .../jackson-datatype-jsr310-2.13.0.jar.sha1 | 1 + ...on-module-jaxb-annotations-2.10.4.jar.sha1 | 1 - ...on-module-jaxb-annotations-2.13.0.jar.sha1 | 1 + .../netty-codec-dns-4.1.66.Final.jar.sha1 | 1 + .../netty-resolver-dns-4.1.66.Final.jar.sha1 | 1 + ...t-native-unix-common-4.1.66.Final.jar.sha1 | 1 + .../reactor-core-3.3.10.RELEASE.jar.sha1 | 1 - .../licenses/reactor-core-3.4.11.jar.sha1 | 1 + .../reactor-netty-0.9.12.RELEASE.jar.sha1 | 1 - .../licenses/reactor-netty-1.0.12.jar.sha1 | 1 + .../reactor-netty-core-1.0.12.jar.sha1 | 1 + .../reactor-netty-http-1.0.12.jar.sha1 | 1 + .../licenses/woodstox-core-6.0.2.jar.sha1 | 1 - .../licenses/woodstox-core-6.2.6.jar.sha1 | 1 + .../azure/AzureRepositoryPlugin.java | 13 +++++ .../plugin-metadata/plugin-security.policy | 5 ++ .../jackson-annotations-2.10.4.jar.sha1 | 1 - .../jackson-annotations-2.13.0.jar.sha1 | 1 + .../licenses/jackson-databind-2.10.4.jar.sha1 | 1 - .../licenses/jackson-databind-2.13.0.jar.sha1 | 1 + qa/smoke-test-http/build.gradle | 2 +- .../support/AbstractFilteringTestCase.java | 6 ++ .../licenses/jackson-core-2.10.4.jar.sha1 | 1 - .../licenses/jackson-core-2.13.0.jar.sha1 | 1 + .../jackson-dataformat-cbor-2.10.4.jar.sha1 | 1 - .../jackson-dataformat-cbor-2.13.0.jar.sha1 | 1 + .../licenses/jackson-core-2.10.4.jar.sha1 | 1 - .../licenses/jackson-core-2.13.0.jar.sha1 | 1 + .../licenses/jackson-core-2.10.4.jar.sha1 | 1 - .../licenses/jackson-core-2.13.0.jar.sha1 | 1 + .../licenses/jackson-core-2.10.4.jar.sha1 | 1 - .../licenses/jackson-core-2.13.0.jar.sha1 | 1 + 74 files changed, 96 insertions(+), 58 deletions(-) delete mode 100644 client/sniffer/licenses/jackson-core-2.10.4.jar.sha1 create mode 100644 client/sniffer/licenses/jackson-core-2.13.0.jar.sha1 delete mode 100644 distribution/tools/plugin-cli/licenses/jackson-annotations-2.10.4.jar.sha1 create mode 100644 distribution/tools/plugin-cli/licenses/jackson-annotations-2.13.0.jar.sha1 delete mode 100644 distribution/tools/plugin-cli/licenses/jackson-databind-2.10.4.jar.sha1 create mode 100644 distribution/tools/plugin-cli/licenses/jackson-databind-2.13.0.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.13.0.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.13.0.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.13.0.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.13.0.jar.sha1 delete mode 100644 libs/x-content/licenses/snakeyaml-1.26.jar.sha1 create mode 100644 libs/x-content/licenses/snakeyaml-1.29.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.13.0.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.13.0.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.13.0.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.13.0.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.21.0.jar.sha1 create mode 100644 plugins/repository-azure/licenses/azure-core-http-netty-1.11.1.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-storage-blob-12.14.0.jar.sha1 create mode 100644 plugins/repository-azure/licenses/azure-storage-common-12.14.0.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.1.1.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.13.0.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.13.0.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.13.0.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.13.0.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.13.0.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-codec-dns-4.1.66.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-resolver-dns-4.1.66.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.66.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.11.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.12.jar.sha1 create mode 100644 plugins/repository-azure/licenses/reactor-netty-core-1.0.12.jar.sha1 create mode 100644 plugins/repository-azure/licenses/reactor-netty-http-1.0.12.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.6.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.13.0.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.13.0.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.13.0.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.13.0.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.13.0.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.13.0.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.13.0.jar.sha1 diff --git a/build-tools-internal/src/main/groovy/elasticsearch.ide.gradle b/build-tools-internal/src/main/groovy/elasticsearch.ide.gradle index f30cbe063d01b..03d98124c4176 100644 --- a/build-tools-internal/src/main/groovy/elasticsearch.ide.gradle +++ b/build-tools-internal/src/main/groovy/elasticsearch.ide.gradle @@ -88,7 +88,7 @@ if (providers.systemProperty('idea.active').forUseAtConfigurationTime().getOrNul tasks.register('buildDependencyArtifacts') { group = 'ide' description = 'Builds artifacts needed as dependency for IDE modules' - dependsOn ':client:rest-high-level:shadowJar', ':plugins:repository-hdfs:hadoop-client-api:shadowJar', ':plugins:repository-azure:azure-storage-blob:shadowJar' + dependsOn ':client:rest-high-level:shadowJar', ':plugins:repository-hdfs:hadoop-client-api:shadowJar' } idea { diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index 41af236ebd6f0..6737974ff39d7 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -9,8 +9,8 @@ checkstyle = 8.42 # optional dependencies spatial4j = 0.7 jts = 1.15.0 -jackson = 2.10.4 -snakeyaml = 1.26 +jackson = 2.13.0 +snakeyaml = 1.29 icu4j = 68.2 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.13.0.jar.sha1 b/client/sniffer/licenses/jackson-core-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..b62e0973d3580 --- /dev/null +++ b/client/sniffer/licenses/jackson-core-2.13.0.jar.sha1 @@ -0,0 +1 @@ +e957ec5442966e69cef543927bdc80e5426968bb \ No newline at end of file diff --git a/distribution/tools/plugin-cli/licenses/jackson-annotations-2.10.4.jar.sha1 b/distribution/tools/plugin-cli/licenses/jackson-annotations-2.10.4.jar.sha1 deleted file mode 100644 index 0c548bb0e7711..0000000000000 --- a/distribution/tools/plugin-cli/licenses/jackson-annotations-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6ae6028aff033f194c9710ad87c224ccaadeed6c \ No newline at end of file diff --git a/distribution/tools/plugin-cli/licenses/jackson-annotations-2.13.0.jar.sha1 b/distribution/tools/plugin-cli/licenses/jackson-annotations-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..fade06416bd16 --- /dev/null +++ b/distribution/tools/plugin-cli/licenses/jackson-annotations-2.13.0.jar.sha1 @@ -0,0 +1 @@ +15be89db6609bd6fda3dc309bacf0318a312c03f \ No newline at end of file diff --git a/distribution/tools/plugin-cli/licenses/jackson-databind-2.10.4.jar.sha1 b/distribution/tools/plugin-cli/licenses/jackson-databind-2.10.4.jar.sha1 deleted file mode 100644 index 27d5a72cd27af..0000000000000 --- a/distribution/tools/plugin-cli/licenses/jackson-databind-2.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -76e9152e93d4cf052f93a64596f633ba5b1c8ed9 \ No newline at end of file diff --git a/distribution/tools/plugin-cli/licenses/jackson-databind-2.13.0.jar.sha1 b/distribution/tools/plugin-cli/licenses/jackson-databind-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..c81d25141f1bc --- /dev/null +++ b/distribution/tools/plugin-cli/licenses/jackson-databind-2.13.0.jar.sha1 @@ -0,0 +1 @@ +889672a1721d6d85b2834fcd29d3fda92c8c8891 \ 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.13.0.jar.sha1 b/libs/x-content/licenses/jackson-core-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..b62e0973d3580 --- /dev/null +++ b/libs/x-content/licenses/jackson-core-2.13.0.jar.sha1 @@ -0,0 +1 @@ +e957ec5442966e69cef543927bdc80e5426968bb \ 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.13.0.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-cbor-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..a280e8bd9fc87 --- /dev/null +++ b/libs/x-content/licenses/jackson-dataformat-cbor-2.13.0.jar.sha1 @@ -0,0 +1 @@ +8d4c05a638d686138021a2480a9d67b5fdef6e0d \ 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.13.0.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-smile-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..3b9030bdfdad6 --- /dev/null +++ b/libs/x-content/licenses/jackson-dataformat-smile-2.13.0.jar.sha1 @@ -0,0 +1 @@ +a8c8f05272b8f9d7220e7b3fef4ab0a89fa20808 \ 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.13.0.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-yaml-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..240170baa72f6 --- /dev/null +++ b/libs/x-content/licenses/jackson-dataformat-yaml-2.13.0.jar.sha1 @@ -0,0 +1 @@ +90c7265058f7b8b805abde4da1e2e59febb30c7d \ 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.29.jar.sha1 b/libs/x-content/licenses/snakeyaml-1.29.jar.sha1 new file mode 100644 index 0000000000000..203206c114f84 --- /dev/null +++ b/libs/x-content/licenses/snakeyaml-1.29.jar.sha1 @@ -0,0 +1 @@ +6d0cdafb2010f1297e574656551d7145240f6e25 \ 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.13.0.jar.sha1 b/modules/ingest-geoip/licenses/jackson-annotations-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..fade06416bd16 --- /dev/null +++ b/modules/ingest-geoip/licenses/jackson-annotations-2.13.0.jar.sha1 @@ -0,0 +1 @@ +15be89db6609bd6fda3dc309bacf0318a312c03f \ 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.13.0.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..c81d25141f1bc --- /dev/null +++ b/modules/ingest-geoip/licenses/jackson-databind-2.13.0.jar.sha1 @@ -0,0 +1 @@ +889672a1721d6d85b2834fcd29d3fda92c8c8891 \ 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.13.0.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-annotations-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..fade06416bd16 --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-annotations-2.13.0.jar.sha1 @@ -0,0 +1 @@ +15be89db6609bd6fda3dc309bacf0318a312c03f \ 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.13.0.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..c81d25141f1bc --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-databind-2.13.0.jar.sha1 @@ -0,0 +1 @@ +889672a1721d6d85b2834fcd29d3fda92c8c8891 \ No newline at end of file diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index b5f7b4d498312..944d3f4d6428b 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -23,38 +23,34 @@ esplugin { } versions << [ - 'azure': '12.9.0', - 'azureCore': '1.10.0', - 'azureCoreHttpNetty': '1.6.3', + 'azure': '12.14.0', + 'azureCore': '1.21.0', + 'azureCoreHttpNetty': '1.11.1', + 'azureAvro': '12.1.1', 'jakartaActivation': '1.2.1', 'jakartaXMLBind': '2.3.2', 'stax2API': '4.2', - 'woodstox': '6.0.2', + 'woodstox': '6.2.6', - 'reactorNetty': '0.9.12.RELEASE', - 'reactorCore': '3.3.10.RELEASE', + 'reactorNetty': '1.0.12', + 'reactorCore': '3.4.11', '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}" @@ -67,18 +63,23 @@ dependencies { // netty api "io.netty:netty-buffer:${versions.netty}" + api "io.netty:netty-codec:${versions.netty}" + api "io.netty:netty-codec-dns:${versions.netty}" api "io.netty:netty-codec-http:${versions.netty}" api "io.netty:netty-codec-http2:${versions.netty}" api "io.netty:netty-codec-socks:${versions.netty}" - api "io.netty:netty-codec:${versions.netty}" api "io.netty:netty-common:${versions.netty}" - api "io.netty:netty-handler-proxy:${versions.netty}" api "io.netty:netty-handler:${versions.netty}" + api "io.netty:netty-handler-proxy:${versions.netty}" api "io.netty:netty-resolver:${versions.netty}" + api "io.netty:netty-resolver-dns:${versions.netty}" api "io.netty:netty-transport:${versions.netty}" + api "io.netty:netty-transport-native-unix-common:${versions.netty}" // reactor api "io.projectreactor.netty:reactor-netty:${versions.reactorNetty}" + api "io.projectreactor.netty:reactor-netty-core:${versions.reactorNetty}" + api "io.projectreactor.netty:reactor-netty-http:${versions.reactorNetty}" api "io.projectreactor:reactor-core:${versions.reactorCore}" api "org.reactivestreams:reactive-streams:${versions.reactiveStreams}" @@ -108,6 +109,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' } @@ -254,14 +256,25 @@ tasks.named("thirdPartyAudit").configure { // it uses NIO 'io.netty.channel.kqueue.KQueue', 'io.netty.channel.kqueue.KQueueDatagramChannel', + 'io.netty.channel.kqueue.KQueueDomainDatagramChannel', + '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.EpollDomainDatagramChannel', + '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', @@ -271,13 +284,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( @@ -303,11 +314,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.21.0.jar.sha1 b/plugins/repository-azure/licenses/azure-core-1.21.0.jar.sha1 new file mode 100644 index 0000000000000..1532a810dcfd8 --- /dev/null +++ b/plugins/repository-azure/licenses/azure-core-1.21.0.jar.sha1 @@ -0,0 +1 @@ +f231784d49156f602d7952c9984cdc75677c6cd6 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-core-http-netty-1.11.1.jar.sha1 b/plugins/repository-azure/licenses/azure-core-http-netty-1.11.1.jar.sha1 new file mode 100644 index 0000000000000..f800048a834e2 --- /dev/null +++ b/plugins/repository-azure/licenses/azure-core-http-netty-1.11.1.jar.sha1 @@ -0,0 +1 @@ +94236568194f4d7453d0d023f0bdeed94d744f12 \ 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-storage-blob-12.14.0.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-blob-12.14.0.jar.sha1 new file mode 100644 index 0000000000000..85271652583c0 --- /dev/null +++ b/plugins/repository-azure/licenses/azure-storage-blob-12.14.0.jar.sha1 @@ -0,0 +1 @@ +75d45d21dc208fa369abc832354470464c859d67 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-storage-common-12.14.0.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-common-12.14.0.jar.sha1 new file mode 100644 index 0000000000000..c2fbd451e785e --- /dev/null +++ b/plugins/repository-azure/licenses/azure-storage-common-12.14.0.jar.sha1 @@ -0,0 +1 @@ +ed58d3438a7fa3a2a5e9f60c0111795101dc8bf6 \ 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.1.1.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-internal-avro-12.1.1.jar.sha1 new file mode 100644 index 0000000000000..dd300094ae344 --- /dev/null +++ b/plugins/repository-azure/licenses/azure-storage-internal-avro-12.1.1.jar.sha1 @@ -0,0 +1 @@ +3a13c7837bbbc88b4ba0559b15df5f8db7c1ef50 \ 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.13.0.jar.sha1 b/plugins/repository-azure/licenses/jackson-annotations-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..fade06416bd16 --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-annotations-2.13.0.jar.sha1 @@ -0,0 +1 @@ +15be89db6609bd6fda3dc309bacf0318a312c03f \ 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.13.0.jar.sha1 b/plugins/repository-azure/licenses/jackson-databind-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..c81d25141f1bc --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-databind-2.13.0.jar.sha1 @@ -0,0 +1 @@ +889672a1721d6d85b2834fcd29d3fda92c8c8891 \ 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.13.0.jar.sha1 b/plugins/repository-azure/licenses/jackson-dataformat-xml-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..cf80513a3b30b --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-dataformat-xml-2.13.0.jar.sha1 @@ -0,0 +1 @@ +396634365e8439b27794fa94b571fdc03b4cf7be \ 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.13.0.jar.sha1 b/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..394b17e7f6633 --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.13.0.jar.sha1 @@ -0,0 +1 @@ +4c143877fc733befe6189151c8b95d84acd06941 \ 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.13.0.jar.sha1 b/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..c5fabf513d6e6 --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.13.0.jar.sha1 @@ -0,0 +1 @@ +ddfabac3d9a4cbe43afd6c472e536b26adcd6561 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.66.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.66.Final.jar.sha1 new file mode 100644 index 0000000000000..4d3a380587356 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-dns-4.1.66.Final.jar.sha1 @@ -0,0 +1 @@ +390ff96a0e1f7c626cb52c119a1a1dfd0784d193 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.66.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.66.Final.jar.sha1 new file mode 100644 index 0000000000000..2c6e402388e1f --- /dev/null +++ b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.66.Final.jar.sha1 @@ -0,0 +1 @@ +7b74815fb1403e5747c872c6eee2a07e7a700d30 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.66.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.66.Final.jar.sha1 new file mode 100644 index 0000000000000..34c5e28957d3c --- /dev/null +++ b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.66.Final.jar.sha1 @@ -0,0 +1 @@ +d0163c1d9ec983fc413cafc7610e27e269517634 \ 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.11.jar.sha1 b/plugins/repository-azure/licenses/reactor-core-3.4.11.jar.sha1 new file mode 100644 index 0000000000000..fc0911be8fedf --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-core-3.4.11.jar.sha1 @@ -0,0 +1 @@ +0e305f6aa6e6da26aa42726f8cfd69b6ab53d7c0 \ 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.12.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-1.0.12.jar.sha1 new file mode 100644 index 0000000000000..e072c974ac172 --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-1.0.12.jar.sha1 @@ -0,0 +1 @@ +4765023130d1dc1e8ec3e5e7842564953cf549db \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.0.12.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.0.12.jar.sha1 new file mode 100644 index 0000000000000..16e86450c14dc --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-core-1.0.12.jar.sha1 @@ -0,0 +1 @@ +2b5b9fee56a6e492db277cd27e8baa7e1988e3cd \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.0.12.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.0.12.jar.sha1 new file mode 100644 index 0000000000000..dc1f350c360f4 --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-http-1.0.12.jar.sha1 @@ -0,0 +1 @@ +494c9d45bc4de180e2eb911d1af7077c80740276 \ 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.6.jar.sha1 b/plugins/repository-azure/licenses/woodstox-core-6.2.6.jar.sha1 new file mode 100644 index 0000000000000..c65ef9a0cdc3b --- /dev/null +++ b/plugins/repository-azure/licenses/woodstox-core-6.2.6.jar.sha1 @@ -0,0 +1 @@ +d4a055af5dcadea8d1bded5b64bc7be5bb7fea95 \ No newline at end of file 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 0634f02b69af6..25432fc92d2ed 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.watcher.ResourceWatcherService; import org.elasticsearch.xcontent.NamedXContentRegistry; +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.13.0.jar.sha1 b/plugins/repository-s3/licenses/jackson-annotations-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..fade06416bd16 --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-annotations-2.13.0.jar.sha1 @@ -0,0 +1 @@ +15be89db6609bd6fda3dc309bacf0318a312c03f \ 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.13.0.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..c81d25141f1bc --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-databind-2.13.0.jar.sha1 @@ -0,0 +1 @@ +889672a1721d6d85b2834fcd29d3fda92c8c8891 \ No newline at end of file diff --git a/qa/smoke-test-http/build.gradle b/qa/smoke-test-http/build.gradle index 7fbe58396d782..b8cb7f66fbe78 100644 --- a/qa/smoke-test-http/build.gradle +++ b/qa/smoke-test-http/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'elasticsearch.rest-test' apply plugin: 'elasticsearch.test-with-dependencies' dependencies { - testImplementation "com.fasterxml.jackson.core:jackson-databind:2.10.4" + // testImplementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}" testImplementation project(':modules:transport-netty4') // for http testImplementation project(':plugins:transport-nio') // for http } diff --git a/test/framework/src/main/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java b/test/framework/src/main/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java index c5bb14133042e..d2c7b892de87d 100644 --- a/test/framework/src/main/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java @@ -432,6 +432,12 @@ public void testFilterPrefix() throws IOException { testFilter(expected, sample, singleton("photosCount"), emptySet()); } + public void testFilterNothingInObject() throws IOException { + final Builder sample = builder -> builder.startObject().field("bar", "test1").field("foo", "test2").endObject(); + Builder expected = builder -> builder.startObject().field("bar", "test1").field("foo", "test2").endObject(); + testFilter(expected, sample, emptySet(), singleton("bar.xxx")); + } + public void testManyFilters() throws IOException, URISyntaxException { Builder deep = builder -> builder.startObject() .startObject("system") 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.13.0.jar.sha1 b/x-pack/plugin/sql/jdbc/licenses/jackson-core-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..b62e0973d3580 --- /dev/null +++ b/x-pack/plugin/sql/jdbc/licenses/jackson-core-2.13.0.jar.sha1 @@ -0,0 +1 @@ +e957ec5442966e69cef543927bdc80e5426968bb \ 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.13.0.jar.sha1 b/x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..a280e8bd9fc87 --- /dev/null +++ b/x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.13.0.jar.sha1 @@ -0,0 +1 @@ +8d4c05a638d686138021a2480a9d67b5fdef6e0d \ 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.13.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/jackson-core-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..b62e0973d3580 --- /dev/null +++ b/x-pack/plugin/sql/sql-action/licenses/jackson-core-2.13.0.jar.sha1 @@ -0,0 +1 @@ +e957ec5442966e69cef543927bdc80e5426968bb \ 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.13.0.jar.sha1 b/x-pack/plugin/sql/sql-client/licenses/jackson-core-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..b62e0973d3580 --- /dev/null +++ b/x-pack/plugin/sql/sql-client/licenses/jackson-core-2.13.0.jar.sha1 @@ -0,0 +1 @@ +e957ec5442966e69cef543927bdc80e5426968bb \ 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.13.0.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.13.0.jar.sha1 new file mode 100644 index 0000000000000..b62e0973d3580 --- /dev/null +++ b/x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.13.0.jar.sha1 @@ -0,0 +1 @@ +e957ec5442966e69cef543927bdc80e5426968bb \ No newline at end of file From 6b1da9d8458303deb6150f730bc24f5508f461d4 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Mon, 1 Nov 2021 16:01:04 -0400 Subject: [PATCH 2/4] No databind --- qa/smoke-test-http/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/qa/smoke-test-http/build.gradle b/qa/smoke-test-http/build.gradle index b8cb7f66fbe78..5b56cdc784206 100644 --- a/qa/smoke-test-http/build.gradle +++ b/qa/smoke-test-http/build.gradle @@ -12,7 +12,6 @@ apply plugin: 'elasticsearch.rest-test' apply plugin: 'elasticsearch.test-with-dependencies' dependencies { - // testImplementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}" testImplementation project(':modules:transport-netty4') // for http testImplementation project(':plugins:transport-nio') // for http } From 94e84c9c19f4fb180b644ae45bcb5c40203c0e77 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Tue, 2 Nov 2021 09:35:59 -0400 Subject: [PATCH 3/4] Finish restore? --- .../azure-storage-blob/build.gradle | 47 ------------------- .../azure/AzureClientProvider.java | 24 ++++++++-- 2 files changed, 21 insertions(+), 50 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/src/main/java/org/elasticsearch/repositories/azure/AzureClientProvider.java b/plugins/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureClientProvider.java index 18601757efea9..c46271fd0ce57 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 @@ -13,6 +13,7 @@ import io.netty.channel.ChannelOption; import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.resolver.DefaultAddressResolverGroup; import reactor.core.publisher.Mono; import reactor.core.scheduler.Scheduler; import reactor.core.scheduler.Schedulers; @@ -93,6 +94,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; @@ -101,13 +103,15 @@ 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) { @@ -127,7 +131,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.builder("azure-sdk-connection-pool") + 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 .pendingAcquireTimeout(Duration.ofMillis(openConnectionTimeout.millis())) @@ -136,9 +140,23 @@ 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() { From 9e4ead89160d9204c484897d14d2978034ca4f6f Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Tue, 2 Nov 2021 16:53:45 -0400 Subject: [PATCH 4/4] Add old code --- .../repositories/azure/AzureClientProvider.java | 9 --------- 1 file changed, 9 deletions(-) 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 c46271fd0ce57..6edb9ee113bae 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 @@ -181,15 +181,6 @@ AzureBlobServiceClient createClient( 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).build(); final String connectionString = settings.getConnectString();