You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2022/09/07 22:11:47 UTC
[solr] branch main updated: SOLR-16402: Bump google-cloud-bom to 0.178.0 (#998)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 271715cf9f8 SOLR-16402: Bump google-cloud-bom to 0.178.0 (#998)
271715cf9f8 is described below
commit 271715cf9f81bccf1bc28eb4f0b3dab4b54da48d
Author: Kevin Risden <ri...@users.noreply.github.com>
AuthorDate: Wed Sep 7 18:11:41 2022 -0400
SOLR-16402: Bump google-cloud-bom to 0.178.0 (#998)
* Upgrades GSON to 2.9.1 due to CVE-2022-25647
* Upgrades Guava to 31.1-jre
---
solr/CHANGES.txt | 2 +
solr/licenses/api-common-2.1.2.jar.sha1 | 1 -
solr/licenses/api-common-2.2.1.jar.sha1 | 1 +
solr/licenses/checker-qual-3.22.0.jar.sha1 | 1 -
solr/licenses/checker-qual-3.23.0.jar.sha1 | 1 +
solr/licenses/gax-2.18.7.jar.sha1 | 1 +
solr/licenses/gax-2.8.1.jar.sha1 | 1 -
solr/licenses/gax-httpjson-0.103.7.jar.sha1 | 1 +
solr/licenses/gax-httpjson-0.93.1.jar.sha1 | 1 -
solr/licenses/google-api-client-1.33.0.jar.sha1 | 1 -
solr/licenses/google-api-client-2.0.0.jar.sha1 | 1 +
...services-storage-v1-rev20211201-1.32.1.jar.sha1 | 1 -
...-services-storage-v1-rev20220705-2.0.0.jar.sha1 | 1 +
.../google-auth-library-credentials-1.3.0.jar.sha1 | 1 -
.../google-auth-library-credentials-1.8.1.jar.sha1 | 1 +
.../google-auth-library-oauth2-http-1.3.0.jar.sha1 | 1 -
.../google-auth-library-oauth2-http-1.8.1.jar.sha1 | 1 +
solr/licenses/google-cloud-core-2.3.5.jar.sha1 | 1 -
solr/licenses/google-cloud-core-2.8.6.jar.sha1 | 1 +
.../licenses/google-cloud-core-http-2.3.5.jar.sha1 | 1 -
.../licenses/google-cloud-core-http-2.8.6.jar.sha1 | 1 +
solr/licenses/google-cloud-nio-0.123.18.jar.sha1 | 1 -
solr/licenses/google-cloud-nio-0.124.14.jar.sha1 | 1 +
solr/licenses/google-cloud-storage-2.11.3.jar.sha1 | 1 +
solr/licenses/google-cloud-storage-2.2.3.jar.sha1 | 1 -
solr/licenses/google-http-client-1.41.0.jar.sha1 | 1 -
solr/licenses/google-http-client-1.42.2.jar.sha1 | 1 +
.../google-http-client-apache-v2-1.41.0.jar.sha1 | 1 -
.../google-http-client-apache-v2-1.42.2.jar.sha1 | 1 +
.../google-http-client-appengine-1.41.0.jar.sha1 | 1 -
.../google-http-client-appengine-1.42.2.jar.sha1 | 1 +
.../google-http-client-gson-1.41.0.jar.sha1 | 1 -
.../google-http-client-gson-1.42.2.jar.sha1 | 1 +
.../google-http-client-jackson2-1.41.0.jar.sha1 | 1 -
.../google-http-client-jackson2-1.42.2.jar.sha1 | 1 +
solr/licenses/google-oauth-client-1.32.1.jar.sha1 | 1 -
solr/licenses/google-oauth-client-1.34.1.jar.sha1 | 1 +
solr/licenses/grpc-context-1.43.2.jar.sha1 | 1 -
solr/licenses/grpc-context-1.48.0.jar.sha1 | 1 +
solr/licenses/gson-2.8.9.jar.sha1 | 1 -
solr/licenses/gson-2.9.1.jar.sha1 | 1 +
solr/licenses/guava-31.0.1-jre.jar.sha1 | 1 -
solr/licenses/guava-31.1-jre.jar.sha1 | 1 +
solr/licenses/opencensus-api-0.28.0.jar.sha1 | 1 -
solr/licenses/opencensus-api-0.31.1.jar.sha1 | 1 +
.../opencensus-contrib-http-util-0.28.0.jar.sha1 | 1 -
.../opencensus-contrib-http-util-0.31.1.jar.sha1 | 1 +
.../proto-google-common-protos-2.7.1.jar.sha1 | 1 -
.../proto-google-common-protos-2.9.2.jar.sha1 | 1 +
solr/licenses/proto-google-iam-v1-1.2.0.jar.sha1 | 1 -
solr/licenses/proto-google-iam-v1-1.5.2.jar.sha1 | 1 +
solr/licenses/protobuf-java-3.19.4.jar.sha1 | 1 -
solr/licenses/protobuf-java-3.21.4.jar.sha1 | 1 +
solr/licenses/protobuf-java-util-3.19.2.jar.sha1 | 1 -
solr/licenses/protobuf-java-util-3.21.4.jar.sha1 | 1 +
solr/licenses/threetenbp-1.5.2.jar.sha1 | 1 -
solr/licenses/threetenbp-1.6.0.jar.sha1 | 1 +
.../solr/gcs/ConcurrentDelegatingStorage.java | 33 +++++++++++
versions.lock | 64 +++++++++++-----------
versions.props | 4 +-
60 files changed, 97 insertions(+), 62 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2a6d26cee7a..66b8ee62e4f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -179,6 +179,8 @@ Other Changes
* SOLR-16296: XmlConfigFile and QueryElevationComponent now use SafeXMLParsing. (Haythem Khiri)
+* SOLR-16402: Bump google-cloud-bom to 0.178.0 (Kevin Risden)
+
Build
---------------------
* SOLR-16204: Change Lucene dependency to Lucene 9.1.0 (Elia Porciani via Alessandro Benedetti)
diff --git a/solr/licenses/api-common-2.1.2.jar.sha1 b/solr/licenses/api-common-2.1.2.jar.sha1
deleted file mode 100644
index 8f3d063e737..00000000000
--- a/solr/licenses/api-common-2.1.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-eff20f72b42843d48d01c19099d4a22e8da773fa
diff --git a/solr/licenses/api-common-2.2.1.jar.sha1 b/solr/licenses/api-common-2.2.1.jar.sha1
new file mode 100644
index 00000000000..08f5178a8f2
--- /dev/null
+++ b/solr/licenses/api-common-2.2.1.jar.sha1
@@ -0,0 +1 @@
+9eb62c522f96befccfbd8c92bafc952eed4417a8
diff --git a/solr/licenses/checker-qual-3.22.0.jar.sha1 b/solr/licenses/checker-qual-3.22.0.jar.sha1
deleted file mode 100644
index 0589667737f..00000000000
--- a/solr/licenses/checker-qual-3.22.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8e37f79d2cfe45a670e13f728b5e536ba65ac3ef
diff --git a/solr/licenses/checker-qual-3.23.0.jar.sha1 b/solr/licenses/checker-qual-3.23.0.jar.sha1
new file mode 100644
index 00000000000..7d89426df6f
--- /dev/null
+++ b/solr/licenses/checker-qual-3.23.0.jar.sha1
@@ -0,0 +1 @@
+2ce274da87ae21d940ded7b827d9069206ea3001
diff --git a/solr/licenses/gax-2.18.7.jar.sha1 b/solr/licenses/gax-2.18.7.jar.sha1
new file mode 100644
index 00000000000..95cbb3978a5
--- /dev/null
+++ b/solr/licenses/gax-2.18.7.jar.sha1
@@ -0,0 +1 @@
+2da519c341dcc7942f7172c14a7220a5b2265821
diff --git a/solr/licenses/gax-2.8.1.jar.sha1 b/solr/licenses/gax-2.8.1.jar.sha1
deleted file mode 100644
index 0e09b08dba9..00000000000
--- a/solr/licenses/gax-2.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c99dcb923675ae3e2fe8eb66f736e80f89c66231
diff --git a/solr/licenses/gax-httpjson-0.103.7.jar.sha1 b/solr/licenses/gax-httpjson-0.103.7.jar.sha1
new file mode 100644
index 00000000000..9b889d638c6
--- /dev/null
+++ b/solr/licenses/gax-httpjson-0.103.7.jar.sha1
@@ -0,0 +1 @@
+47998a83b366c0dd7234fa512b8c468a88c90be2
diff --git a/solr/licenses/gax-httpjson-0.93.1.jar.sha1 b/solr/licenses/gax-httpjson-0.93.1.jar.sha1
deleted file mode 100644
index a15a261879c..00000000000
--- a/solr/licenses/gax-httpjson-0.93.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a9e83876b48a4b2e3d0b6b98757ea82bfb425992
diff --git a/solr/licenses/google-api-client-1.33.0.jar.sha1 b/solr/licenses/google-api-client-1.33.0.jar.sha1
deleted file mode 100644
index 60f91670207..00000000000
--- a/solr/licenses/google-api-client-1.33.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fe86fc26f8c140a691460660d684a33f17212d21
diff --git a/solr/licenses/google-api-client-2.0.0.jar.sha1 b/solr/licenses/google-api-client-2.0.0.jar.sha1
new file mode 100644
index 00000000000..b69f2e3b0c2
--- /dev/null
+++ b/solr/licenses/google-api-client-2.0.0.jar.sha1
@@ -0,0 +1 @@
+c3daf5048a26a73182b5e6c81ad141fb859f0787
diff --git a/solr/licenses/google-api-services-storage-v1-rev20211201-1.32.1.jar.sha1 b/solr/licenses/google-api-services-storage-v1-rev20211201-1.32.1.jar.sha1
deleted file mode 100644
index 9b1d5faa8e4..00000000000
--- a/solr/licenses/google-api-services-storage-v1-rev20211201-1.32.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b717bc251d713783dc31c59c0a637eda67de8415
diff --git a/solr/licenses/google-api-services-storage-v1-rev20220705-2.0.0.jar.sha1 b/solr/licenses/google-api-services-storage-v1-rev20220705-2.0.0.jar.sha1
new file mode 100644
index 00000000000..f8cd28015ba
--- /dev/null
+++ b/solr/licenses/google-api-services-storage-v1-rev20220705-2.0.0.jar.sha1
@@ -0,0 +1 @@
+e1760aa74ae68bbdd0a8918893526b45c4d0aa3a
diff --git a/solr/licenses/google-auth-library-credentials-1.3.0.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.3.0.jar.sha1
deleted file mode 100644
index 2873f1c3377..00000000000
--- a/solr/licenses/google-auth-library-credentials-1.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8e085f0a36301395052d1adc26befd4bc0b80d3e
diff --git a/solr/licenses/google-auth-library-credentials-1.8.1.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.8.1.jar.sha1
new file mode 100644
index 00000000000..4962281892d
--- /dev/null
+++ b/solr/licenses/google-auth-library-credentials-1.8.1.jar.sha1
@@ -0,0 +1 @@
+f5e0c6e72ce1c861a88a7f2f72cb10ca99a96758
diff --git a/solr/licenses/google-auth-library-oauth2-http-1.3.0.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.3.0.jar.sha1
deleted file mode 100644
index ea47a5f4add..00000000000
--- a/solr/licenses/google-auth-library-oauth2-http-1.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fb9d88528fe8061230d3a7cb1f2d0ab2423976ae
diff --git a/solr/licenses/google-auth-library-oauth2-http-1.8.1.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.8.1.jar.sha1
new file mode 100644
index 00000000000..6580a0512c9
--- /dev/null
+++ b/solr/licenses/google-auth-library-oauth2-http-1.8.1.jar.sha1
@@ -0,0 +1 @@
+3a49c6af9162e90580f35253ffdd47eab7580f30
diff --git a/solr/licenses/google-cloud-core-2.3.5.jar.sha1 b/solr/licenses/google-cloud-core-2.3.5.jar.sha1
deleted file mode 100644
index 983bc5092bf..00000000000
--- a/solr/licenses/google-cloud-core-2.3.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a3dfdc439c0660c42dad7355edc6fc0f2d2eca77
diff --git a/solr/licenses/google-cloud-core-2.8.6.jar.sha1 b/solr/licenses/google-cloud-core-2.8.6.jar.sha1
new file mode 100644
index 00000000000..a2355ca4887
--- /dev/null
+++ b/solr/licenses/google-cloud-core-2.8.6.jar.sha1
@@ -0,0 +1 @@
+72b5a9d56d1afc3d75df5e7a0dfc201eda15d2ce
diff --git a/solr/licenses/google-cloud-core-http-2.3.5.jar.sha1 b/solr/licenses/google-cloud-core-http-2.3.5.jar.sha1
deleted file mode 100644
index 127442307fd..00000000000
--- a/solr/licenses/google-cloud-core-http-2.3.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f4e707942bbf52b340ffcb031c474e80be8aebcb
diff --git a/solr/licenses/google-cloud-core-http-2.8.6.jar.sha1 b/solr/licenses/google-cloud-core-http-2.8.6.jar.sha1
new file mode 100644
index 00000000000..ae3e699ad3f
--- /dev/null
+++ b/solr/licenses/google-cloud-core-http-2.8.6.jar.sha1
@@ -0,0 +1 @@
+51b31548319cbcae62cd24b05db9709e67e87a7c
diff --git a/solr/licenses/google-cloud-nio-0.123.18.jar.sha1 b/solr/licenses/google-cloud-nio-0.123.18.jar.sha1
deleted file mode 100644
index 00ab9e12705..00000000000
--- a/solr/licenses/google-cloud-nio-0.123.18.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f5d7e58a897c214390e523cccb9efb8cec195181
diff --git a/solr/licenses/google-cloud-nio-0.124.14.jar.sha1 b/solr/licenses/google-cloud-nio-0.124.14.jar.sha1
new file mode 100644
index 00000000000..0e6e41eabfa
--- /dev/null
+++ b/solr/licenses/google-cloud-nio-0.124.14.jar.sha1
@@ -0,0 +1 @@
+febb6a89f3ae62ac8a4446e5332ab36adaa06aa2
diff --git a/solr/licenses/google-cloud-storage-2.11.3.jar.sha1 b/solr/licenses/google-cloud-storage-2.11.3.jar.sha1
new file mode 100644
index 00000000000..5c652ab0760
--- /dev/null
+++ b/solr/licenses/google-cloud-storage-2.11.3.jar.sha1
@@ -0,0 +1 @@
+a571a04d50e18f6a0a8d296d3f0a79c34327af08
diff --git a/solr/licenses/google-cloud-storage-2.2.3.jar.sha1 b/solr/licenses/google-cloud-storage-2.2.3.jar.sha1
deleted file mode 100644
index 499824b8ce4..00000000000
--- a/solr/licenses/google-cloud-storage-2.2.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-56c42b2e48cd05c989c602fe42f3c060140f2652
diff --git a/solr/licenses/google-http-client-1.41.0.jar.sha1 b/solr/licenses/google-http-client-1.41.0.jar.sha1
deleted file mode 100644
index 3d6ad1be8ff..00000000000
--- a/solr/licenses/google-http-client-1.41.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6334215e876a7bda17072910e16b150868a7018b
diff --git a/solr/licenses/google-http-client-1.42.2.jar.sha1 b/solr/licenses/google-http-client-1.42.2.jar.sha1
new file mode 100644
index 00000000000..82a185314eb
--- /dev/null
+++ b/solr/licenses/google-http-client-1.42.2.jar.sha1
@@ -0,0 +1 @@
+6d6ab266972f0afc6987fe3b88ce321179515fa3
diff --git a/solr/licenses/google-http-client-apache-v2-1.41.0.jar.sha1 b/solr/licenses/google-http-client-apache-v2-1.41.0.jar.sha1
deleted file mode 100644
index 9be3cc09674..00000000000
--- a/solr/licenses/google-http-client-apache-v2-1.41.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0d3edd9b035d8407a359c3395a5a7f1b3d1e534e
diff --git a/solr/licenses/google-http-client-apache-v2-1.42.2.jar.sha1 b/solr/licenses/google-http-client-apache-v2-1.42.2.jar.sha1
new file mode 100644
index 00000000000..faff8ab4277
--- /dev/null
+++ b/solr/licenses/google-http-client-apache-v2-1.42.2.jar.sha1
@@ -0,0 +1 @@
+d89fc070f427f8200b7401cda1ed4ce3004ec58d
diff --git a/solr/licenses/google-http-client-appengine-1.41.0.jar.sha1 b/solr/licenses/google-http-client-appengine-1.41.0.jar.sha1
deleted file mode 100644
index 5c49cbaa67a..00000000000
--- a/solr/licenses/google-http-client-appengine-1.41.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9944400b0dfb804cb883bf8d989e1fb0232e9052
diff --git a/solr/licenses/google-http-client-appengine-1.42.2.jar.sha1 b/solr/licenses/google-http-client-appengine-1.42.2.jar.sha1
new file mode 100644
index 00000000000..e3991e4b1fe
--- /dev/null
+++ b/solr/licenses/google-http-client-appengine-1.42.2.jar.sha1
@@ -0,0 +1 @@
+d79bd2db2d608243124b53585d92d2be118f7fa7
diff --git a/solr/licenses/google-http-client-gson-1.41.0.jar.sha1 b/solr/licenses/google-http-client-gson-1.41.0.jar.sha1
deleted file mode 100644
index 4afc7f4337a..00000000000
--- a/solr/licenses/google-http-client-gson-1.41.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1a754a5dd672218a2ac667d7ff2b28df7a5a240e
diff --git a/solr/licenses/google-http-client-gson-1.42.2.jar.sha1 b/solr/licenses/google-http-client-gson-1.42.2.jar.sha1
new file mode 100644
index 00000000000..4cca69c5aa8
--- /dev/null
+++ b/solr/licenses/google-http-client-gson-1.42.2.jar.sha1
@@ -0,0 +1 @@
+863fbfbdb35c203c43cefd9e3cc1e3a7c8e9f51e
diff --git a/solr/licenses/google-http-client-jackson2-1.41.0.jar.sha1 b/solr/licenses/google-http-client-jackson2-1.41.0.jar.sha1
deleted file mode 100644
index 94afaddb7a6..00000000000
--- a/solr/licenses/google-http-client-jackson2-1.41.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-768627d6e8e55b6ec499163b5e283e26d1b049b5
diff --git a/solr/licenses/google-http-client-jackson2-1.42.2.jar.sha1 b/solr/licenses/google-http-client-jackson2-1.42.2.jar.sha1
new file mode 100644
index 00000000000..16efe68ee1e
--- /dev/null
+++ b/solr/licenses/google-http-client-jackson2-1.42.2.jar.sha1
@@ -0,0 +1 @@
+e8f81a0b9de2cfc8b9ab8f8a2a7b678608afc4b5
diff --git a/solr/licenses/google-oauth-client-1.32.1.jar.sha1 b/solr/licenses/google-oauth-client-1.32.1.jar.sha1
deleted file mode 100644
index 585f7a74b02..00000000000
--- a/solr/licenses/google-oauth-client-1.32.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-58edd8b2fd2e10eef6fd194ebb9c933054c4a744
diff --git a/solr/licenses/google-oauth-client-1.34.1.jar.sha1 b/solr/licenses/google-oauth-client-1.34.1.jar.sha1
new file mode 100644
index 00000000000..1acd4dce618
--- /dev/null
+++ b/solr/licenses/google-oauth-client-1.34.1.jar.sha1
@@ -0,0 +1 @@
+4a4f88c5e13143f882268c98239fb85c3b2c6cb2
diff --git a/solr/licenses/grpc-context-1.43.2.jar.sha1 b/solr/licenses/grpc-context-1.43.2.jar.sha1
deleted file mode 100644
index 0e0243a0b29..00000000000
--- a/solr/licenses/grpc-context-1.43.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cc6fd89fb5adbae97e7724d4f4f7fbed71018163
diff --git a/solr/licenses/grpc-context-1.48.0.jar.sha1 b/solr/licenses/grpc-context-1.48.0.jar.sha1
new file mode 100644
index 00000000000..589caacb3ed
--- /dev/null
+++ b/solr/licenses/grpc-context-1.48.0.jar.sha1
@@ -0,0 +1 @@
+58129c050c0dcc306abab5b5fa5f2f8f186423de
diff --git a/solr/licenses/gson-2.8.9.jar.sha1 b/solr/licenses/gson-2.8.9.jar.sha1
deleted file mode 100644
index 71b8a788041..00000000000
--- a/solr/licenses/gson-2.8.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8a432c1d6825781e21a02db2e2c33c5fde2833b9
diff --git a/solr/licenses/gson-2.9.1.jar.sha1 b/solr/licenses/gson-2.9.1.jar.sha1
new file mode 100644
index 00000000000..17a305d13a7
--- /dev/null
+++ b/solr/licenses/gson-2.9.1.jar.sha1
@@ -0,0 +1 @@
+02cc2131b98ebfb04e2b2c7dfb84431f4045096b
diff --git a/solr/licenses/guava-31.0.1-jre.jar.sha1 b/solr/licenses/guava-31.0.1-jre.jar.sha1
deleted file mode 100644
index e8bf52b09d7..00000000000
--- a/solr/licenses/guava-31.0.1-jre.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-119ea2b2bc205b138974d351777b20f02b92704b
diff --git a/solr/licenses/guava-31.1-jre.jar.sha1 b/solr/licenses/guava-31.1-jre.jar.sha1
new file mode 100644
index 00000000000..fd390406170
--- /dev/null
+++ b/solr/licenses/guava-31.1-jre.jar.sha1
@@ -0,0 +1 @@
+60458f877d055d0c9114d9e1a2efb737b4bc282c
diff --git a/solr/licenses/opencensus-api-0.28.0.jar.sha1 b/solr/licenses/opencensus-api-0.28.0.jar.sha1
deleted file mode 100644
index 5bcad8d0f55..00000000000
--- a/solr/licenses/opencensus-api-0.28.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0fc0d06a9d975a38c581dff59b99cf31db78bd99
diff --git a/solr/licenses/opencensus-api-0.31.1.jar.sha1 b/solr/licenses/opencensus-api-0.31.1.jar.sha1
new file mode 100644
index 00000000000..cf2d0b3f613
--- /dev/null
+++ b/solr/licenses/opencensus-api-0.31.1.jar.sha1
@@ -0,0 +1 @@
+66a60c7201c2b8b20ce495f0295b32bb0ccbbc57
diff --git a/solr/licenses/opencensus-contrib-http-util-0.28.0.jar.sha1 b/solr/licenses/opencensus-contrib-http-util-0.28.0.jar.sha1
deleted file mode 100644
index a15bcc9fdd7..00000000000
--- a/solr/licenses/opencensus-contrib-http-util-0.28.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f6cb276330197d51dd65327fc305a3df7e622705
diff --git a/solr/licenses/opencensus-contrib-http-util-0.31.1.jar.sha1 b/solr/licenses/opencensus-contrib-http-util-0.31.1.jar.sha1
new file mode 100644
index 00000000000..d5ad6acac85
--- /dev/null
+++ b/solr/licenses/opencensus-contrib-http-util-0.31.1.jar.sha1
@@ -0,0 +1 @@
+3c13fc5715231fadb16a9b74a44d9d59c460cfa8
diff --git a/solr/licenses/proto-google-common-protos-2.7.1.jar.sha1 b/solr/licenses/proto-google-common-protos-2.7.1.jar.sha1
deleted file mode 100644
index daa185cb01b..00000000000
--- a/solr/licenses/proto-google-common-protos-2.7.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f0f101045d738992ec8a3956f0cce9ce49a76fe1
diff --git a/solr/licenses/proto-google-common-protos-2.9.2.jar.sha1 b/solr/licenses/proto-google-common-protos-2.9.2.jar.sha1
new file mode 100644
index 00000000000..ac3f0f42dee
--- /dev/null
+++ b/solr/licenses/proto-google-common-protos-2.9.2.jar.sha1
@@ -0,0 +1 @@
+e59de564686b050b1a292e6c2d6786e55f113f55
diff --git a/solr/licenses/proto-google-iam-v1-1.2.0.jar.sha1 b/solr/licenses/proto-google-iam-v1-1.2.0.jar.sha1
deleted file mode 100644
index 30184da5409..00000000000
--- a/solr/licenses/proto-google-iam-v1-1.2.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4ac276c6fc59c48ea916514bfcfaec66b8d607b4
diff --git a/solr/licenses/proto-google-iam-v1-1.5.2.jar.sha1 b/solr/licenses/proto-google-iam-v1-1.5.2.jar.sha1
new file mode 100644
index 00000000000..f6c7870dd07
--- /dev/null
+++ b/solr/licenses/proto-google-iam-v1-1.5.2.jar.sha1
@@ -0,0 +1 @@
+68007f27c0b06db5b1d0b1f8a3d90501a217c2a4
diff --git a/solr/licenses/protobuf-java-3.19.4.jar.sha1 b/solr/licenses/protobuf-java-3.19.4.jar.sha1
deleted file mode 100644
index 7bd96162209..00000000000
--- a/solr/licenses/protobuf-java-3.19.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-748e4e0b9e4fa6b9b1fe65690aa04a9db56cfc4d
diff --git a/solr/licenses/protobuf-java-3.21.4.jar.sha1 b/solr/licenses/protobuf-java-3.21.4.jar.sha1
new file mode 100644
index 00000000000..7a2fa3257e4
--- /dev/null
+++ b/solr/licenses/protobuf-java-3.21.4.jar.sha1
@@ -0,0 +1 @@
+9947febd7a6d0695726c78f603a149b7b7c108e0
diff --git a/solr/licenses/protobuf-java-util-3.19.2.jar.sha1 b/solr/licenses/protobuf-java-util-3.19.2.jar.sha1
deleted file mode 100644
index 8e55d7d2461..00000000000
--- a/solr/licenses/protobuf-java-util-3.19.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fd73ae9d9f8121eca362d54279f73bb56219a594
diff --git a/solr/licenses/protobuf-java-util-3.21.4.jar.sha1 b/solr/licenses/protobuf-java-util-3.21.4.jar.sha1
new file mode 100644
index 00000000000..59db3352551
--- /dev/null
+++ b/solr/licenses/protobuf-java-util-3.21.4.jar.sha1
@@ -0,0 +1 @@
+3300eee68565acbdaae14885b9ebf32ba5cb6e97
diff --git a/solr/licenses/threetenbp-1.5.2.jar.sha1 b/solr/licenses/threetenbp-1.5.2.jar.sha1
deleted file mode 100644
index c2814707e4e..00000000000
--- a/solr/licenses/threetenbp-1.5.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9aec3509609fc41f29ddc46119a124b8659e2c25
diff --git a/solr/licenses/threetenbp-1.6.0.jar.sha1 b/solr/licenses/threetenbp-1.6.0.jar.sha1
new file mode 100644
index 00000000000..9d99241549b
--- /dev/null
+++ b/solr/licenses/threetenbp-1.6.0.jar.sha1
@@ -0,0 +1 @@
+146819e1d5a2145828fd7b5fa8338decc8c1fa5e
diff --git a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java
index d6f5d22e332..6c6d9b2ade8 100644
--- a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java
+++ b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java
@@ -29,6 +29,8 @@ import com.google.cloud.storage.Bucket;
import com.google.cloud.storage.BucketInfo;
import com.google.cloud.storage.CopyWriter;
import com.google.cloud.storage.HmacKey;
+import com.google.cloud.storage.Notification;
+import com.google.cloud.storage.NotificationInfo;
import com.google.cloud.storage.PostPolicyV4;
import com.google.cloud.storage.ServiceAccount;
import com.google.cloud.storage.Storage;
@@ -36,6 +38,7 @@ import com.google.cloud.storage.StorageBatch;
import com.google.cloud.storage.StorageOptions;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.net.URL;
import java.nio.ByteBuffer;
import java.nio.file.Path;
@@ -218,6 +221,16 @@ public class ConcurrentDelegatingStorage implements Storage {
return new ConcurrentReadChannel(this, delegate.reader(blob, options));
}
+ @Override
+ public void downloadTo(BlobId blob, Path path, BlobSourceOption... options) {
+ delegate.downloadTo(blob, path, options);
+ }
+
+ @Override
+ public void downloadTo(BlobId blob, OutputStream outputStream, BlobSourceOption... options) {
+ delegate.downloadTo(blob, outputStream, options);
+ }
+
@Override
public synchronized WriteChannel writer(BlobInfo blobInfo, BlobWriteOption... options) {
return new ConcurrentWriteChannel(this, delegate.writer(blobInfo, options));
@@ -456,6 +469,26 @@ public class ConcurrentDelegatingStorage implements Storage {
return delegate.getServiceAccount(projectId);
}
+ @Override
+ public Notification createNotification(String bucket, NotificationInfo notificationInfo) {
+ return delegate.createNotification(bucket, notificationInfo);
+ }
+
+ @Override
+ public Notification getNotification(String bucket, String notificationId) {
+ return delegate.getNotification(bucket, notificationId);
+ }
+
+ @Override
+ public List<Notification> listNotifications(String bucket) {
+ return delegate.listNotifications(bucket);
+ }
+
+ @Override
+ public boolean deleteNotification(String bucket, String notificationId) {
+ return delegate.deleteNotification(bucket, notificationId);
+ }
+
@Override
public synchronized StorageOptions getOptions() {
return delegate.getOptions();
diff --git a/versions.lock b/versions.lock
index 7c50d8a6e0f..ccda67cce2c 100644
--- a/versions.lock
+++ b/versions.lock
@@ -7,7 +7,7 @@ com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
com.esri.geometry:esri-geometry-api:2.2.0 (1 constraints: 5c0db22c)
com.fasterxml.jackson:jackson-bom:2.13.3 (11 constraints: e1de7271)
com.fasterxml.jackson.core:jackson-annotations:2.13.3 (8 constraints: 3b8f1d41)
-com.fasterxml.jackson.core:jackson-core:2.13.3 (13 constraints: 08f8728c)
+com.fasterxml.jackson.core:jackson-core:2.13.3 (13 constraints: 0bf8f58d)
com.fasterxml.jackson.core:jackson-databind:2.13.3 (16 constraints: 5a33b8f5)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.13.3 (1 constraints: b90ea666)
com.fasterxml.woodstox:woodstox-core:6.2.8 (3 constraints: ba28f6ba)
@@ -18,34 +18,34 @@ com.github.openjson:openjson:1.0.12 (1 constraints: 8b0c6d0e)
com.github.spotbugs:spotbugs-annotations:4.5.3 (1 constraints: 0e051136)
com.github.virtuald:curvesapi:1.06 (1 constraints: 9d0ac6c0)
com.github.zafarkhaja:java-semver:0.9.0 (1 constraints: 0b050636)
-com.google.api:api-common:2.1.2 (5 constraints: 8543f3a1)
-com.google.api:gax:2.8.1 (5 constraints: 7449a26d)
-com.google.api:gax-httpjson:0.93.1 (2 constraints: e2204982)
-com.google.api-client:google-api-client:1.33.0 (3 constraints: 3a336d7f)
-com.google.api.grpc:proto-google-common-protos:2.7.1 (4 constraints: bf3ab84e)
-com.google.api.grpc:proto-google-iam-v1:1.2.0 (2 constraints: 811ed595)
-com.google.apis:google-api-services-storage:v1-rev20211201-1.32.1 (2 constraints: 34260f8c)
-com.google.auth:google-auth-library-credentials:1.3.0 (6 constraints: 0a5716e7)
-com.google.auth:google-auth-library-oauth2-http:1.3.0 (5 constraints: 804328a0)
-com.google.auto.value:auto-value-annotations:1.9 (5 constraints: fb492c3a)
-com.google.cloud:google-cloud-bom:0.166.0 (1 constraints: 6f05b240)
-com.google.cloud:google-cloud-core:2.3.5 (3 constraints: ba2ee5dd)
-com.google.cloud:google-cloud-core-http:2.3.5 (1 constraints: ee0fe795)
-com.google.cloud:google-cloud-storage:2.2.3 (2 constraints: 6e1c99f3)
-com.google.code.gson:gson:2.8.9 (6 constraints: f25833c8)
-com.google.errorprone:error_prone_annotations:2.14.0 (4 constraints: 3438b8bc)
+com.google.api:api-common:2.2.1 (5 constraints: 8543fda1)
+com.google.api:gax:2.18.7 (5 constraints: 874a5ca6)
+com.google.api:gax-httpjson:0.103.7 (2 constraints: 3e21a5bc)
+com.google.api-client:google-api-client:2.0.0 (3 constraints: 9b3281f9)
+com.google.api.grpc:proto-google-common-protos:2.9.2 (5 constraints: 36430d89)
+com.google.api.grpc:proto-google-iam-v1:1.5.2 (2 constraints: 8b1ed196)
+com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0 (2 constraints: dc259c49)
+com.google.auth:google-auth-library-credentials:1.8.1 (6 constraints: 2a5788f4)
+com.google.auth:google-auth-library-oauth2-http:1.8.1 (5 constraints: 9a4394a8)
+com.google.auto.value:auto-value-annotations:1.9 (5 constraints: 9c494bcf)
+com.google.cloud:google-cloud-bom:0.178.0 (1 constraints: 7205bc40)
+com.google.cloud:google-cloud-core:2.8.6 (3 constraints: cc2e39e1)
+com.google.cloud:google-cloud-core-http:2.8.6 (1 constraints: f40ff795)
+com.google.cloud:google-cloud-storage:2.11.3 (2 constraints: cf1cb826)
+com.google.code.gson:gson:2.9.1 (6 constraints: e65871c0)
+com.google.errorprone:error_prone_annotations:2.14.0 (4 constraints: 5e3861e5)
com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
-com.google.guava:guava:31.0.1-jre (17 constraints: 850e5ccb)
+com.google.guava:guava:31.1-jre (17 constraints: da0a1c8d)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
-com.google.http-client:google-http-client:1.41.0 (11 constraints: 17bf6b7e)
-com.google.http-client:google-http-client-apache-v2:1.41.0 (2 constraints: af201c75)
-com.google.http-client:google-http-client-appengine:1.41.0 (2 constraints: d420d680)
-com.google.http-client:google-http-client-gson:1.41.0 (5 constraints: 784fd905)
-com.google.http-client:google-http-client-jackson2:1.41.0 (1 constraints: 1a10fea5)
+com.google.http-client:google-http-client:1.42.2 (11 constraints: 28bfcf97)
+com.google.http-client:google-http-client-apache-v2:1.42.2 (2 constraints: b4208375)
+com.google.http-client:google-http-client-appengine:1.42.2 (2 constraints: da206d81)
+com.google.http-client:google-http-client-gson:1.42.2 (6 constraints: e6619899)
+com.google.http-client:google-http-client-jackson2:1.42.2 (1 constraints: 1d1003a6)
com.google.j2objc:j2objc-annotations:1.3 (4 constraints: 7d3ab454)
-com.google.oauth-client:google-oauth-client:1.32.1 (2 constraints: b1204b75)
-com.google.protobuf:protobuf-java:3.19.4 (9 constraints: 2183ee29)
-com.google.protobuf:protobuf-java-util:3.19.2 (3 constraints: 422b4c2e)
+com.google.oauth-client:google-oauth-client:1.34.1 (2 constraints: b520b575)
+com.google.protobuf:protobuf-java:3.21.4 (9 constraints: ff82c80a)
+com.google.protobuf:protobuf-java-util:3.21.4 (3 constraints: 332b642b)
com.google.re2j:re2j:1.2 (1 constraints: a7041c2c)
com.googlecode.json-simple:json-simple:1.1.1 (1 constraints: 5a0ce501)
com.googlecode.juniversalchardet:juniversalchardet:1.0.3 (1 constraints: 5b0ce401)
@@ -80,7 +80,7 @@ io.dropwizard.metrics:metrics-graphite:4.1.5 (1 constraints: 0c050736)
io.dropwizard.metrics:metrics-jetty9:4.1.5 (1 constraints: 0c050736)
io.dropwizard.metrics:metrics-jmx:4.1.5 (1 constraints: 0c050736)
io.dropwizard.metrics:metrics-jvm:4.1.5 (1 constraints: 0c050736)
-io.grpc:grpc-context:1.43.2 (2 constraints: 1e1dd225)
+io.grpc:grpc-context:1.48.0 (2 constraints: 211d5126)
io.jaegertracing:jaeger-core:1.6.0 (2 constraints: 6912c420)
io.jaegertracing:jaeger-thrift:1.6.0 (1 constraints: 09050236)
io.netty:netty-buffer:4.1.68.Final (6 constraints: 915bfcb7)
@@ -91,8 +91,8 @@ io.netty:netty-resolver:4.1.68.Final (2 constraints: 5a1a4732)
io.netty:netty-transport:4.1.68.Final (5 constraints: dd4d9295)
io.netty:netty-transport-native-epoll:4.1.68.Final (1 constraints: db0f158f)
io.netty:netty-transport-native-unix-common:4.1.68.Final (1 constraints: b212fc1e)
-io.opencensus:opencensus-api:0.28.0 (5 constraints: ab4d6e9c)
-io.opencensus:opencensus-contrib-http-util:0.28.0 (3 constraints: 8132c2ff)
+io.opencensus:opencensus-api:0.31.1 (5 constraints: 974d3996)
+io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
io.opentracing:opentracing-api:0.33.0 (5 constraints: 4d3cfe52)
io.opentracing:opentracing-noop:0.33.0 (3 constraints: 7c2142bd)
io.opentracing:opentracing-util:0.33.0 (3 constraints: f71f843b)
@@ -215,7 +215,7 @@ org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36)
org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e)
org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300)
org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 5b0ce801)
-org.checkerframework:checker-qual:3.22.0 (5 constraints: 4b466fe6)
+org.checkerframework:checker-qual:3.23.0 (5 constraints: 4e46d4e7)
org.codehaus.janino:commons-compiler:3.0.11 (2 constraints: 81192719)
org.codehaus.janino:janino:3.0.11 (1 constraints: 8d0d3f3a)
org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)
@@ -270,7 +270,7 @@ org.tallison:isoparser:1.9.41.7 (1 constraints: fb0c5528)
org.tallison:jmatio:1.5 (1 constraints: ff0b57e9)
org.tallison:metadata-extractor:2.15.0.1 (1 constraints: ee0c2f28)
org.tallison.xmp:xmpcore-shaded:6.1.11 (1 constraints: 310e8e49)
-org.threeten:threetenbp:1.5.2 (4 constraints: 0433f25e)
+org.threeten:threetenbp:1.6.0 (4 constraints: 0433a25f)
org.tukaani:xz:1.9 (1 constraints: 030c5be9)
org.xerial.snappy:snappy-java:1.1.8.2 (4 constraints: 8c382ee2)
software.amazon.awssdk:annotations:2.17.63 (17 constraints: e2ff18d3)
@@ -310,7 +310,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.3 (3 constraints: 76
com.fasterxml.jackson.module:jackson-module-kotlin:2.13.3 (2 constraints: a51d0260)
com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.3 (2 constraints: 0824f881)
com.github.stephenc.jcip:jcip-annotations:1.0-1 (2 constraints: c5188bde)
-com.google.cloud:google-cloud-nio:0.123.18 (1 constraints: cc0e1c7b)
+com.google.cloud:google-cloud-nio:0.124.14 (1 constraints: c90e1c7b)
com.nimbusds:content-type:2.2 (1 constraints: d80b68eb)
com.nimbusds:lang-tag:1.5 (1 constraints: da0b68eb)
com.nimbusds:nimbus-jose-jwt:9.16.1 (1 constraints: 730c5410)
diff --git a/versions.props b/versions.props
index d7d863ef4bd..23adf796049 100644
--- a/versions.props
+++ b/versions.props
@@ -7,9 +7,9 @@ com.fasterxml.woodstox:woodstox-core=6.2.8
com.github.ben-manes.caffeine:caffeine=3.1.1
com.github.spotbugs:*=4.5.3
com.github.zafarkhaja:java-semver=0.9.0
-com.google.cloud:google-cloud-bom=0.166.0
+com.google.cloud:google-cloud-bom=0.178.0
com.google.errorprone:*=2.11.0
-com.google.guava:guava=31.0.1-jre
+com.google.guava:guava=31.1-jre
com.google.re2j:re2j=1.2
com.jayway.jsonpath:json-path=2.4.0
com.lmax:disruptor=3.4.2