This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 5e1b052 SOLR-15990: Use google-cloud-bom for gcs-repository
dependencies
5e1b052 is described below
commit 5e1b052b3bd02db6c76e370a1ee2afc27d4d95c5
Author: Kevin Risden <[email protected]>
AuthorDate: Tue Feb 8 16:38:33 2022 -0500
SOLR-15990: Use google-cloud-bom for gcs-repository dependencies
---
solr/CHANGES.txt | 2 +
solr/licenses/api-common-1.10.1.jar.sha1 | 1 -
solr/licenses/api-common-2.1.2.jar.sha1 | 1 +
.../licenses/auto-value-annotations-1.7.4.jar.sha1 | 1 -
solr/licenses/auto-value-annotations-1.9.jar.sha1 | 1 +
solr/licenses/checker-compat-qual-2.5.5.jar.sha1 | 1 -
solr/licenses/checker-compat-qual-LICENSE-MIT.txt | 5 --
solr/licenses/checker-qual-3.19.0.jar.sha1 | 1 -
solr/licenses/checker-qual-3.20.0.jar.sha1 | 1 +
solr/licenses/gax-1.62.0.jar.sha1 | 1 -
solr/licenses/gax-2.8.1.jar.sha1 | 1 +
solr/licenses/gax-httpjson-0.79.0.jar.sha1 | 1 -
solr/licenses/gax-httpjson-0.93.1.jar.sha1 | 1 +
solr/licenses/google-api-client-1.32.1.jar.sha1 | 1 -
solr/licenses/google-api-client-1.33.0.jar.sha1 | 1 +
...services-storage-v1-rev20210127-1.31.0.jar.sha1 | 1 -
...services-storage-v1-rev20211201-1.32.1.jar.sha1 | 1 +
...google-auth-library-credentials-0.24.1.jar.sha1 | 1 -
.../google-auth-library-credentials-1.3.0.jar.sha1 | 1 +
...google-auth-library-oauth2-http-0.24.1.jar.sha1 | 1 -
.../google-auth-library-oauth2-http-1.3.0.jar.sha1 | 1 +
solr/licenses/google-cloud-core-1.94.3.jar.sha1 | 1 -
solr/licenses/google-cloud-core-2.3.5.jar.sha1 | 1 +
.../google-cloud-core-http-1.94.3.jar.sha1 | 1 -
.../licenses/google-cloud-core-http-2.3.5.jar.sha1 | 1 +
solr/licenses/google-cloud-nio-0.122.11.jar.sha1 | 1 -
solr/licenses/google-cloud-nio-0.123.18.jar.sha1 | 1 +
.../google-cloud-storage-1.113.14.jar.sha1 | 1 -
solr/licenses/google-cloud-storage-2.2.3.jar.sha1 | 1 +
solr/licenses/google-http-client-1.39.2.jar.sha1 | 1 -
solr/licenses/google-http-client-1.41.0.jar.sha1 | 1 +
.../google-http-client-apache-v2-1.39.2.jar.sha1 | 1 -
.../google-http-client-apache-v2-1.41.0.jar.sha1 | 1 +
.../google-http-client-appengine-1.39.0.jar.sha1 | 1 -
.../google-http-client-appengine-1.41.0.jar.sha1 | 1 +
.../google-http-client-gson-1.39.2.jar.sha1 | 1 -
.../google-http-client-gson-1.41.0.jar.sha1 | 1 +
.../google-http-client-jackson2-1.39.0.jar.sha1 | 1 -
.../google-http-client-jackson2-1.41.0.jar.sha1 | 1 +
solr/licenses/grpc-context-1.36.0.jar.sha1 | 1 -
solr/licenses/grpc-context-1.43.2.jar.sha1 | 1 +
solr/licenses/gson-2.8.6.jar.sha1 | 1 -
solr/licenses/gson-2.8.9.jar.sha1 | 1 +
.../proto-google-common-protos-2.1.0.jar.sha1 | 1 -
.../proto-google-common-protos-2.7.1.jar.sha1 | 1 +
solr/licenses/proto-google-iam-v1-1.0.10.jar.sha1 | 1 -
solr/licenses/proto-google-iam-v1-1.2.0.jar.sha1 | 1 +
solr/licenses/protobuf-java-3.15.5.jar.sha1 | 1 -
solr/licenses/protobuf-java-3.19.2.jar.sha1 | 1 +
solr/licenses/protobuf-java-util-3.15.5.jar.sha1 | 1 -
solr/licenses/protobuf-java-util-3.19.2.jar.sha1 | 1 +
solr/licenses/threetenbp-1.5.0.jar.sha1 | 1 -
solr/licenses/threetenbp-1.5.2.jar.sha1 | 1 +
solr/modules/gcs-repository/build.gradle | 38 ++++--------
versions.lock | 68 +++++++++++-----------
versions.props | 27 +--------
56 files changed, 72 insertions(+), 119 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7c561f6..02239e1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -577,6 +577,8 @@ and each individual module's jar will be included in its
directory's lib/ folder
* SOLR-15942: Upgrade Hadoop to 3.3.1 (Kevin Risden)
+* SOLR-15990: Use google-cloud-bom for gcs-repository dependencies (Kevin
Risden)
+
Bug Fixes
---------------------
* SOLR-15849: Fix the connection reset problem caused by the incorrect use of
4LW with \n when monitoring zooKeeper status (Fa Ming).
diff --git a/solr/licenses/api-common-1.10.1.jar.sha1
b/solr/licenses/api-common-1.10.1.jar.sha1
deleted file mode 100644
index 0466e8d..0000000
--- a/solr/licenses/api-common-1.10.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d157681b5909cf959a9fa60ced9bed9da741ffef
diff --git a/solr/licenses/api-common-2.1.2.jar.sha1
b/solr/licenses/api-common-2.1.2.jar.sha1
new file mode 100644
index 0000000..8f3d063
--- /dev/null
+++ b/solr/licenses/api-common-2.1.2.jar.sha1
@@ -0,0 +1 @@
+eff20f72b42843d48d01c19099d4a22e8da773fa
diff --git a/solr/licenses/auto-value-annotations-1.7.4.jar.sha1
b/solr/licenses/auto-value-annotations-1.7.4.jar.sha1
deleted file mode 100644
index 577960d..0000000
--- a/solr/licenses/auto-value-annotations-1.7.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-eff48ed53995db2dadf0456426cc1f8700136f86
diff --git a/solr/licenses/auto-value-annotations-1.9.jar.sha1
b/solr/licenses/auto-value-annotations-1.9.jar.sha1
new file mode 100644
index 0000000..8154b8d
--- /dev/null
+++ b/solr/licenses/auto-value-annotations-1.9.jar.sha1
@@ -0,0 +1 @@
+25a0fcef915f663679fcdb447541c5d86a9be4ba
diff --git a/solr/licenses/checker-compat-qual-2.5.5.jar.sha1
b/solr/licenses/checker-compat-qual-2.5.5.jar.sha1
deleted file mode 100644
index 7fecc23..0000000
--- a/solr/licenses/checker-compat-qual-2.5.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-435dc33e3019c9f019e15f01aa111de9d6b2b79c
diff --git a/solr/licenses/checker-compat-qual-LICENSE-MIT.txt
b/solr/licenses/checker-compat-qual-LICENSE-MIT.txt
deleted file mode 100644
index 1f95d26..0000000
--- a/solr/licenses/checker-compat-qual-LICENSE-MIT.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/solr/licenses/checker-qual-3.19.0.jar.sha1
b/solr/licenses/checker-qual-3.19.0.jar.sha1
deleted file mode 100644
index fb782ce..0000000
--- a/solr/licenses/checker-qual-3.19.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-838b42bb6f7f73315167b359d24649845cef1c48
diff --git a/solr/licenses/checker-qual-3.20.0.jar.sha1
b/solr/licenses/checker-qual-3.20.0.jar.sha1
new file mode 100644
index 0000000..8e4c60d
--- /dev/null
+++ b/solr/licenses/checker-qual-3.20.0.jar.sha1
@@ -0,0 +1 @@
+c13d84bf34ed1a652c44bf73fe8a97d4f1ce17ff
diff --git a/solr/licenses/gax-1.62.0.jar.sha1
b/solr/licenses/gax-1.62.0.jar.sha1
deleted file mode 100644
index b15e7e9..0000000
--- a/solr/licenses/gax-1.62.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-11e565f1a65f7e2245238ac5c19875c0ddd25b14
diff --git a/solr/licenses/gax-2.8.1.jar.sha1 b/solr/licenses/gax-2.8.1.jar.sha1
new file mode 100644
index 0000000..0e09b08
--- /dev/null
+++ b/solr/licenses/gax-2.8.1.jar.sha1
@@ -0,0 +1 @@
+c99dcb923675ae3e2fe8eb66f736e80f89c66231
diff --git a/solr/licenses/gax-httpjson-0.79.0.jar.sha1
b/solr/licenses/gax-httpjson-0.79.0.jar.sha1
deleted file mode 100644
index 4f444c1..0000000
--- a/solr/licenses/gax-httpjson-0.79.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-47c9ecbd4d1ea585a3992b9dcde99c9e08c26065
diff --git a/solr/licenses/gax-httpjson-0.93.1.jar.sha1
b/solr/licenses/gax-httpjson-0.93.1.jar.sha1
new file mode 100644
index 0000000..a15a261
--- /dev/null
+++ b/solr/licenses/gax-httpjson-0.93.1.jar.sha1
@@ -0,0 +1 @@
+a9e83876b48a4b2e3d0b6b98757ea82bfb425992
diff --git a/solr/licenses/google-api-client-1.32.1.jar.sha1
b/solr/licenses/google-api-client-1.32.1.jar.sha1
deleted file mode 100644
index 4c7f222..0000000
--- a/solr/licenses/google-api-client-1.32.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3e216f54e59e3c6f01bc52beeeed9010724e0edf
diff --git a/solr/licenses/google-api-client-1.33.0.jar.sha1
b/solr/licenses/google-api-client-1.33.0.jar.sha1
new file mode 100644
index 0000000..60f9167
--- /dev/null
+++ b/solr/licenses/google-api-client-1.33.0.jar.sha1
@@ -0,0 +1 @@
+fe86fc26f8c140a691460660d684a33f17212d21
diff --git
a/solr/licenses/google-api-services-storage-v1-rev20210127-1.31.0.jar.sha1
b/solr/licenses/google-api-services-storage-v1-rev20210127-1.31.0.jar.sha1
deleted file mode 100644
index 23c30f2..0000000
--- a/solr/licenses/google-api-services-storage-v1-rev20210127-1.31.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-749b9e46d7abe64cad182aced53e702098590502
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
new file mode 100644
index 0000000..9b1d5fa
--- /dev/null
+++ b/solr/licenses/google-api-services-storage-v1-rev20211201-1.32.1.jar.sha1
@@ -0,0 +1 @@
+b717bc251d713783dc31c59c0a637eda67de8415
diff --git a/solr/licenses/google-auth-library-credentials-0.24.1.jar.sha1
b/solr/licenses/google-auth-library-credentials-0.24.1.jar.sha1
deleted file mode 100644
index a2893e0..0000000
--- a/solr/licenses/google-auth-library-credentials-0.24.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5f43498fae558213e27cd904944626c88cf03d03
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
new file mode 100644
index 0000000..2873f1c
--- /dev/null
+++ b/solr/licenses/google-auth-library-credentials-1.3.0.jar.sha1
@@ -0,0 +1 @@
+8e085f0a36301395052d1adc26befd4bc0b80d3e
diff --git a/solr/licenses/google-auth-library-oauth2-http-0.24.1.jar.sha1
b/solr/licenses/google-auth-library-oauth2-http-0.24.1.jar.sha1
deleted file mode 100644
index 779d285..0000000
--- a/solr/licenses/google-auth-library-oauth2-http-0.24.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ce4ca632ff44eb9cb3033db590d4862a686db199
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
new file mode 100644
index 0000000..ea47a5f
--- /dev/null
+++ b/solr/licenses/google-auth-library-oauth2-http-1.3.0.jar.sha1
@@ -0,0 +1 @@
+fb9d88528fe8061230d3a7cb1f2d0ab2423976ae
diff --git a/solr/licenses/google-cloud-core-1.94.3.jar.sha1
b/solr/licenses/google-cloud-core-1.94.3.jar.sha1
deleted file mode 100644
index c62549f..0000000
--- a/solr/licenses/google-cloud-core-1.94.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8aaa752fe97bf66f942aa52ac32ca75820e12b48
diff --git a/solr/licenses/google-cloud-core-2.3.5.jar.sha1
b/solr/licenses/google-cloud-core-2.3.5.jar.sha1
new file mode 100644
index 0000000..983bc50
--- /dev/null
+++ b/solr/licenses/google-cloud-core-2.3.5.jar.sha1
@@ -0,0 +1 @@
+a3dfdc439c0660c42dad7355edc6fc0f2d2eca77
diff --git a/solr/licenses/google-cloud-core-http-1.94.3.jar.sha1
b/solr/licenses/google-cloud-core-http-1.94.3.jar.sha1
deleted file mode 100644
index 9ceb72d..0000000
--- a/solr/licenses/google-cloud-core-http-1.94.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-459b2628796447cbc095f5b217ace6fd50ac73f0
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
new file mode 100644
index 0000000..1274423
--- /dev/null
+++ b/solr/licenses/google-cloud-core-http-2.3.5.jar.sha1
@@ -0,0 +1 @@
+f4e707942bbf52b340ffcb031c474e80be8aebcb
diff --git a/solr/licenses/google-cloud-nio-0.122.11.jar.sha1
b/solr/licenses/google-cloud-nio-0.122.11.jar.sha1
deleted file mode 100644
index 49a7740..0000000
--- a/solr/licenses/google-cloud-nio-0.122.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-961672c602ced693ba81fc125a83b308482b83b7
diff --git a/solr/licenses/google-cloud-nio-0.123.18.jar.sha1
b/solr/licenses/google-cloud-nio-0.123.18.jar.sha1
new file mode 100644
index 0000000..00ab9e1
--- /dev/null
+++ b/solr/licenses/google-cloud-nio-0.123.18.jar.sha1
@@ -0,0 +1 @@
+f5d7e58a897c214390e523cccb9efb8cec195181
diff --git a/solr/licenses/google-cloud-storage-1.113.14.jar.sha1
b/solr/licenses/google-cloud-storage-1.113.14.jar.sha1
deleted file mode 100644
index edc7009..0000000
--- a/solr/licenses/google-cloud-storage-1.113.14.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3786b6b1cc161df9a3a4cc10ca68c59b3825df0a
diff --git a/solr/licenses/google-cloud-storage-2.2.3.jar.sha1
b/solr/licenses/google-cloud-storage-2.2.3.jar.sha1
new file mode 100644
index 0000000..499824b
--- /dev/null
+++ b/solr/licenses/google-cloud-storage-2.2.3.jar.sha1
@@ -0,0 +1 @@
+56c42b2e48cd05c989c602fe42f3c060140f2652
diff --git a/solr/licenses/google-http-client-1.39.2.jar.sha1
b/solr/licenses/google-http-client-1.39.2.jar.sha1
deleted file mode 100644
index e9dd87f..0000000
--- a/solr/licenses/google-http-client-1.39.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5aafc3ff51693febf4214bb2a21baf577ce2fb25
diff --git a/solr/licenses/google-http-client-1.41.0.jar.sha1
b/solr/licenses/google-http-client-1.41.0.jar.sha1
new file mode 100644
index 0000000..3d6ad1b
--- /dev/null
+++ b/solr/licenses/google-http-client-1.41.0.jar.sha1
@@ -0,0 +1 @@
+6334215e876a7bda17072910e16b150868a7018b
diff --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.sha1
deleted file mode 100644
index 79ec8c9..0000000
--- a/solr/licenses/google-http-client-apache-v2-1.39.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-aa58c06d8f5eb1db008771fb0473e5a36e41c45f
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
new file mode 100644
index 0000000..9be3cc0
--- /dev/null
+++ b/solr/licenses/google-http-client-apache-v2-1.41.0.jar.sha1
@@ -0,0 +1 @@
+0d3edd9b035d8407a359c3395a5a7f1b3d1e534e
diff --git a/solr/licenses/google-http-client-appengine-1.39.0.jar.sha1
b/solr/licenses/google-http-client-appengine-1.39.0.jar.sha1
deleted file mode 100644
index 1f3258c..0000000
--- a/solr/licenses/google-http-client-appengine-1.39.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2203e3c9eadeab6a65823420529fbd69c89ec7fd
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
new file mode 100644
index 0000000..5c49cba
--- /dev/null
+++ b/solr/licenses/google-http-client-appengine-1.41.0.jar.sha1
@@ -0,0 +1 @@
+9944400b0dfb804cb883bf8d989e1fb0232e9052
diff --git a/solr/licenses/google-http-client-gson-1.39.2.jar.sha1
b/solr/licenses/google-http-client-gson-1.39.2.jar.sha1
deleted file mode 100644
index fd7b764..0000000
--- a/solr/licenses/google-http-client-gson-1.39.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-43c1d0500c31ee31ff5918ac4bbe95711cd744a9
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
new file mode 100644
index 0000000..4afc7f4
--- /dev/null
+++ b/solr/licenses/google-http-client-gson-1.41.0.jar.sha1
@@ -0,0 +1 @@
+1a754a5dd672218a2ac667d7ff2b28df7a5a240e
diff --git a/solr/licenses/google-http-client-jackson2-1.39.0.jar.sha1
b/solr/licenses/google-http-client-jackson2-1.39.0.jar.sha1
deleted file mode 100644
index e6436aa..0000000
--- a/solr/licenses/google-http-client-jackson2-1.39.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-17aaeb0a8a76cf77b68cac1b8486580b552ab52c
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
new file mode 100644
index 0000000..94afadd
--- /dev/null
+++ b/solr/licenses/google-http-client-jackson2-1.41.0.jar.sha1
@@ -0,0 +1 @@
+768627d6e8e55b6ec499163b5e283e26d1b049b5
diff --git a/solr/licenses/grpc-context-1.36.0.jar.sha1
b/solr/licenses/grpc-context-1.36.0.jar.sha1
deleted file mode 100644
index d118245..0000000
--- a/solr/licenses/grpc-context-1.36.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8d8c6e0f00ae7889f4a435c4ec0c4ad4cb99578d
diff --git a/solr/licenses/grpc-context-1.43.2.jar.sha1
b/solr/licenses/grpc-context-1.43.2.jar.sha1
new file mode 100644
index 0000000..0e0243a
--- /dev/null
+++ b/solr/licenses/grpc-context-1.43.2.jar.sha1
@@ -0,0 +1 @@
+cc6fd89fb5adbae97e7724d4f4f7fbed71018163
diff --git a/solr/licenses/gson-2.8.6.jar.sha1
b/solr/licenses/gson-2.8.6.jar.sha1
deleted file mode 100644
index 65e588c..0000000
--- a/solr/licenses/gson-2.8.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9180733b7df8542621dc12e21e87557e8c99b8cb
diff --git a/solr/licenses/gson-2.8.9.jar.sha1
b/solr/licenses/gson-2.8.9.jar.sha1
new file mode 100644
index 0000000..71b8a78
--- /dev/null
+++ b/solr/licenses/gson-2.8.9.jar.sha1
@@ -0,0 +1 @@
+8a432c1d6825781e21a02db2e2c33c5fde2833b9
diff --git a/solr/licenses/proto-google-common-protos-2.1.0.jar.sha1
b/solr/licenses/proto-google-common-protos-2.1.0.jar.sha1
deleted file mode 100644
index 57cd9d0..0000000
--- a/solr/licenses/proto-google-common-protos-2.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-65234da8719aed4672298f574d7e87c1f025c4dc
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
new file mode 100644
index 0000000..daa185c
--- /dev/null
+++ b/solr/licenses/proto-google-common-protos-2.7.1.jar.sha1
@@ -0,0 +1 @@
+f0f101045d738992ec8a3956f0cce9ce49a76fe1
diff --git a/solr/licenses/proto-google-iam-v1-1.0.10.jar.sha1
b/solr/licenses/proto-google-iam-v1-1.0.10.jar.sha1
deleted file mode 100644
index 93e7486..0000000
--- a/solr/licenses/proto-google-iam-v1-1.0.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-08a117cbb14fd193d59ccc628ef664f1c1b280b2
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
new file mode 100644
index 0000000..30184da
--- /dev/null
+++ b/solr/licenses/proto-google-iam-v1-1.2.0.jar.sha1
@@ -0,0 +1 @@
+4ac276c6fc59c48ea916514bfcfaec66b8d607b4
diff --git a/solr/licenses/protobuf-java-3.15.5.jar.sha1
b/solr/licenses/protobuf-java-3.15.5.jar.sha1
deleted file mode 100644
index 7a24c67..0000000
--- a/solr/licenses/protobuf-java-3.15.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1fd3e24c16db19091da6aff562a4ef4cb98582fd
diff --git a/solr/licenses/protobuf-java-3.19.2.jar.sha1
b/solr/licenses/protobuf-java-3.19.2.jar.sha1
new file mode 100644
index 0000000..fac6616
--- /dev/null
+++ b/solr/licenses/protobuf-java-3.19.2.jar.sha1
@@ -0,0 +1 @@
+e958ce38f96b612d3819ff1c753d4d70609aea74
diff --git a/solr/licenses/protobuf-java-util-3.15.5.jar.sha1
b/solr/licenses/protobuf-java-util-3.15.5.jar.sha1
deleted file mode 100644
index 12d256f..0000000
--- a/solr/licenses/protobuf-java-util-3.15.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-95c6adc679af390e231d1d66b157f28a6478b644
diff --git a/solr/licenses/protobuf-java-util-3.19.2.jar.sha1
b/solr/licenses/protobuf-java-util-3.19.2.jar.sha1
new file mode 100644
index 0000000..8e55d7d
--- /dev/null
+++ b/solr/licenses/protobuf-java-util-3.19.2.jar.sha1
@@ -0,0 +1 @@
+fd73ae9d9f8121eca362d54279f73bb56219a594
diff --git a/solr/licenses/threetenbp-1.5.0.jar.sha1
b/solr/licenses/threetenbp-1.5.0.jar.sha1
deleted file mode 100644
index 147597a..0000000
--- a/solr/licenses/threetenbp-1.5.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e18c0fb79ebee3e3907042a7f31c31404f9e546b
diff --git a/solr/licenses/threetenbp-1.5.2.jar.sha1
b/solr/licenses/threetenbp-1.5.2.jar.sha1
new file mode 100644
index 0000000..c281470
--- /dev/null
+++ b/solr/licenses/threetenbp-1.5.2.jar.sha1
@@ -0,0 +1 @@
+9aec3509609fc41f29ddc46119a124b8659e2c25
diff --git a/solr/modules/gcs-repository/build.gradle
b/solr/modules/gcs-repository/build.gradle
index bede010..ea6eb93 100644
--- a/solr/modules/gcs-repository/build.gradle
+++ b/solr/modules/gcs-repository/build.gradle
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
apply plugin: 'java-library'
description = 'GCS Backup Repository'
@@ -27,36 +26,19 @@ dependencies {
implementation 'org.apache.lucene:lucene-core'
implementation 'org.slf4j:slf4j-api'
- implementation 'com.google.guava:guava'
- implementation ('com.google.api:api-common') { exclude group:
'com.google.guava', module: 'guava' }
- implementation ('com.google.api:gax') { exclude group: 'com.google.guava',
module: 'guava' }
- implementation ('com.google.api:gax-httpjson') { transitive = false }
- implementation ('com.google.cloud:google-cloud-core') { exclude group:
'com.google.guava', module: 'guava' }
- implementation ('com.google.cloud:google-cloud-core-http') { transitive =
false }
- implementation ('com.google.cloud:google-cloud-storage') { exclude group:
'com.google.guava', module: 'guava' }
- implementation ('com.google.auth:google-auth-library-oauth2-http') {
exclude group: 'com.google.guava', module: 'guava' }
- implementation ('com.google.auth:google-auth-library-credentials') {
transitive = false }
- implementation ('org.threeten:threetenbp') { transitive = false }
-
- implementation('com.google.apis:google-api-services-storage') { transitive
= false }
- implementation('com.google.api-client:google-api-client') { exclude group:
'com.google.guava', module: 'guava' }
- implementation('com.google.api.grpc:proto-google-common-protos') {
transitive = false }
- implementation('com.google.api.grpc:proto-google-iam-v1') { transitive =
false }
- implementation('com.google.code.gson:gson') { transitive = false }
- implementation('com.google.http-client:google-http-client') { exclude
group: 'com.google.guava', module: 'guava' }
- implementation('com.google.http-client:google-http-client-appengine') {
transitive = false }
- implementation('com.google.http-client:google-http-client-jackson2') {
transitive = false }
- implementation('com.google.j2objc:j2objc-annotations') { transitive =
false }
- implementation('com.google.oauth-client:google-oauth-client') { exclude
group: 'com.google.guava', module: 'guava' }
- implementation('com.google.protobuf:protobuf-java') { transitive = false }
- implementation('com.google.protobuf:protobuf-java-util') { exclude group:
'com.google.guava', module: 'guava' }
- implementation('io.grpc:grpc-context') { transitive = false }
- implementation('io.opencensus:opencensus-api') { transitive = false }
- implementation('io.opencensus:opencensus-contrib-http-util') { exclude
group: 'com.google.guava', module: 'guava' }
+ implementation platform(group: 'com.google.cloud', name:
'google-cloud-bom')
+ implementation 'com.google.api:gax'
+ implementation 'com.google.auth:google-auth-library-oauth2-http'
+ implementation 'com.google.cloud:google-cloud-core'
+ implementation 'com.google.cloud:google-cloud-core-http'
+ implementation 'com.google.cloud:google-cloud-storage'
+ implementation 'org.threeten:threetenbp'
testImplementation project(':solr:test-framework')
testImplementation 'org.apache.lucene:lucene-test-framework'
testImplementation
'com.carrotsearch.randomizedtesting:randomizedtesting-runner'
testImplementation 'junit:junit'
- testImplementation("com.google.cloud:google-cloud-nio") { exclude group:
'com.google.guava', module: 'guava' }
+
+ testImplementation 'com.google.guava:guava'
+ testImplementation 'com.google.cloud:google-cloud-nio'
}
diff --git a/versions.lock b/versions.lock
index 213695c..67eb367 100644
--- a/versions.lock
+++ b/versions.lock
@@ -8,7 +8,7 @@ com.epam:parso:2.0.11 (1 constraints: 36052c3b)
com.esri.geometry:esri-geometry-api:2.2.0 (2 constraints: 6112842b)
com.fasterxml.jackson:jackson-bom:2.13.1 (10 constraints: 93d98ca5)
com.fasterxml.jackson.core:jackson-annotations:2.13.1 (8 constraints: dc8721a4)
-com.fasterxml.jackson.core:jackson-core:2.13.1 (13 constraints: a4f0e055)
+com.fasterxml.jackson.core:jackson-core:2.13.1 (13 constraints: a3f08755)
com.fasterxml.jackson.core:jackson-databind:2.13.1 (16 constraints: f52bc0f6)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.13.1 (2
constraints: ef135482)
com.fasterxml.woodstox:woodstox-core:6.2.7 (2 constraints: 501caf9f)
@@ -16,33 +16,34 @@ com.github.ben-manes.caffeine:caffeine:3.0.5 (1
constraints: 0a05ff35)
com.github.spotbugs:spotbugs-annotations:4.5.3 (1 constraints: 0e051136)
com.github.virtuald:curvesapi:1.06 (1 constraints: db04f530)
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.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)
-com.google.auth:google-auth-library-credentials:0.24.1 (4 constraints:
dd371c7c)
-com.google.auth:google-auth-library-oauth2-http:0.24.1 (4 constraints:
b92cca11)
-com.google.auto.value:auto-value-annotations:1.7.4 (4 constraints: 443dc4e1)
-com.google.cloud:google-cloud-core:1.94.3 (3 constraints: da2307c0)
-com.google.cloud:google-cloud-core-http:1.94.3 (2 constraints: 651543d8)
-com.google.cloud:google-cloud-storage:1.113.14 (2 constraints: 10143aa3)
-com.google.code.gson:gson:2.8.6 (5 constraints: 1545748b)
-com.google.errorprone:error_prone_annotations:2.10.0 (5 constraints: 1c48098f)
+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 (5 constraints: 894cdfb5)
+com.google.errorprone:error_prone_annotations:2.10.0 (4 constraints: 3038d4ba)
com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
-com.google.guava:guava:31.0.1-jre (4 constraints: bd34f656)
+com.google.guava:guava:31.0.1-jre (17 constraints: 83186a84)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2
constraints: 4b35b0a0)
-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: f72e15b2)
-com.google.oauth-client:google-oauth-client:1.32.1 (3 constraints: ee252fa6)
-com.google.protobuf:protobuf-java:3.15.5 (7 constraints: 4869ba4c)
-com.google.protobuf:protobuf-java-util:3.15.5 (3 constraints: 2b248ae3)
+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.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.2 (7 constraints: 6770632d)
+com.google.protobuf:protobuf-java-util:3.19.2 (3 constraints: 422b4c2e)
com.google.re2j:re2j:1.2 (1 constraints: a7041c2c)
com.googlecode.juniversalchardet:juniversalchardet:1.0.3 (1 constraints:
0605f335)
com.googlecode.mp4parser:isoparser:1.1.22 (1 constraints: 38052d3b)
@@ -65,7 +66,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.36.0 (3 constraints: 5a22231e)
+io.grpc:grpc-context:1.43.2 (2 constraints: 1e1dd225)
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)
@@ -76,8 +77,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: 21426a37)
-io.opencensus:opencensus-contrib-http-util:0.28.0 (3 constraints: f7265f07)
+io.opencensus:opencensus-api:0.28.0 (5 constraints: ab4d6e9c)
+io.opencensus:opencensus-contrib-http-util:0.28.0 (3 constraints: 8132c2ff)
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)
@@ -114,7 +115,7 @@ org.apache.hadoop:hadoop-common:3.3.1 (1 constraints:
09050436)
org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 (1 constraints:
0505f435)
org.apache.htrace:htrace-core4:4.1.0-incubating (2 constraints: 581ec435)
org.apache.httpcomponents:httpclient:4.5.13 (8 constraints: 267ab694)
-org.apache.httpcomponents:httpcore:4.4.15 (7 constraints: 776d86c8)
+org.apache.httpcomponents:httpcore:4.4.15 (7 constraints: 7a6dddca)
org.apache.httpcomponents:httpmime:4.5.13 (1 constraints: 3f054e3b)
org.apache.james:apache-mime4j-core:0.8.3 (1 constraints: 0d050636)
org.apache.james:apache-mime4j-dom:0.8.3 (1 constraints: 0d050636)
@@ -184,8 +185,7 @@ org.carrot2:morfologik-fsa:2.1.5 (1 constraints: d70d9836)
org.carrot2:morfologik-polish:2.1.5 (1 constraints: cf12501e)
org.carrot2:morfologik-stemming:2.1.5 (2 constraints: d01f1300)
org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 0605f735)
-org.checkerframework:checker-compat-qual:2.5.5 (1 constraints: f00fed95)
-org.checkerframework:checker-qual:3.19.0 (5 constraints: 6e3b0591)
+org.checkerframework:checker-qual:3.20.0 (5 constraints: 514652ea)
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)
@@ -229,7 +229,7 @@ org.reactivestreams:reactive-streams:1.0.3 (3 constraints:
3c2b02fd)
org.slf4j:jcl-over-slf4j:1.7.35 (1 constraints: 42054a3b)
org.slf4j:slf4j-api:1.7.35 (25 constraints: 835620d6)
org.tallison:jmatio:1.5 (1 constraints: aa041f2c)
-org.threeten:threetenbp:1.5.0 (4 constraints: f82b9e86)
+org.threeten:threetenbp:1.5.2 (4 constraints: 0433f25e)
org.tukaani:xz:1.8 (1 constraints: ad04222c)
org.xerial.snappy:snappy-java:1.1.7.6 (1 constraints: 6f05a240)
software.amazon.awssdk:annotations:2.17.63 (17 constraints: e2ff18d3)
@@ -269,7 +269,7 @@
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.1 (3 constraints: 74
com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1 (2 constraints:
a31da85f)
com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.1 (2
constraints: 06248081)
com.github.stephenc.jcip:jcip-annotations:1.0-1 (2 constraints: c5188bde)
-com.google.cloud:google-cloud-nio:0.122.11 (1 constraints: 99053046)
+com.google.cloud:google-cloud-nio:0.123.18 (1 constraints: cc0e1c7b)
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 d34654e..0c4c06c 100644
--- a/versions.props
+++ b/versions.props
@@ -12,28 +12,9 @@ com.github.ben-manes.caffeine:caffeine=3.0.5
com.github.spotbugs:*=4.5.3
com.github.virtuald:curvesapi=1.06
com.github.zafarkhaja:java-semver=0.9.0
-com.google.api-client:google-api-client=1.32.1
-com.google.api.grpc:proto-google-common-protos=1.16.0
-com.google.api.grpc:proto-google-iam-v1=0.12.0
-com.google.api:api-common=1.8.1
-com.google.api:gax-httpjson=0.62.0
-com.google.api:gax=1.45.0
-com.google.apis:google-api-services-storage=v1-rev20190426-1.28.0
-com.google.auth:google-auth-library-credentials=0.15.0
-com.google.auth:google-auth-library-oauth2-http=0.15.0
-com.google.cloud:google-cloud-core-http=1.77.0
-com.google.cloud:google-cloud-core=1.77.0
-com.google.cloud:google-cloud-nio=0.122.11
-com.google.cloud:google-cloud-storage=1.77.0
-com.google.code.gson:gson=2.7
+com.google.cloud:google-cloud-bom=0.166.0
com.google.errorprone:*=2.10.0
com.google.guava:guava=31.0.1-jre
-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.1
-com.google.j2objc:j2objc-annotations=1.1
-com.google.oauth-client:google-oauth-client=1.32.1
-com.google.protobuf:protobuf-java*=3.11.0
com.google.re2j:re2j=1.2
com.googlecode.juniversalchardet:juniversalchardet=1.0.3
com.googlecode.mp4parser:isoparser=1.1.22
@@ -51,11 +32,8 @@ commons-collections:commons-collections=3.2.2
commons-io:commons-io=2.8.0
de.l3s.boilerpipe:boilerpipe=1.1.0
io.dropwizard.metrics:*=4.1.5
-io.grpc:grpc-context=1.19.0
io.jaegertracing:*=1.6.0
io.netty:*=4.1.68.Final
-io.opencensus:opencensus-api=0.21.0
-io.opencensus:opencensus-contrib-http-util=0.21.0
io.opentracing:*=0.33.0
io.prometheus:*=0.2.0
io.sgr:s2-geometry-library-java=1.0.0
@@ -104,8 +82,6 @@ org.brotli:dec=0.1.2
org.carrot2:carrot2-core=4.0.4
org.carrot2:morfologik-*=2.1.5
org.ccil.cowan.tagsoup:tagsoup=1.2.1
-org.checkerframework:checker-qual=3.10.0
-org.codehaus.janino:*=3.0.9
org.codehaus.woodstox:stax2-api=4.2.1
org.eclipse.jetty.http2:*=9.4.44.v20210927
org.eclipse.jetty:*=9.4.44.v20210927
@@ -122,7 +98,6 @@ org.ow2.asm:*=7.2
org.quicktheories:quicktheories=0.26
org.slf4j:*=1.7.35
org.tallison:jmatio=1.5
-org.threeten:threetenbp=1.3.3
org.tukaani:xz=1.8
org.xerial.snappy:snappy-java=1.1.7.6
software.amazon.awssdk:*=2.17.63
