Merge branch 'refs/heads/main' into renovate/org.glassfish.jersey

# Conflicts: # versions.lock
apache · Jul 18, 2024 · c500a3f · c500a3f
2 parents 41a4179 + fcf84ee
commit c500a3f
Show file tree

Hide file tree

Showing 102 changed files with 147 additions and 138 deletions.
diff --git a/gradle/testing/randomization/policies/solr-tests.policy b/gradle/testing/randomization/policies/solr-tests.policy
@@ -146,6 +146,7 @@ grant {
 
   // Needed by JWT integration tests & S3 tests
   permission java.lang.RuntimePermission "setFactory";
+  permission java.security.SecurityPermission "getProperty.org.bouncycastle.pkcs12.default";
 
   permission javax.xml.bind.JAXBPermission "setDatatypeConverter";
 

diff --git a/solr/licenses/api-common-2.16.0.jar.sha1 b/solr/licenses/api-common-2.16.0.jar.sha1
diff --git a/solr/licenses/api-common-2.33.0.jar.sha1 b/solr/licenses/api-common-2.33.0.jar.sha1
@@ -0,0 +1 @@
+346c93a59fd450ae2239de57b40cd13c4086854e
diff --git a/solr/licenses/auto-value-annotations-1.10.2.jar.sha1 b/solr/licenses/auto-value-annotations-1.10.2.jar.sha1
diff --git a/solr/licenses/auto-value-annotations-1.10.4.jar.sha1 b/solr/licenses/auto-value-annotations-1.10.4.jar.sha1
@@ -0,0 +1 @@
+9679de8286eb0a151db6538ba297a8951c4a1224
diff --git a/solr/licenses/avatica-core-1.23.0.jar.sha1 b/solr/licenses/avatica-core-1.23.0.jar.sha1
diff --git a/solr/licenses/avatica-core-1.25.0.jar.sha1 b/solr/licenses/avatica-core-1.25.0.jar.sha1
@@ -0,0 +1 @@
+73b9a0e7032a5ae89f294091bc6cbb9a67a21101
diff --git a/solr/licenses/avatica-metrics-1.23.0.jar.sha1 b/solr/licenses/avatica-metrics-1.23.0.jar.sha1
diff --git a/solr/licenses/avatica-metrics-1.25.0.jar.sha1 b/solr/licenses/avatica-metrics-1.25.0.jar.sha1
@@ -0,0 +1 @@
+152f846d9f30a3e026530c2087ecd65c39bb304b
diff --git a/solr/licenses/bcpkix-jdk18on-1.77.jar.sha1 b/solr/licenses/bcpkix-jdk18on-1.77.jar.sha1
diff --git a/solr/licenses/bcpkix-jdk18on-1.78.1.jar.sha1 b/solr/licenses/bcpkix-jdk18on-1.78.1.jar.sha1
@@ -0,0 +1 @@
+17b3541f736df97465f87d9f5b5dfa4991b37bb3
diff --git a/solr/licenses/bcprov-jdk18on-1.77.jar.sha1 b/solr/licenses/bcprov-jdk18on-1.77.jar.sha1
diff --git a/solr/licenses/bcprov-jdk18on-1.78.1.jar.sha1 b/solr/licenses/bcprov-jdk18on-1.78.1.jar.sha1
@@ -0,0 +1 @@
+39e9e45359e20998eb79c1828751f94a818d25f8
diff --git a/solr/licenses/bcutil-jdk18on-1.77.jar.sha1 b/solr/licenses/bcutil-jdk18on-1.77.jar.sha1
diff --git a/solr/licenses/bcutil-jdk18on-1.78.1.jar.sha1 b/solr/licenses/bcutil-jdk18on-1.78.1.jar.sha1
@@ -0,0 +1 @@
+5353ca39fe2f148dab9ca1d637a43d0750456254
diff --git a/solr/licenses/calcite-core-1.35.0.jar.sha1 b/solr/licenses/calcite-core-1.35.0.jar.sha1
diff --git a/solr/licenses/calcite-core-1.37.0.jar.sha1 b/solr/licenses/calcite-core-1.37.0.jar.sha1
@@ -0,0 +1 @@
+537a3281dfefbd7939d27785732a2aafddd3abcb
diff --git a/solr/licenses/calcite-linq4j-1.35.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.35.0.jar.sha1
diff --git a/solr/licenses/calcite-linq4j-1.37.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.37.0.jar.sha1
@@ -0,0 +1 @@
+92446d8dfc8e57289e6120a7efc6932650ed3410
diff --git a/solr/licenses/checker-qual-3.37.0.jar.sha1 b/solr/licenses/checker-qual-3.37.0.jar.sha1
diff --git a/solr/licenses/checker-qual-3.44.0.jar.sha1 b/solr/licenses/checker-qual-3.44.0.jar.sha1
@@ -0,0 +1 @@
+e026b198319ea9dd3f221fab367d2099215079e5
diff --git a/solr/licenses/commons-compiler-3.1.11.jar.sha1 b/solr/licenses/commons-compiler-3.1.11.jar.sha1
@@ -0,0 +1 @@
+19d5bfd402f91de0e670ef5783bf5c0a3f5ab478
diff --git a/solr/licenses/commons-compiler-3.1.9.jar.sha1 b/solr/licenses/commons-compiler-3.1.9.jar.sha1
diff --git a/solr/licenses/error_prone_annotations-2.23.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.23.0.jar.sha1
diff --git a/solr/licenses/error_prone_annotations-2.28.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.28.0.jar.sha1
@@ -0,0 +1 @@
+59fc00087ce372de42e394d2c789295dff2d19f0
diff --git a/solr/licenses/failureaccess-1.0.1.jar.sha1 b/solr/licenses/failureaccess-1.0.1.jar.sha1
diff --git a/solr/licenses/failureaccess-1.0.2.jar.sha1 b/solr/licenses/failureaccess-1.0.2.jar.sha1
@@ -0,0 +1 @@
+c4a06a64e650562f30b7bf9aaec1bfed43aca12b
diff --git a/solr/licenses/gapic-google-cloud-storage-v2-2.27.0-alpha.jar.sha1 b/solr/licenses/gapic-google-cloud-storage-v2-2.27.0-alpha.jar.sha1
diff --git a/solr/licenses/gapic-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 b/solr/licenses/gapic-google-cloud-storage-v2-2.40.1-alpha.jar.sha1
@@ -0,0 +1 @@
+c0cde24ebb3db3fd6a062717a1818981d34a8591
diff --git a/solr/licenses/gax-2.33.0.jar.sha1 b/solr/licenses/gax-2.33.0.jar.sha1
diff --git a/solr/licenses/gax-2.50.0.jar.sha1 b/solr/licenses/gax-2.50.0.jar.sha1
@@ -0,0 +1 @@
+dd83734255063fc7bc3f7137db999ca2e23ad525
diff --git a/solr/licenses/gax-grpc-2.33.0.jar.sha1 b/solr/licenses/gax-grpc-2.33.0.jar.sha1
diff --git a/solr/licenses/gax-grpc-2.50.0.jar.sha1 b/solr/licenses/gax-grpc-2.50.0.jar.sha1
@@ -0,0 +1 @@
+526b493917d951b82ebb34d0a7cc79ff07264b0e
diff --git a/solr/licenses/gax-httpjson-2.33.0.jar.sha1 b/solr/licenses/gax-httpjson-2.33.0.jar.sha1
diff --git a/solr/licenses/gax-httpjson-2.50.0.jar.sha1 b/solr/licenses/gax-httpjson-2.50.0.jar.sha1
@@ -0,0 +1 @@
+8c0a42ce6b3363b2a569b0cadd9a9d5859841f3d
diff --git a/solr/licenses/google-api-client-2.2.0.jar.sha1 b/solr/licenses/google-api-client-2.2.0.jar.sha1
diff --git a/solr/licenses/google-api-client-2.6.0.jar.sha1 b/solr/licenses/google-api-client-2.6.0.jar.sha1
@@ -0,0 +1 @@
+b602d71e2491bbb66cfcd27a21db6ffea3764cdd
diff --git a/solr/licenses/google-api-services-storage-v1-rev20230907-2.0.0.jar.sha1 b/solr/licenses/google-api-services-storage-v1-rev20230907-2.0.0.jar.sha1
diff --git a/solr/licenses/google-api-services-storage-v1-rev20240621-2.0.0.jar.sha1 b/solr/licenses/google-api-services-storage-v1-rev20240621-2.0.0.jar.sha1
@@ -0,0 +1 @@
+260d4c88612b1fe65e7332550a023dced06943f4
diff --git a/solr/licenses/google-auth-library-credentials-1.19.0.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.19.0.jar.sha1
diff --git a/solr/licenses/google-auth-library-credentials-1.23.0.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.23.0.jar.sha1
@@ -0,0 +1 @@
+a50ee3611922a0eea9d421c6ddb1db031972a7dc
diff --git a/solr/licenses/google-auth-library-oauth2-http-1.19.0.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.19.0.jar.sha1
diff --git a/solr/licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1
@@ -0,0 +1 @@
+f9ebd75a55b8e2cfa62e1f66d04a62b46a2f3b70
diff --git a/solr/licenses/google-cloud-core-2.23.0.jar.sha1 b/solr/licenses/google-cloud-core-2.23.0.jar.sha1
diff --git a/solr/licenses/google-cloud-core-2.40.0.jar.sha1 b/solr/licenses/google-cloud-core-2.40.0.jar.sha1
@@ -0,0 +1 @@
+035214007270128474de01a84c6795df0083b4bc
diff --git a/solr/licenses/google-cloud-core-grpc-2.23.0.jar.sha1 b/solr/licenses/google-cloud-core-grpc-2.23.0.jar.sha1
diff --git a/solr/licenses/google-cloud-core-grpc-2.40.0.jar.sha1 b/solr/licenses/google-cloud-core-grpc-2.40.0.jar.sha1
@@ -0,0 +1 @@
+29cf12a64d738cc67d729342246a72e40c27a137
diff --git a/solr/licenses/google-cloud-core-http-2.23.0.jar.sha1 b/solr/licenses/google-cloud-core-http-2.23.0.jar.sha1
diff --git a/solr/licenses/google-cloud-core-http-2.40.0.jar.sha1 b/solr/licenses/google-cloud-core-http-2.40.0.jar.sha1
@@ -0,0 +1 @@
+a7d82b9e9499c6d8d7cee9583f44f3d540a69f31
diff --git a/solr/licenses/google-cloud-nio-0.127.20.jar.sha1 b/solr/licenses/google-cloud-nio-0.127.20.jar.sha1
@@ -0,0 +1 @@
+997a712f567451a548951bd887953d26aa90a1fe
diff --git a/solr/licenses/google-cloud-nio-0.127.3.jar.sha1 b/solr/licenses/google-cloud-nio-0.127.3.jar.sha1
diff --git a/solr/licenses/google-cloud-storage-2.27.0.jar.sha1 b/solr/licenses/google-cloud-storage-2.27.0.jar.sha1
diff --git a/solr/licenses/google-cloud-storage-2.40.1.jar.sha1 b/solr/licenses/google-cloud-storage-2.40.1.jar.sha1
@@ -0,0 +1 @@
+33e67ce2dc4e91edb85a8bdd9ea154735aa4a88f
diff --git a/solr/licenses/google-http-client-1.43.3.jar.sha1 b/solr/licenses/google-http-client-1.43.3.jar.sha1
diff --git a/solr/licenses/google-http-client-1.44.2.jar.sha1 b/solr/licenses/google-http-client-1.44.2.jar.sha1
@@ -0,0 +1 @@
+12f55ba06332c2b6f5456091b0786e1d7b8987e9
diff --git a/solr/licenses/google-http-client-apache-v2-1.43.3.jar.sha1 b/solr/licenses/google-http-client-apache-v2-1.43.3.jar.sha1
diff --git a/solr/licenses/google-http-client-apache-v2-1.44.2.jar.sha1 b/solr/licenses/google-http-client-apache-v2-1.44.2.jar.sha1
@@ -0,0 +1 @@
+ed3a506172c1cbf7ee514fc103f539979891f7b0
diff --git a/solr/licenses/google-http-client-appengine-1.43.3.jar.sha1 b/solr/licenses/google-http-client-appengine-1.43.3.jar.sha1
diff --git a/solr/licenses/google-http-client-appengine-1.44.2.jar.sha1 b/solr/licenses/google-http-client-appengine-1.44.2.jar.sha1
@@ -0,0 +1 @@
+890b842ea0de630308c459bbe1185532cf486d62
diff --git a/solr/licenses/google-http-client-gson-1.43.3.jar.sha1 b/solr/licenses/google-http-client-gson-1.43.3.jar.sha1
diff --git a/solr/licenses/google-http-client-gson-1.44.2.jar.sha1 b/solr/licenses/google-http-client-gson-1.44.2.jar.sha1
@@ -0,0 +1 @@
+6851401b3eda8b74658a159e10165f39fb9678fa
diff --git a/solr/licenses/google-http-client-jackson2-1.43.3.jar.sha1 b/solr/licenses/google-http-client-jackson2-1.43.3.jar.sha1
diff --git a/solr/licenses/google-http-client-jackson2-1.44.2.jar.sha1 b/solr/licenses/google-http-client-jackson2-1.44.2.jar.sha1
@@ -0,0 +1 @@
+3046eb6db11805ba7f90ad5bb6be31877468a7cf
diff --git a/solr/licenses/google-oauth-client-1.34.1.jar.sha1 b/solr/licenses/google-oauth-client-1.34.1.jar.sha1
diff --git a/solr/licenses/google-oauth-client-1.36.0.jar.sha1 b/solr/licenses/google-oauth-client-1.36.0.jar.sha1
@@ -0,0 +1 @@
+dc3f07bc8f49dd52fe8fcc15958f3cfeb003e20f
diff --git a/solr/licenses/grpc-google-cloud-storage-v2-2.27.0-alpha.jar.sha1 b/solr/licenses/grpc-google-cloud-storage-v2-2.27.0-alpha.jar.sha1
diff --git a/solr/licenses/grpc-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 b/solr/licenses/grpc-google-cloud-storage-v2-2.40.1-alpha.jar.sha1
@@ -0,0 +1 @@
+7f281914b3ec9e0039531eb1f193f1099d74b45c
diff --git a/solr/licenses/grpc-inprocess-1.65.1.jar.sha1 b/solr/licenses/grpc-inprocess-1.65.1.jar.sha1
@@ -0,0 +1 @@
+3409a0dfbe0b47d9f3131b58cbf4024144425ef1
diff --git a/solr/licenses/gson-2.10.1.jar.sha1 b/solr/licenses/gson-2.10.1.jar.sha1
diff --git a/solr/licenses/gson-2.11.0.jar.sha1 b/solr/licenses/gson-2.11.0.jar.sha1
@@ -0,0 +1 @@
+527175ca6d81050b53bdd4c457a6d6e017626b0e
diff --git a/solr/licenses/guava-32.1.3-jre.jar.sha1 b/solr/licenses/guava-32.1.3-jre.jar.sha1
diff --git a/solr/licenses/guava-33.1.0-jre.jar.sha1 b/solr/licenses/guava-33.1.0-jre.jar.sha1
@@ -0,0 +1 @@
+9b7ed39143d59e8eabcc6f91ffe4d23db2efe558
diff --git a/solr/licenses/hadoop-shaded-guava-1.1.1.jar.sha1 b/solr/licenses/hadoop-shaded-guava-1.1.1.jar.sha1
diff --git a/solr/licenses/hadoop-shaded-guava-1.2.0.jar.sha1 b/solr/licenses/hadoop-shaded-guava-1.2.0.jar.sha1
@@ -0,0 +1 @@
+a0a6e7aa87c838ea418fc36ed290987dd90f5f6c
diff --git a/solr/licenses/httpclient5-5.1.3.jar.sha1 b/solr/licenses/httpclient5-5.1.3.jar.sha1
diff --git a/solr/licenses/httpclient5-5.2.1.jar.sha1 b/solr/licenses/httpclient5-5.2.1.jar.sha1
@@ -0,0 +1 @@
+0c900514d3446d9ce5d9dbd90c21192048125440
diff --git a/solr/licenses/httpcore5-5.1.3.jar.sha1 b/solr/licenses/httpcore5-5.1.3.jar.sha1
diff --git a/solr/licenses/httpcore5-5.2.3.jar.sha1 b/solr/licenses/httpcore5-5.2.3.jar.sha1
@@ -0,0 +1 @@
+687cede1a44f70c7741abfab6ee2aa53dd2bfb54
diff --git a/solr/licenses/httpcore5-h2-5.1.3.jar.sha1 b/solr/licenses/httpcore5-h2-5.1.3.jar.sha1
diff --git a/solr/licenses/httpcore5-h2-5.2.jar.sha1 b/solr/licenses/httpcore5-h2-5.2.jar.sha1
@@ -0,0 +1 @@
+698bd8c759ccc7fd7398f3179ff45d0e5a7ccc16
diff --git a/solr/licenses/j2objc-annotations-2.8.jar.sha1 b/solr/licenses/j2objc-annotations-2.8.jar.sha1
diff --git a/solr/licenses/j2objc-annotations-3.0.0.jar.sha1 b/solr/licenses/j2objc-annotations-3.0.0.jar.sha1
@@ -0,0 +1 @@
+7399e65dd7e9ff3404f4535b2f017093bdb134c7
diff --git a/solr/licenses/janino-3.1.11.jar.sha1 b/solr/licenses/janino-3.1.11.jar.sha1
@@ -0,0 +1 @@
+878a02f3ab98d37206c9852c025a46b86dc882d0
diff --git a/solr/licenses/janino-3.1.9.jar.sha1 b/solr/licenses/janino-3.1.9.jar.sha1
diff --git a/solr/licenses/perfmark-api-0.26.0.jar.sha1 b/solr/licenses/perfmark-api-0.26.0.jar.sha1
diff --git a/solr/licenses/perfmark-api-0.27.0.jar.sha1 b/solr/licenses/perfmark-api-0.27.0.jar.sha1
@@ -0,0 +1 @@
+f86f575a41b091786a4b027cd9c0c1d2e3fc1c01
diff --git a/solr/licenses/proto-google-cloud-storage-v2-2.27.0-alpha.jar.sha1 b/solr/licenses/proto-google-cloud-storage-v2-2.27.0-alpha.jar.sha1
diff --git a/solr/licenses/proto-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 b/solr/licenses/proto-google-cloud-storage-v2-2.40.1-alpha.jar.sha1
@@ -0,0 +1 @@
+0b99831c99943417c29ba27b72ddb99d215c880c
diff --git a/solr/licenses/proto-google-common-protos-2.29.0.jar.sha1 b/solr/licenses/proto-google-common-protos-2.29.0.jar.sha1
diff --git a/solr/licenses/proto-google-common-protos-2.41.0.jar.sha1 b/solr/licenses/proto-google-common-protos-2.41.0.jar.sha1
@@ -0,0 +1 @@
+13dfa68e2a2693660c0aa91928733f9296e12456
diff --git a/solr/licenses/proto-google-iam-v1-1.19.0.jar.sha1 b/solr/licenses/proto-google-iam-v1-1.19.0.jar.sha1
diff --git a/solr/licenses/proto-google-iam-v1-1.36.0.jar.sha1 b/solr/licenses/proto-google-iam-v1-1.36.0.jar.sha1
@@ -0,0 +1 @@
+af2c8bdad5a6ea0c1ba9aebff08d675fdee26476
diff --git a/solr/licenses/protobuf-java-3.25.1.jar.sha1 b/solr/licenses/protobuf-java-3.25.1.jar.sha1
diff --git a/solr/licenses/protobuf-java-3.25.3.jar.sha1 b/solr/licenses/protobuf-java-3.25.3.jar.sha1
@@ -0,0 +1 @@
+d3200261955f3298e0d85c9892201e70492ce8eb
diff --git a/solr/licenses/protobuf-java-util-3.23.2.jar.sha1 b/solr/licenses/protobuf-java-util-3.23.2.jar.sha1
diff --git a/solr/licenses/protobuf-java-util-3.25.3.jar.sha1 b/solr/licenses/protobuf-java-util-3.25.3.jar.sha1
@@ -0,0 +1 @@
+c2284abc8c484d64ee5cb79bf61d5b7a819f6d50
diff --git a/solr/licenses/threetenbp-1.6.8.jar.sha1 b/solr/licenses/threetenbp-1.6.8.jar.sha1
diff --git a/solr/licenses/threetenbp-1.6.9.jar.sha1 b/solr/licenses/threetenbp-1.6.9.jar.sha1
@@ -0,0 +1 @@
+39c822e33f202e7c25b54172d8235d484b4966fc
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
@@ -152,6 +152,11 @@ public synchronized Page<Blob> list(String bucket, BlobListOption... options) {
     return delegate.list(bucket, options);
   }
 
+  @Override
+  public synchronized Blob restore(BlobId blob, BlobRestoreOption... options) {
+    return delegate.restore(blob, options);
+  }
+
   @Override
   public synchronized Bucket update(BucketInfo bucketInfo, BucketTargetOption... options) {
     return delegate.update(bucketInfo, options);

diff --git a/solr/server/etc/security.policy b/solr/server/etc/security.policy
@@ -147,6 +147,7 @@ grant {
 
   // Needed by JWT integration tests & S3 clients
   permission java.lang.RuntimePermission "setFactory";
+  permission java.security.SecurityPermission "getProperty.org.bouncycastle.pkcs12.default";
 
   permission javax.xml.bind.JAXBPermission "setDatatypeConverter";