Apache Solr open-source search software
SOLR-15677: Update dependencies with found vulnerabilities..
Houston Putman51b505434b83
diff --git a/gradle/hacks/solr.findbugs.gradle b/gradle/hacks/solr.findbugs.gradleindex f228738936e..11114b5854d 100644--- a/gradle/hacks/solr.findbugs.gradle+++ b/gradle/hacks/solr.findbugs.gradle@@ -21,9 +21,13 @@configure([project(":solr:core"),project(":solr:solrj"),- project(":solr:contrib:prometheus-exporter"),project(":solr:test-framework"),- project(":solr:contrib:analytics")]) {+ project(":solr:contrib:analytics"),+ project(":solr:contrib:langid"),+ project(":solr:contrib:ltr"),+ project(":solr:contrib:s3-repository"),+ project(":solr:contrib:scripting"),+ project(":solr:contrib:prometheus-exporter")]) {plugins.withType(JavaPlugin) {dependencies {// Use versionless variants because these libraries are in versions.lock.diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 5ea2f81e723..08356adbf0d 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -419,6 +419,20 @@ Other Changes---------------------(No changes)+======================= 8.10.1 =======================++Other Changes+---------------------+* SOLR-15677: Upgrade the following dependencies with vulnerabilities.+ - jetty: 9.4.44.v20210927+ - tika: 1.27+ - commons-compress: 1.21+ - netty: 4.1.68.Final+ - fasterxml.jackson: 2.12.3+ - errorprone: 2.9.0+ - gcp-client: 1.32.1+ (Houston Putman)+================== 8.10.0 ==================Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.diff --git a/solr/contrib/prometheus-exporter/build.gradle b/solr/contrib/prometheus-exporter/build.gradleindex 311e942c913..0f5a1bec322 100644--- a/solr/contrib/prometheus-exporter/build.gradle+++ b/solr/contrib/prometheus-exporter/build.gradle@@ -28,7 +28,9 @@ dependencies {implementation ('io.prometheus:simpleclient_httpserver')implementation ('net.thisptr:jackson-jq', {exclude group: "org.jruby.joni", module: "joni"+ exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"})+ implementation ('com.fasterxml.jackson.core:jackson-databind')implementation ('net.sourceforge.argparse4j:argparse4j')implementation ('com.github.ben-manes.caffeine:caffeine', {exclude group: "org.checkerframework", module: "checker-qual"diff --git a/solr/core/build.gradle b/solr/core/build.gradleindex ec1fb6b40f2..c71106d4580 100644--- a/solr/core/build.gradle+++ b/solr/core/build.gradle@@ -85,7 +85,9 @@ dependencies {implementation("org.apache.commons:commons-configuration2", {exclude group: "commons-logging", module: "commons-logging"})- implementation 'org.apache.htrace:htrace-core4'+ implementation('org.apache.htrace:htrace-core4', {+ exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"+ })implementation 'org.apache.logging.log4j:log4j-api'implementation 'org.apache.logging.log4j:log4j-core'diff --git a/solr/licenses/bcmail-jdk15on-1.64.jar.sha1 b/solr/licenses/bcmail-jdk15on-1.64.jar.sha1deleted file mode 100644index aa3ef0cdb77..00000000000--- a/solr/licenses/bcmail-jdk15on-1.64.jar.sha1+++ /dev/null@@ -1 +0,0 @@-7a2601f0a1d336966cca03edb04a69ba0f5f25d9diff --git a/solr/licenses/bcmail-jdk15on-1.69.jar.sha1 b/solr/licenses/bcmail-jdk15on-1.69.jar.sha1new file mode 100644index 00000000000..a2b1f8dedae--- /dev/null+++ b/solr/licenses/bcmail-jdk15on-1.69.jar.sha1@@ -0,0 +1 @@+759f9233ac99a576e4963bd09b0f830a2716d2ecdiff --git a/solr/licenses/bcpkix-jdk15on-1.64.jar.sha1 b/solr/licenses/bcpkix-jdk15on-1.64.jar.sha1deleted file mode 100644index e102196d7a7..00000000000--- a/solr/licenses/bcpkix-jdk15on-1.64.jar.sha1+++ /dev/null@@ -1 +0,0 @@-3dac163e20110817d850d17e0444852a6d7d0bd7diff --git a/solr/licenses/bcpkix-jdk15on-1.69.jar.sha1 b/solr/licenses/bcpkix-jdk15on-1.69.jar.sha1new file mode 100644index 00000000000..76113f256d1--- /dev/null+++ b/solr/licenses/bcpkix-jdk15on-1.69.jar.sha1@@ -0,0 +1 @@+45c36fb72fafb0b688c6af795e6cc803f6f79ee5diff --git a/solr/licenses/bcprov-jdk15on-1.64.jar.sha1 b/solr/licenses/bcprov-jdk15on-1.64.jar.sha1deleted file mode 100644index 7d8758789bb..00000000000--- a/solr/licenses/bcprov-jdk15on-1.64.jar.sha1+++ /dev/null@@ -1 +0,0 @@-1467dac1b787b5ad2a18201c0c281df69882259ediff --git a/solr/licenses/bcprov-jdk15on-1.69.jar.sha1 b/solr/licenses/bcprov-jdk15on-1.69.jar.sha1new file mode 100644index 00000000000..865e0223949--- /dev/null+++ b/solr/licenses/bcprov-jdk15on-1.69.jar.sha1@@ -0,0 +1 @@+91e1628251cf3ca90093ce9d0fe67e5b7dab3850diff --git a/solr/licenses/commons-compress-1.19.jar.sha1 b/solr/licenses/commons-compress-1.19.jar.sha1deleted file mode 100644index 54494ea07df..00000000000--- a/solr/licenses/commons-compress-1.19.jar.sha1+++ /dev/null@@ -1 +0,0 @@-7e65777fb451ddab6a9c054beb879e521b7eab78diff --git a/solr/licenses/commons-compress-1.21.jar.sha1 b/solr/licenses/commons-compress-1.21.jar.sha1new file mode 100644index 00000000000..1a99d3121e3--- /dev/null+++ b/solr/licenses/commons-compress-1.21.jar.sha1@@ -0,0 +1 @@+4ec95b60d4e86b5c95a0e919cb172a0af98011efdiff --git a/solr/licenses/error_prone_annotations-2.8.1.jar.sha1 b/solr/licenses/error_prone_annotations-2.8.1.jar.sha1deleted file mode 100644index 215a74ece5e..00000000000--- a/solr/licenses/error_prone_annotations-2.8.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-bbfa4bdfe7377126947f1469bc7b0bbb4d9dbb95diff --git a/solr/licenses/error_prone_annotations-2.9.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.9.0.jar.sha1new file mode 100644index 00000000000..5d75c949b21--- /dev/null+++ b/solr/licenses/error_prone_annotations-2.9.0.jar.sha1@@ -0,0 +1 @@+74fe3b8b4f3fc84dc940d0ca4c4b270dbc902764diff --git a/solr/licenses/fontbox-2.0.17.jar.sha1 b/solr/licenses/fontbox-2.0.17.jar.sha1deleted file mode 100644index eab3309e719..00000000000--- a/solr/licenses/fontbox-2.0.17.jar.sha1+++ /dev/null@@ -1 +0,0 @@-d42c5eda5b232866a230c36a26fc22ae6e966ffadiff --git a/solr/licenses/fontbox-2.0.24.jar.sha1 b/solr/licenses/fontbox-2.0.24.jar.sha1new file mode 100644index 00000000000..62614726413--- /dev/null+++ b/solr/licenses/fontbox-2.0.24.jar.sha1@@ -0,0 +1 @@+df8ecb3006dfcd52355a5902096e5ec34f06112ediff --git a/solr/licenses/google-api-client-1.31.3.jar.sha1 b/solr/licenses/google-api-client-1.31.3.jar.sha1deleted file mode 100644index c919a039002..00000000000--- a/solr/licenses/google-api-client-1.31.3.jar.sha1+++ /dev/null@@ -1 +0,0 @@-79f4401c63852d77d912495e355b66166c38f14ddiff --git a/solr/licenses/google-api-client-1.32.1.jar.sha1 b/solr/licenses/google-api-client-1.32.1.jar.sha1new file mode 100644index 00000000000..4c7f222c146--- /dev/null+++ b/solr/licenses/google-api-client-1.32.1.jar.sha1@@ -0,0 +1 @@+3e216f54e59e3c6f01bc52beeeed9010724e0edfdiff --git a/solr/licenses/google-http-client-1.39.0.jar.sha1 b/solr/licenses/google-http-client-1.39.0.jar.sha1deleted file mode 100644index ae1238319fc..00000000000--- a/solr/licenses/google-http-client-1.39.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-936d09a3afa6911f1255ce039debeaf37928ee75diff --git a/solr/licenses/google-http-client-1.39.2.jar.sha1 b/solr/licenses/google-http-client-1.39.2.jar.sha1new file mode 100644index 00000000000..e9dd87fdec2--- /dev/null+++ b/solr/licenses/google-http-client-1.39.2.jar.sha1@@ -0,0 +1 @@+5aafc3ff51693febf4214bb2a21baf577ce2fb25diff --git a/solr/licenses/google-http-client-apache-v2-1.39.0.jar.sha1 b/solr/licenses/google-http-client-apache-v2-1.39.0.jar.sha1deleted file mode 100644index acb31657909..00000000000--- a/solr/licenses/google-http-client-apache-v2-1.39.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-247309ce4c27fc7ae48f59dc0fdc85e249152d3ddiff --git a/solr/licenses/google-http-client-apache-v2-1.39.2.jar.sha1 b/solr/licenses/google-http-client-apache-v2-1.39.2.jar.sha1new file mode 100644index 00000000000..79ec8c95332--- /dev/null+++ b/solr/licenses/google-http-client-apache-v2-1.39.2.jar.sha1@@ -0,0 +1 @@+aa58c06d8f5eb1db008771fb0473e5a36e41c45fdiff --git a/solr/licenses/google-http-client-gson-1.39.0.jar.sha1 b/solr/licenses/google-http-client-gson-1.39.0.jar.sha1deleted file mode 100644index 156517c307a..00000000000--- a/solr/licenses/google-http-client-gson-1.39.0.jar.sha1+++ /dev/null@@ -1 +0,0 @@-24ec436b2b4a27c17ccfa83a9c885a1f582e29b8diff --git a/solr/licenses/google-http-client-gson-1.39.2.jar.sha1 b/solr/licenses/google-http-client-gson-1.39.2.jar.sha1new file mode 100644index 00000000000..fd7b7642c6b--- /dev/null+++ b/solr/licenses/google-http-client-gson-1.39.2.jar.sha1@@ -0,0 +1 @@+43c1d0500c31ee31ff5918ac4bbe95711cd744a9diff --git a/solr/licenses/google-oauth-client-1.31.4.jar.sha1 b/solr/licenses/google-oauth-client-1.31.4.jar.sha1deleted file mode 100644index 9e50c89a132..00000000000--- a/solr/licenses/google-oauth-client-1.31.4.jar.sha1+++ /dev/null@@ -1 +0,0 @@-361d4c7ec0b8811a80048b6ba8aae1385869013ediff --git a/solr/licenses/google-oauth-client-1.32.1.jar.sha1 b/solr/licenses/google-oauth-client-1.32.1.jar.sha1new file mode 100644index 00000000000..585f7a74b02--- /dev/null+++ b/solr/licenses/google-oauth-client-1.32.1.jar.sha1@@ -0,0 +1 @@+58edd8b2fd2e10eef6fd194ebb9c933054c4a744diff --git a/solr/licenses/http2-client-9.4.41.v20210516.jar.sha1 b/solr/licenses/http2-client-9.4.41.v20210516.jar.sha1deleted file mode 100644index d192d89bd42..00000000000--- a/solr/licenses/http2-client-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-6e02f1b5c5b9534f6a2d694bff058b0613953e56diff --git a/solr/licenses/http2-client-9.4.44.v20210927.jar.sha1 b/solr/licenses/http2-client-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..e94718d2916--- /dev/null+++ b/solr/licenses/http2-client-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+d2783eb9a9ba483fb577ab734bc11ed64b5fc1d2diff --git a/solr/licenses/http2-common-9.4.41.v20210516.jar.sha1 b/solr/licenses/http2-common-9.4.41.v20210516.jar.sha1deleted file mode 100644index cbbda21d884..00000000000--- a/solr/licenses/http2-common-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8c492e21f77c85a11eb20a496b1a8354e4abfee4diff --git a/solr/licenses/http2-common-9.4.44.v20210927.jar.sha1 b/solr/licenses/http2-common-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..09fb2e27097--- /dev/null+++ b/solr/licenses/http2-common-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+0568516e62ab7d118fcbcd00ad3e4a33ca23490bdiff --git a/solr/licenses/http2-hpack-9.4.41.v20210516.jar.sha1 b/solr/licenses/http2-hpack-9.4.41.v20210516.jar.sha1deleted file mode 100644index dd08afa2642..00000000000--- a/solr/licenses/http2-hpack-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-ffd9437cd379d16a283d7487288a7fbdf08564dcdiff --git a/solr/licenses/http2-hpack-9.4.44.v20210927.jar.sha1 b/solr/licenses/http2-hpack-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..27c877443e2--- /dev/null+++ b/solr/licenses/http2-hpack-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+e71c82798665804538e1248ea6e6a901e3d0939bdiff --git a/solr/licenses/http2-http-client-transport-9.4.41.v20210516.jar.sha1 b/solr/licenses/http2-http-client-transport-9.4.41.v20210516.jar.sha1deleted file mode 100644index 928d388726d..00000000000--- a/solr/licenses/http2-http-client-transport-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-3d018332300975cc28cc4f39a2d45d0b3c72cd19diff --git a/solr/licenses/http2-http-client-transport-9.4.44.v20210927.jar.sha1 b/solr/licenses/http2-http-client-transport-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..7b1a7341835--- /dev/null+++ b/solr/licenses/http2-http-client-transport-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+64d1c8481979a9764000433ccda668b0dca1fd25diff --git a/solr/licenses/http2-server-9.4.41.v20210516.jar.sha1 b/solr/licenses/http2-server-9.4.41.v20210516.jar.sha1deleted file mode 100644index 9845c6e6e82..00000000000--- a/solr/licenses/http2-server-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-82af0e87ad74608cc63c490da64d5ebd9cd4e013diff --git a/solr/licenses/http2-server-9.4.44.v20210927.jar.sha1 b/solr/licenses/http2-server-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..809cb640c1c--- /dev/null+++ b/solr/licenses/http2-server-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+c2cb44a40e1f57d3381125a9947e461d65e6959bdiff --git a/solr/licenses/jetty-alpn-client-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-alpn-client-9.4.41.v20210516.jar.sha1deleted file mode 100644index 8159eae627e..00000000000--- a/solr/licenses/jetty-alpn-client-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8ee1d39fd10e8c6c599fadda214af5afc3e4c67bdiff --git a/solr/licenses/jetty-alpn-client-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-alpn-client-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..e00b2188df9--- /dev/null+++ b/solr/licenses/jetty-alpn-client-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+f830651e636bfe8fcf5c55c421441ff3cc2e85d7diff --git a/solr/licenses/jetty-alpn-java-client-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-alpn-java-client-9.4.41.v20210516.jar.sha1deleted file mode 100644index 7b977587f40..00000000000--- a/solr/licenses/jetty-alpn-java-client-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-c16d748c1515b7e8e18008c2377fd619f1c5acacdiff --git a/solr/licenses/jetty-alpn-java-client-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-alpn-java-client-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..e9e983f661c--- /dev/null+++ b/solr/licenses/jetty-alpn-java-client-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+a8cbcc7a550140332f0ecd16f50fde5490b06e9ediff --git a/solr/licenses/jetty-alpn-java-server-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-alpn-java-server-9.4.41.v20210516.jar.sha1deleted file mode 100644index 17af957d715..00000000000--- a/solr/licenses/jetty-alpn-java-server-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-d3f511b5160cd74acc251a28a7c05b7dbb318212diff --git a/solr/licenses/jetty-alpn-java-server-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-alpn-java-server-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..64b6d809899--- /dev/null+++ b/solr/licenses/jetty-alpn-java-server-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+42af6a328f4a8cd6269d7e8192ca6a185886e5f7diff --git a/solr/licenses/jetty-alpn-server-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-alpn-server-9.4.41.v20210516.jar.sha1deleted file mode 100644index 9acb04b9956..00000000000--- a/solr/licenses/jetty-alpn-server-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-ac53eeb883d505bf4dce550b46d8e225a63c33d7diff --git a/solr/licenses/jetty-alpn-server-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-alpn-server-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..12da1ebb709--- /dev/null+++ b/solr/licenses/jetty-alpn-server-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+9ac2672410f18916ec848ac99581dbf0b383e4c9diff --git a/solr/licenses/jetty-client-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-client-9.4.41.v20210516.jar.sha1deleted file mode 100644index f6f48deeda2..00000000000--- a/solr/licenses/jetty-client-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-5314498aa745115f207372e66f6ab8d8504e0c63diff --git a/solr/licenses/jetty-client-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-client-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..f559856cd2d--- /dev/null+++ b/solr/licenses/jetty-client-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+0d8b2c13ec103d12cdc575dc1bfea155dea59e1ediff --git a/solr/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1deleted file mode 100644index 7bd5e5a78c5..00000000000--- a/solr/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-e5859cddb2cac51fd8339668bd35ccac106cb28fdiff --git a/solr/licenses/jetty-continuation-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-continuation-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..eb8c9d1140f--- /dev/null+++ b/solr/licenses/jetty-continuation-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+4ffc681d5b4cbbc340cb58b17d7ac66254ee5e62diff --git a/solr/licenses/jetty-deploy-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-deploy-9.4.41.v20210516.jar.sha1deleted file mode 100644index 360b5c568b4..00000000000--- a/solr/licenses/jetty-deploy-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-9751c23a0cb6120fe05d1a3af501ada00b78738ddiff --git a/solr/licenses/jetty-deploy-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-deploy-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..bb4833a782c--- /dev/null+++ b/solr/licenses/jetty-deploy-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+7598b85596d3e7f353d8941d4199ee3c37b0c60ediff --git a/solr/licenses/jetty-http-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-http-9.4.41.v20210516.jar.sha1deleted file mode 100644index 36812d204b4..00000000000--- a/solr/licenses/jetty-http-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-0d460bece4dd9666b46cbd18f8d7fd31cf02ecd9diff --git a/solr/licenses/jetty-http-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-http-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..2563e9b33c3--- /dev/null+++ b/solr/licenses/jetty-http-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+37f0e30cdc02128e40d095ad63cb18e10ecb7726diff --git a/solr/licenses/jetty-io-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-io-9.4.41.v20210516.jar.sha1deleted file mode 100644index d88fbd5f52a..00000000000--- a/solr/licenses/jetty-io-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-820eea368623939c2113902b1ca7a98186f64a73diff --git a/solr/licenses/jetty-io-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-io-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..044b28ac860--- /dev/null+++ b/solr/licenses/jetty-io-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+a2ec01e2b5552b777a3d7085163f80756ef8c1cediff --git a/solr/licenses/jetty-jmx-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-jmx-9.4.41.v20210516.jar.sha1deleted file mode 100644index 5e5f8457031..00000000000--- a/solr/licenses/jetty-jmx-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-ec801fc1f84a42f278cfb892c36d63e4e38929fcdiff --git a/solr/licenses/jetty-jmx-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-jmx-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..0747117b698--- /dev/null+++ b/solr/licenses/jetty-jmx-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+a297f5c1d4fa7391cbae72a60cbf51287e54b561diff --git a/solr/licenses/jetty-rewrite-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-rewrite-9.4.41.v20210516.jar.sha1deleted file mode 100644index a2d615f8cc1..00000000000--- a/solr/licenses/jetty-rewrite-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-c454469a24fc26a468e6e17750b9755ab89ab6d8diff --git a/solr/licenses/jetty-rewrite-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-rewrite-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..0cf45245f60--- /dev/null+++ b/solr/licenses/jetty-rewrite-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+22ee4488a149fe0e809d5ac40a906540cf6df597diff --git a/solr/licenses/jetty-security-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-security-9.4.41.v20210516.jar.sha1deleted file mode 100644index f31c63400c0..00000000000--- a/solr/licenses/jetty-security-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-5ba69b1189a9d1f425ed03cbc2c901e0e6023c4ddiff --git a/solr/licenses/jetty-security-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-security-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..3f0c12fa518--- /dev/null+++ b/solr/licenses/jetty-security-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+ecb80b8e008daa46e95e5691b2611d4007922497diff --git a/solr/licenses/jetty-server-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-server-9.4.41.v20210516.jar.sha1deleted file mode 100644index dd66f473319..00000000000--- a/solr/licenses/jetty-server-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-25b1963b0a1c56202ec37046adc55861815107cediff --git a/solr/licenses/jetty-server-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-server-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..be339c8abf2--- /dev/null+++ b/solr/licenses/jetty-server-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+0bf2de0d31925a8ca71ad80f721236850b636e0ddiff --git a/solr/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1deleted file mode 100644index 6ff3ebd2180..00000000000--- a/solr/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-ea45368ea7fd04026038f89e6910f17f70939641diff --git a/solr/licenses/jetty-servlet-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-servlet-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..5af98051489--- /dev/null+++ b/solr/licenses/jetty-servlet-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+1cb43a0d74b7395c7207dbf3dc2ca97eac89f5fddiff --git a/solr/licenses/jetty-servlets-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-servlets-9.4.41.v20210516.jar.sha1deleted file mode 100644index 0f6e38704fc..00000000000--- a/solr/licenses/jetty-servlets-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-3b91e6956511b978355b597c5ac1737167e4bca5diff --git a/solr/licenses/jetty-servlets-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-servlets-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..352ca7aacab--- /dev/null+++ b/solr/licenses/jetty-servlets-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+d22ec443ac9b983a8771a44ed258b47dc70108b6diff --git a/solr/licenses/jetty-start-9.4.41.v20210516-shaded.jar.sha1 b/solr/licenses/jetty-start-9.4.41.v20210516-shaded.jar.sha1deleted file mode 100644index f803100c76f..00000000000--- a/solr/licenses/jetty-start-9.4.41.v20210516-shaded.jar.sha1+++ /dev/null@@ -1 +0,0 @@-6ce90c6155ec1b9b779511753c665d994b392ebfdiff --git a/solr/licenses/jetty-start-9.4.44.v20210927-shaded.jar.sha1 b/solr/licenses/jetty-start-9.4.44.v20210927-shaded.jar.sha1new file mode 100644index 00000000000..fbfb3209e86--- /dev/null+++ b/solr/licenses/jetty-start-9.4.44.v20210927-shaded.jar.sha1@@ -0,0 +1 @@+6a975b3345655d9d505ae5100487f0637260a7b5diff --git a/solr/licenses/jetty-util-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-util-9.4.41.v20210516.jar.sha1deleted file mode 100644index 9870323ef5c..00000000000--- a/solr/licenses/jetty-util-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-548c76ea00d7eb3e2bcea273174e5d030639d109diff --git a/solr/licenses/jetty-util-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-util-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..b7dc0de8ca7--- /dev/null+++ b/solr/licenses/jetty-util-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+3c7151c5a04a93119988b48a1577a972d90f8990diff --git a/solr/licenses/jetty-util-ajax-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-util-ajax-9.4.41.v20210516.jar.sha1deleted file mode 100644index 23af8c84736..00000000000--- a/solr/licenses/jetty-util-ajax-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-d4c1d66fc62796a17548e6c344fbf89b5889f873diff --git a/solr/licenses/jetty-util-ajax-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-util-ajax-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..596d62b2f69--- /dev/null+++ b/solr/licenses/jetty-util-ajax-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+ed2f30e8eef939ab2825e607d83f82f85167e2c0diff --git a/solr/licenses/jetty-webapp-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-webapp-9.4.41.v20210516.jar.sha1deleted file mode 100644index 04711086c99..00000000000--- a/solr/licenses/jetty-webapp-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-e9dfb34715ab48f5175fd6ab96f67ff6c299e6fbdiff --git a/solr/licenses/jetty-webapp-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-webapp-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..410baa51dba--- /dev/null+++ b/solr/licenses/jetty-webapp-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+60c0ff88088b2eddb2a8e40d6cc4d4e963b72d6ediff --git a/solr/licenses/jetty-xml-9.4.41.v20210516.jar.sha1 b/solr/licenses/jetty-xml-9.4.41.v20210516.jar.sha1deleted file mode 100644index 60df005ac47..00000000000--- a/solr/licenses/jetty-xml-9.4.41.v20210516.jar.sha1+++ /dev/null@@ -1 +0,0 @@-38d6d8fd800173c76c68ca847ceb823c0116ba04diff --git a/solr/licenses/jetty-xml-9.4.44.v20210927.jar.sha1 b/solr/licenses/jetty-xml-9.4.44.v20210927.jar.sha1new file mode 100644index 00000000000..6c784db5208--- /dev/null+++ b/solr/licenses/jetty-xml-9.4.44.v20210927.jar.sha1@@ -0,0 +1 @@+da53a0fa775752cd4626539796bdb49e9b4cf23cdiff --git a/solr/licenses/netty-buffer-4.1.59.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.59.Final.jar.sha1deleted file mode 100644index 272f1f9b648..00000000000--- a/solr/licenses/netty-buffer-4.1.59.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a1f281008d7e9574c14d386b39b3639a240eb0d1diff --git a/solr/licenses/netty-buffer-4.1.68.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.68.Final.jar.sha1new file mode 100644index 00000000000..af02fcb316a--- /dev/null+++ b/solr/licenses/netty-buffer-4.1.68.Final.jar.sha1@@ -0,0 +1 @@+513c8b3b0b608fa64bfaef473e20f73cc2ae4f2ddiff --git a/solr/licenses/netty-codec-4.1.59.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.59.Final.jar.sha1deleted file mode 100644index e2721d70316..00000000000--- a/solr/licenses/netty-codec-4.1.59.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-5e563309b99cf55bdbecc4dab7c417a0167c31aadiff --git a/solr/licenses/netty-codec-4.1.68.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.68.Final.jar.sha1new file mode 100644index 00000000000..60d44d2d474--- /dev/null+++ b/solr/licenses/netty-codec-4.1.68.Final.jar.sha1@@ -0,0 +1 @@+910fce1b73c414daf894fbbcfc7a1e8530a69a0fdiff --git a/solr/licenses/netty-common-4.1.59.Final.jar.sha1 b/solr/licenses/netty-common-4.1.59.Final.jar.sha1deleted file mode 100644index 05b050907b7..00000000000--- a/solr/licenses/netty-common-4.1.59.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-e8800b0c50b6743ec1c5a3713816ce58910a703adiff --git a/solr/licenses/netty-common-4.1.68.Final.jar.sha1 b/solr/licenses/netty-common-4.1.68.Final.jar.sha1new file mode 100644index 00000000000..fb7b4307c2e--- /dev/null+++ b/solr/licenses/netty-common-4.1.68.Final.jar.sha1@@ -0,0 +1 @@+35820b0f9cb6ae04ea88c43d3c322cb113cbef1bdiff --git a/solr/licenses/netty-handler-4.1.59.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.59.Final.jar.sha1deleted file mode 100644index 7369bef39b1..00000000000--- a/solr/licenses/netty-handler-4.1.59.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-302b4c8ca800aeddcf94401f2403114c8f5db5a5diff --git a/solr/licenses/netty-handler-4.1.68.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.68.Final.jar.sha1new file mode 100644index 00000000000..fea503143f5--- /dev/null+++ b/solr/licenses/netty-handler-4.1.68.Final.jar.sha1@@ -0,0 +1 @@+f55a4ad40f228baf6005ac5ca39915ce5dfb3bd5diff --git a/solr/licenses/netty-resolver-4.1.59.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.59.Final.jar.sha1deleted file mode 100644index 6a537efebf6..00000000000--- a/solr/licenses/netty-resolver-4.1.59.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-26bc136952a9f7a994dd7162f481c860275948dediff --git a/solr/licenses/netty-resolver-4.1.68.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.68.Final.jar.sha1new file mode 100644index 00000000000..eff734cae53--- /dev/null+++ b/solr/licenses/netty-resolver-4.1.68.Final.jar.sha1@@ -0,0 +1 @@+8c174db162c3dc1bca3020705d0e75845b517ca9diff --git a/solr/licenses/netty-transport-4.1.59.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.59.Final.jar.sha1deleted file mode 100644index c8099d0a7a3..00000000000--- a/solr/licenses/netty-transport-4.1.59.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-864d20f35ce909e6a7462095cb8f91ee94d1cd4cdiff --git a/solr/licenses/netty-transport-4.1.68.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.68.Final.jar.sha1new file mode 100644index 00000000000..d11b7310f00--- /dev/null+++ b/solr/licenses/netty-transport-4.1.68.Final.jar.sha1@@ -0,0 +1 @@+8356884a7ad58a3df226eecf955bdfd785e83637diff --git a/solr/licenses/netty-transport-native-epoll-4.1.59.Final.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.59.Final.jar.sha1deleted file mode 100644index 45ea4ea12dc..00000000000--- a/solr/licenses/netty-transport-native-epoll-4.1.59.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-0d80613566ff6aa65580325d4a8ec6126b6cd47adiff --git a/solr/licenses/netty-transport-native-epoll-4.1.68.Final.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.68.Final.jar.sha1new file mode 100644index 00000000000..360b8eb85e0--- /dev/null+++ b/solr/licenses/netty-transport-native-epoll-4.1.68.Final.jar.sha1@@ -0,0 +1 @@+b9cd7f6dd6b67e9fe10cd3cf7622ae145fe131d9diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.59.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.59.Final.jar.sha1deleted file mode 100644index ccc1b7450a4..00000000000--- a/solr/licenses/netty-transport-native-unix-common-4.1.59.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f5d4ad1f995ec40c20220ad9ec75b14172ac9320diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.68.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.68.Final.jar.sha1new file mode 100644index 00000000000..a4ba8c01cea--- /dev/null+++ b/solr/licenses/netty-transport-native-unix-common-4.1.68.Final.jar.sha1@@ -0,0 +1 @@+a3f09df9ab7cc0870ef868f31319052cfc49cd72diff --git a/solr/licenses/pdfbox-2.0.17.jar.sha1 b/solr/licenses/pdfbox-2.0.17.jar.sha1deleted file mode 100644index 564aded5fb5..00000000000--- a/solr/licenses/pdfbox-2.0.17.jar.sha1+++ /dev/null@@ -1 +0,0 @@-b5c8dff799bd967c70ccae75e6972327ae640d35diff --git a/solr/licenses/pdfbox-2.0.24.jar.sha1 b/solr/licenses/pdfbox-2.0.24.jar.sha1new file mode 100644index 00000000000..f7c54b1e325--- /dev/null+++ b/solr/licenses/pdfbox-2.0.24.jar.sha1@@ -0,0 +1 @@+cb562ee5f43e29415af4477e62fbe668ef88d18bdiff --git a/solr/licenses/pdfbox-tools-2.0.17.jar.sha1 b/solr/licenses/pdfbox-tools-2.0.17.jar.sha1deleted file mode 100644index 1b34393bf70..00000000000--- a/solr/licenses/pdfbox-tools-2.0.17.jar.sha1+++ /dev/null@@ -1 +0,0 @@-bd30eb8fc24a7cf903044105ff2df4fb793a454ediff --git a/solr/licenses/pdfbox-tools-2.0.24.jar.sha1 b/solr/licenses/pdfbox-tools-2.0.24.jar.sha1new file mode 100644index 00000000000..2c2dc161ce0--- /dev/null+++ b/solr/licenses/pdfbox-tools-2.0.24.jar.sha1@@ -0,0 +1 @@+3c6e9b46d496fed56423db517fccc4e60d4ea105diff --git a/solr/licenses/tika-core-1.24.jar.sha1 b/solr/licenses/tika-core-1.24.jar.sha1deleted file mode 100644index 857181d2067..00000000000--- a/solr/licenses/tika-core-1.24.jar.sha1+++ /dev/null@@ -1 +0,0 @@-ed2e85f034743ea8e7ff25ab594caf361c408a44diff --git a/solr/licenses/tika-core-1.27.jar.sha1 b/solr/licenses/tika-core-1.27.jar.sha1new file mode 100644index 00000000000..f568aa36e1c--- /dev/null+++ b/solr/licenses/tika-core-1.27.jar.sha1@@ -0,0 +1 @@+079ad0f72558b8fbce947147959e2faff8b7b70adiff --git a/solr/licenses/tika-java7-1.24.jar.sha1 b/solr/licenses/tika-java7-1.24.jar.sha1deleted file mode 100644index 4527f3264ff..00000000000--- a/solr/licenses/tika-java7-1.24.jar.sha1+++ /dev/null@@ -1 +0,0 @@-1419be531280da55679c3f4ae7f6e8506a80c150diff --git a/solr/licenses/tika-java7-1.27.jar.sha1 b/solr/licenses/tika-java7-1.27.jar.sha1new file mode 100644index 00000000000..95f4cd28095--- /dev/null+++ b/solr/licenses/tika-java7-1.27.jar.sha1@@ -0,0 +1 @@+b92365666ad84dc9b8074214dee6cc930c17043fdiff --git a/solr/licenses/tika-parsers-1.24.jar.sha1 b/solr/licenses/tika-parsers-1.24.jar.sha1deleted file mode 100644index d595bc9ef5a..00000000000--- a/solr/licenses/tika-parsers-1.24.jar.sha1+++ /dev/null@@ -1 +0,0 @@-282c0ecd31cb235f7d96bef18b8cdcb56573a195diff --git a/solr/licenses/tika-parsers-1.27.jar.sha1 b/solr/licenses/tika-parsers-1.27.jar.sha1new file mode 100644index 00000000000..7d75e224d1c--- /dev/null+++ b/solr/licenses/tika-parsers-1.27.jar.sha1@@ -0,0 +1 @@+269e021ed326239fd8f62e3ff85f4b4e8dbd6ec9diff --git a/solr/licenses/tika-xmp-1.24.jar.sha1 b/solr/licenses/tika-xmp-1.24.jar.sha1deleted file mode 100644index 965a42a4236..00000000000--- a/solr/licenses/tika-xmp-1.24.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f701304969357cb6244da4a1aca22479f08e47bddiff --git a/solr/licenses/tika-xmp-1.27.jar.sha1 b/solr/licenses/tika-xmp-1.27.jar.sha1new file mode 100644index 00000000000..f60b5c1719f--- /dev/null+++ b/solr/licenses/tika-xmp-1.27.jar.sha1@@ -0,0 +1 @@+289472a8c8228bd8f19800561c0a5ab1426f2d8ediff --git a/versions.lock b/versions.lockindex d3e4025ec34..92cb2766c86 100644--- a/versions.lock+++ b/versions.lock@@ -9,8 +9,8 @@ com.esri.geometry:esri-geometry-api:2.2.0 (1 constraints: 0605fb35)com.fasterxml.jackson:jackson-bom:2.12.3 (11 constraints: fdf28813)com.fasterxml.jackson.core:jackson-annotations:2.12.3 (7 constraints: c48b8716)com.fasterxml.jackson.core:jackson-core:2.12.3 (11 constraints: 61e504fa)-com.fasterxml.jackson.core:jackson-databind:2.12.3 (19 constraints: f3595e4c)-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.12.3 (2 constraints: ed13c981)+com.fasterxml.jackson.core:jackson-databind:2.12.3 (18 constraints: a94f02ab)+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.12.3 (2 constraints: f1137d82)com.fasterxml.woodstox:woodstox-core:6.2.4 (2 constraints: 4d1cac9f)com.github.ben-manes.caffeine:caffeine:2.9.2 (1 constraints: 0f051236)com.github.virtuald:curvesapi:1.06 (1 constraints: db04f530)@@ -18,7 +18,7 @@ com.github.zafarkhaja:java-semver:0.9.0 (1 constraints: 0b050636)com.google.api:api-common:1.10.1 (4 constraints: 822c34f6)com.google.api:gax:1.62.0 (4 constraints: 95324347)com.google.api:gax-httpjson:0.79.0 (2 constraints: 5d15dfd6)-com.google.api-client:google-api-client:1.31.3 (3 constraints: be27e266)+com.google.api-client:google-api-client:1.32.1 (3 constraints: b7271464)com.google.api.grpc:proto-google-common-protos:2.1.0 (4 constraints: d033d9e5)com.google.api.grpc:proto-google-iam-v1:1.0.10 (3 constraints: 1324a9e0)com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0 (3 constraints: 5e2f9188)@@ -31,17 +31,17 @@ com.google.cloud:google-cloud-storage:1.113.14 (2 constraints: 10143aa3)com.google.code.findbugs:annotations:3.0.1 (1 constraints: 0605fb35)com.google.code.findbugs:jsr305:3.0.2 (9 constraints: 057f5545)com.google.code.gson:gson:2.8.6 (4 constraints: 94389e56)-com.google.errorprone:error_prone_annotations:2.8.1 (4 constraints: 9d2f3758)+com.google.errorprone:error_prone_annotations:2.9.0 (4 constraints: 9d2f3958)com.google.guava:failureaccess:1.0.1 (1 constraints: e60fd595)com.google.guava:guava:25.1-jre (1 constraints: 4a06b047)com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: 8f1d45cb)-com.google.http-client:google-http-client:1.39.0 (9 constraints: 0592056c)-com.google.http-client:google-http-client-apache-v2:1.39.0 (2 constraints: bd208d76)-com.google.http-client:google-http-client-appengine:1.39.0 (2 constraints: 6015fcd7)-com.google.http-client:google-http-client-gson:1.39.0 (4 constraints: 5443d69e)-com.google.http-client:google-http-client-jackson2:1.39.0 (2 constraints: 6015fcd7)+com.google.http-client:google-http-client:1.39.2 (9 constraints: 0792de64)+com.google.http-client:google-http-client-apache-v2:1.39.2 (2 constraints: bf20ed76)+com.google.http-client:google-http-client-appengine:1.39.0 (2 constraints: 5915a1d6)+com.google.http-client:google-http-client-gson:1.39.2 (4 constraints: 564300a0)+com.google.http-client:google-http-client-jackson2:1.39.0 (2 constraints: 5915a1d6)com.google.j2objc:j2objc-annotations:1.3 (4 constraints: f52eb3b1)-com.google.oauth-client:google-oauth-client:1.31.4 (3 constraints: f425b1a8)+com.google.oauth-client:google-oauth-client:1.32.1 (3 constraints: ee252fa6)com.google.protobuf:protobuf-java:3.15.5 (6 constraints: dc58ddee)com.google.protobuf:protobuf-java-util:3.15.5 (3 constraints: 2b248ae3)com.google.re2j:re2j:1.2 (1 constraints: a7041c2c)@@ -70,14 +70,14 @@ io.dropwizard.metrics:metrics-jvm:4.1.5 (1 constraints: 0c050736)io.grpc:grpc-context:1.36.0 (3 constraints: 5a22231e)io.jaegertracing:jaeger-core:1.6.0 (1 constraints: 610d7b26)io.jaegertracing:jaeger-thrift:1.6.0 (1 constraints: 09050236)-io.netty:netty-buffer:4.1.59.Final (6 constraints: 32558a4d)-io.netty:netty-codec:4.1.59.Final (2 constraints: f9136481)-io.netty:netty-common:4.1.59.Final (8 constraints: ac6e00d5)-io.netty:netty-handler:4.1.59.Final (2 constraints: 2e175641)-io.netty:netty-resolver:4.1.59.Final (3 constraints: ad21e6ce)-io.netty:netty-transport:4.1.59.Final (5 constraints: 7e47082a)-io.netty:netty-transport-native-epoll:4.1.59.Final (2 constraints: 2e175641)-io.netty:netty-transport-native-unix-common:4.1.59.Final (2 constraints: 051a8104)+io.netty:netty-buffer:4.1.68.Final (6 constraints: 3b55c155)+io.netty:netty-codec:4.1.68.Final (2 constraints: 0214fb82)+io.netty:netty-common:4.1.68.Final (8 constraints: b56ee5df)+io.netty:netty-handler:4.1.68.Final (2 constraints: 37173443)+io.netty:netty-resolver:4.1.68.Final (3 constraints: b621e6d1)+io.netty:netty-transport:4.1.68.Final (5 constraints: 8747d630)+io.netty:netty-transport-native-epoll:4.1.68.Final (2 constraints: 37173443)+io.netty:netty-transport-native-unix-common:4.1.68.Final (2 constraints: 0e1a9f06)io.opencensus:opencensus-api:0.28.0 (5 constraints: 21426a37)io.opencensus:opencensus-contrib-http-util:0.28.0 (3 constraints: f7265f07)io.opentracing:opentracing-api:0.33.0 (5 constraints: 4d3cfe52)@@ -102,7 +102,7 @@ org.apache.calcite:calcite-core:1.27.0 (1 constraints: 3c05423b)org.apache.calcite:calcite-linq4j:1.27.0 (1 constraints: 3c05423b)org.apache.calcite.avatica:avatica-core:1.18.0 (1 constraints: 3c05413b)org.apache.commons:commons-collections4:4.4 (1 constraints: ac04272c)-org.apache.commons:commons-compress:1.19 (1 constraints: df04fa30)+org.apache.commons:commons-compress:1.21 (1 constraints: d804f430)org.apache.commons:commons-configuration2:2.1.1 (1 constraints: 0605f935)org.apache.commons:commons-csv:1.7 (1 constraints: ac04212c)org.apache.commons:commons-exec:1.3 (1 constraints: a8041d2c)@@ -159,28 +159,28 @@ org.apache.lucene:lucene-spatial3d:9.0.0-prerelease9 (1 constraints: 4615f79f)org.apache.lucene:lucene-suggest:9.0.0-prerelease9 (1 constraints: 99093d90)org.apache.lucene:lucene-test-framework:9.0.0-prerelease9 (1 constraints: 99093d90)org.apache.opennlp:opennlp-tools:1.9.1 (2 constraints: a1164d13)-org.apache.pdfbox:fontbox:2.0.17 (1 constraints: 3c05323b)+org.apache.pdfbox:fontbox:2.0.24 (1 constraints: 3a05313b)org.apache.pdfbox:jempbox:1.8.16 (1 constraints: 42054b3b)-org.apache.pdfbox:pdfbox:2.0.17 (1 constraints: 3c05323b)-org.apache.pdfbox:pdfbox-tools:2.0.17 (1 constraints: 3c05323b)+org.apache.pdfbox:pdfbox:2.0.24 (1 constraints: 3a05313b)+org.apache.pdfbox:pdfbox-tools:2.0.24 (1 constraints: 3a05313b)org.apache.poi:poi:4.1.1 (1 constraints: 08050336)org.apache.poi:poi-ooxml:4.1.1 (1 constraints: 08050336)org.apache.poi:poi-ooxml-schemas:4.1.1 (1 constraints: 08050336)org.apache.poi:poi-scratchpad:4.1.1 (1 constraints: 08050336)org.apache.thrift:libthrift:0.14.1 (1 constraints: 900d0134)-org.apache.tika:tika-core:1.24 (1 constraints: db04f730)-org.apache.tika:tika-java7:1.24 (1 constraints: db04f730)-org.apache.tika:tika-parsers:1.24 (1 constraints: db04f730)-org.apache.tika:tika-xmp:1.24 (1 constraints: db04f730)+org.apache.tika:tika-core:1.27 (1 constraints: de04fa30)+org.apache.tika:tika-java7:1.27 (1 constraints: de04fa30)+org.apache.tika:tika-parsers:1.27 (1 constraints: de04fa30)+org.apache.tika:tika-xmp:1.27 (1 constraints: de04fa30)org.apache.xmlbeans:xmlbeans:3.1.0 (1 constraints: 0605fd35)org.apache.zookeeper:zookeeper:3.7.0 (1 constraints: 0c050f36)org.apache.zookeeper:zookeeper-jute:3.7.0 (1 constraints: 8a0d3a28)org.apiguardian:apiguardian-api:1.1.0 (1 constraints: 0405f335)org.aspectj:aspectjrt:1.8.0 (1 constraints: 0b050836)org.bitbucket.b_c:jose4j:0.7.7 (1 constraints: 10050736)-org.bouncycastle:bcmail-jdk15on:1.64 (1 constraints: df04ff30)-org.bouncycastle:bcpkix-jdk15on:1.64 (1 constraints: df04ff30)-org.bouncycastle:bcprov-jdk15on:1.64 (1 constraints: df04ff30)+org.bouncycastle:bcmail-jdk15on:1.69 (1 constraints: e4040431)+org.bouncycastle:bcpkix-jdk15on:1.69 (1 constraints: e4040431)+org.bouncycastle:bcprov-jdk15on:1.69 (1 constraints: e4040431)org.brotli:dec:0.1.2 (1 constraints: 0505f035)org.carrot2:carrot2-core:4.0.4 (1 constraints: 0a050336)org.carrot2:morfologik-fsa:2.1.5 (1 constraints: d70d9836)@@ -193,30 +193,30 @@ org.codehaus.janino:commons-compiler:3.0.9 (2 constraints: d910f7d1)org.codehaus.janino:janino:3.0.9 (1 constraints: 0e050336)org.codehaus.mojo:animal-sniffer-annotations:1.14 (1 constraints: ea09d5aa)org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)-org.eclipse.jetty:jetty-alpn-client:9.4.41.v20210516 (3 constraints: bc2cc8fa)-org.eclipse.jetty:jetty-alpn-java-client:9.4.41.v20210516 (1 constraints: 7907fe7c)-org.eclipse.jetty:jetty-alpn-java-server:9.4.41.v20210516 (1 constraints: 7907fe7c)-org.eclipse.jetty:jetty-alpn-server:9.4.41.v20210516 (2 constraints: 151ba4db)-org.eclipse.jetty:jetty-client:9.4.41.v20210516 (1 constraints: c717eead)-org.eclipse.jetty:jetty-continuation:9.4.41.v20210516 (2 constraints: 4f185cf9)-org.eclipse.jetty:jetty-deploy:9.4.41.v20210516 (1 constraints: 7907fe7c)-org.eclipse.jetty:jetty-http:9.4.41.v20210516 (5 constraints: 68497d3f)-org.eclipse.jetty:jetty-io:9.4.41.v20210516 (8 constraints: d77d1108)-org.eclipse.jetty:jetty-jmx:9.4.41.v20210516 (1 constraints: 7907fe7c)-org.eclipse.jetty:jetty-rewrite:9.4.41.v20210516 (1 constraints: 7907fe7c)-org.eclipse.jetty:jetty-security:9.4.41.v20210516 (2 constraints: dc171fdc)-org.eclipse.jetty:jetty-server:9.4.41.v20210516 (6 constraints: 9b5e47e4)-org.eclipse.jetty:jetty-servlet:9.4.41.v20210516 (2 constraints: 561785bd)-org.eclipse.jetty:jetty-servlets:9.4.41.v20210516 (1 constraints: 7907fe7c)-org.eclipse.jetty:jetty-util:9.4.41.v20210516 (8 constraints: 3375dcd3)-org.eclipse.jetty:jetty-util-ajax:9.4.41.v20210516 (1 constraints: 64101be2)-org.eclipse.jetty:jetty-webapp:9.4.41.v20210516 (2 constraints: 64178bbe)-org.eclipse.jetty:jetty-xml:9.4.41.v20210516 (3 constraints: 4127341b)-org.eclipse.jetty.http2:http2-client:9.4.41.v20210516 (2 constraints: 3f1f613d)-org.eclipse.jetty.http2:http2-common:9.4.41.v20210516 (3 constraints: 0f2b321a)-org.eclipse.jetty.http2:http2-hpack:9.4.41.v20210516 (2 constraints: 4219615a)-org.eclipse.jetty.http2:http2-http-client-transport:9.4.41.v20210516 (1 constraints: 7907fe7c)-org.eclipse.jetty.http2:http2-server:9.4.41.v20210516 (1 constraints: 7907fe7c)+org.eclipse.jetty:jetty-alpn-client:9.4.44.v20210927 (3 constraints: d72c7301)+org.eclipse.jetty:jetty-alpn-java-client:9.4.44.v20210927 (1 constraints: 82072e7d)+org.eclipse.jetty:jetty-alpn-java-server:9.4.44.v20210927 (1 constraints: 82072e7d)+org.eclipse.jetty:jetty-alpn-server:9.4.44.v20210927 (2 constraints: 271b20de)+org.eclipse.jetty:jetty-client:9.4.44.v20210927 (1 constraints: d0171eae)+org.eclipse.jetty:jetty-continuation:9.4.44.v20210927 (2 constraints: 611890fb)+org.eclipse.jetty:jetty-deploy:9.4.44.v20210927 (1 constraints: 82072e7d)+org.eclipse.jetty:jetty-http:9.4.44.v20210927 (5 constraints: 9549eb52)+org.eclipse.jetty:jetty-io:9.4.44.v20210927 (8 constraints: 1f7e093d)+org.eclipse.jetty:jetty-jmx:9.4.44.v20210927 (1 constraints: 82072e7d)+org.eclipse.jetty:jetty-rewrite:9.4.44.v20210927 (1 constraints: 82072e7d)+org.eclipse.jetty:jetty-security:9.4.44.v20210927 (2 constraints: ee174ade)+org.eclipse.jetty:jetty-server:9.4.44.v20210927 (6 constraints: c85e10fa)+org.eclipse.jetty:jetty-servlet:9.4.44.v20210927 (2 constraints: 6817a7bf)+org.eclipse.jetty:jetty-servlets:9.4.44.v20210927 (1 constraints: 82072e7d)+org.eclipse.jetty:jetty-util:9.4.44.v20210927 (8 constraints: 7b756007)+org.eclipse.jetty:jetty-util-ajax:9.4.44.v20210927 (1 constraints: 6d104be2)+org.eclipse.jetty:jetty-webapp:9.4.44.v20210927 (2 constraints: 7617adc0)+org.eclipse.jetty:jetty-xml:9.4.44.v20210927 (3 constraints: 5c270a21)+org.eclipse.jetty.http2:http2-client:9.4.44.v20210927 (2 constraints: 511f4040)+org.eclipse.jetty.http2:http2-common:9.4.44.v20210927 (3 constraints: 2a2baa20)+org.eclipse.jetty.http2:http2-hpack:9.4.44.v20210927 (2 constraints: 5419b95c)+org.eclipse.jetty.http2:http2-http-client-transport:9.4.44.v20210927 (1 constraints: 82072e7d)+org.eclipse.jetty.http2:http2-server:9.4.44.v20210927 (1 constraints: 82072e7d)org.gagravarr:vorbis-java-core:0.8 (1 constraints: ac041f2c)org.gagravarr:vorbis-java-tika:0.8 (1 constraints: ac041f2c)org.hamcrest:hamcrest:2.2 (2 constraints: cf1b088a)diff --git a/versions.props b/versions.propsindex aac56cf303c..517fde4e6fb 100644--- a/versions.props+++ b/versions.props@@ -6,12 +6,12 @@ com.cybozu.labs:langdetect=1.1-20120112com.drewnoakes:metadata-extractor=2.11.0com.epam:parso=2.0.11com.esri.geometry:esri-geometry-api=2.2.0-com.fasterxml.jackson*:*=2.10.1+com.fasterxml.jackson*:*=2.12.3com.fasterxml.woodstox:woodstox-core=6.2.4com.github.ben-manes.caffeine:caffeine=2.9.2com.github.virtuald:curvesapi=1.06com.github.zafarkhaja:java-semver=0.9.0-com.google.api-client:google-api-client=1.29.2+com.google.api-client:google-api-client=1.32.1com.google.api.grpc:proto-google-common-protos=1.16.0com.google.api.grpc:proto-google-iam-v1=0.12.0com.google.api:api-common=1.8.1@@ -25,13 +25,13 @@ com.google.cloud:google-cloud-core=1.77.0com.google.cloud:google-cloud-nio=0.122.11com.google.cloud:google-cloud-storage=1.77.0com.google.code.gson:gson=2.7-com.google.errorprone:*=2.8.1+com.google.errorprone:*=2.9.0com.google.guava:guava=25.1-jre-com.google.http-client:google-http-client-appengine=1.29.2-com.google.http-client:google-http-client-jackson2=1.29.2-com.google.http-client:google-http-client=1.29.2+com.google.http-client:google-http-client-appengine=1.32.1+com.google.http-client:google-http-client-jackson2=1.32.1+com.google.http-client:google-http-client=1.32.1com.google.j2objc:j2objc-annotations=1.1-com.google.oauth-client:google-oauth-client=1.29.2+com.google.oauth-client:google-oauth-client=1.32.1com.google.protobuf:protobuf-java-util=3.11.0com.google.protobuf:protobuf-java=3.11.0com.google.re2j:re2j=1.2@@ -56,7 +56,7 @@ de.l3s.boilerpipe:boilerpipe=1.1.0io.dropwizard.metrics:*=4.1.5io.grpc:grpc-context=1.19.0io.jaegertracing:*=1.6.0-io.netty:*=4.1.50.Final+io.netty:*=4.1.68.Finalio.opencensus:opencensus-api=0.21.0io.opencensus:opencensus-contrib-http-util=0.21.0io.opentracing:*=0.33.0@@ -74,7 +74,7 @@ org.antlr:antlr4-runtime=4.5.1-1org.apache.calcite.avatica:avatica-core=1.18.0org.apache.calcite:*=1.27.0org.apache.commons:commons-collections4=4.4-org.apache.commons:commons-compress=1.19+org.apache.commons:commons-compress=1.21org.apache.commons:commons-configuration2=2.1.1org.apache.commons:commons-csv=1.7org.apache.commons:commons-exec=1.3@@ -92,17 +92,17 @@ org.apache.kerby:*=1.0.1org.apache.logging.log4j:*=2.14.1org.apache.lucene:*=9.0.0-prerelease9org.apache.opennlp:opennlp-tools=1.9.1-org.apache.pdfbox:*=2.0.17+org.apache.pdfbox:*=2.0.24org.apache.pdfbox:jempbox=1.8.16org.apache.poi:*=4.1.1-org.apache.tika:*=1.24+org.apache.tika:*=1.27org.apache.xmlbeans:xmlbeans=3.1.0org.apache.zookeeper:*=3.7.0org.apiguardian:apiguardian-api=1.1.0org.asciidoctor:asciidoctorj=1.6.2org.aspectj:aspectjrt=1.8.0org.bitbucket.b_c:jose4j=0.7.7-org.bouncycastle:*=1.64+org.bouncycastle:*=1.69org.brotli:dec=0.1.2org.carrot2:carrot2-core=4.0.4org.carrot2:morfologik-*=2.1.5@@ -110,8 +110,8 @@ org.ccil.cowan.tagsoup:tagsoup=1.2.1org.checkerframework:checker-qual=3.10.0org.codehaus.janino:*=3.0.9org.codehaus.woodstox:stax2-api=4.2.1-org.eclipse.jetty.http2:*=9.4.41.v20210516-org.eclipse.jetty:*=9.4.41.v20210516+org.eclipse.jetty.http2:*=9.4.44.v20210927+org.eclipse.jetty:*=9.4.44.v20210927org.gagravarr:*=0.8org.hamcrest:*=2.2org.hsqldb:hsqldb=2.4.0