apache · janhoy · Jul 1, 2026 · Jun 30, 2026 · Jun 30, 2026 · Jul 1, 2026
diff --git a/changelog/unreleased/PR#3122-update-adobe-testing-s3mock-major.yml b/changelog/unreleased/PR#3122-update-adobe-testing-s3mock-major.yml
@@ -0,0 +1,7 @@
+title: Update adobe.testing.s3mock (major)
+type: dependency_update
+authors:
+- name: solrbot
+links:
+- name: PR#3122
+  url: https://github.com/apache/solr/pull/3122
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 [versions]
-adobe-testing-s3mock = "3.12.0"
+adobe-testing-s3mock = "4.12.4"
 amazon-awssdk = "2.42.37"
 androidx-adaptive = "1.3.0-beta02"
 androidx-lifecycle = "2.10.0"

diff --git a/solr/licenses/HdrHistogram-2.2.2.jar.sha1 b/solr/licenses/HdrHistogram-2.2.2.jar.sha1
diff --git a/solr/licenses/LatencyUtils-2.0.3.jar.sha1 b/solr/licenses/LatencyUtils-2.0.3.jar.sha1
diff --git a/solr/licenses/angus-activation-2.0.3.jar.sha1 b/solr/licenses/angus-activation-2.0.3.jar.sha1
diff --git a/solr/licenses/aws-crt-0.45.1.jar.sha1 b/solr/licenses/aws-crt-0.45.1.jar.sha1
@@ -0,0 +1 @@
+8bc83c38dc07d6762aa35753c9c0f7f959b0e85c
diff --git a/solr/licenses/aws-crt-client-2.42.37.jar.sha1 b/solr/licenses/aws-crt-client-2.42.37.jar.sha1
@@ -0,0 +1 @@
+878585e8678fe4dfce4d0608be99fd0c9c25a240
diff --git a/solr/licenses/aws-java-sdk-core-1.12.779.jar.sha1 b/solr/licenses/aws-java-sdk-core-1.12.779.jar.sha1
diff --git a/solr/licenses/aws-java-sdk-core-1.12.794.jar.sha1 b/solr/licenses/aws-java-sdk-core-1.12.794.jar.sha1
@@ -0,0 +1 @@
+9c6cc73ccf8a043f83e41272c1d3dde61ace274c
diff --git a/solr/licenses/aws-java-sdk-kms-1.12.779.jar.sha1 b/solr/licenses/aws-java-sdk-kms-1.12.779.jar.sha1
diff --git a/solr/licenses/aws-java-sdk-kms-1.12.794.jar.sha1 b/solr/licenses/aws-java-sdk-kms-1.12.794.jar.sha1
@@ -0,0 +1 @@
+f62bca2da988f3b58e13b980f5d5af135f61b091
diff --git a/solr/licenses/aws-java-sdk-s3-1.12.779.jar.sha1 b/solr/licenses/aws-java-sdk-s3-1.12.779.jar.sha1
diff --git a/solr/licenses/aws-java-sdk-s3-1.12.794.jar.sha1 b/solr/licenses/aws-java-sdk-s3-1.12.794.jar.sha1
@@ -0,0 +1 @@
+a5b815e823ab29e5bac3dd4fc2340a275af61f2d
diff --git a/solr/licenses/istack-commons-runtime-4.1.2.jar.sha1 b/solr/licenses/istack-commons-runtime-4.1.2.jar.sha1
diff --git a/solr/licenses/jakarta.activation-api-2.1.4.jar.sha1 b/solr/licenses/jakarta.activation-api-2.1.4.jar.sha1
diff --git a/solr/licenses/jakarta.enterprise.cdi-api-4.0.1.jar.sha1 b/solr/licenses/jakarta.enterprise.cdi-api-4.0.1.jar.sha1
diff --git a/solr/licenses/jakarta.enterprise.lang-model-4.0.1.jar.sha1 b/solr/licenses/jakarta.enterprise.lang-model-4.0.1.jar.sha1
diff --git a/solr/licenses/jakarta.interceptor-api-2.1.0.jar.sha1 b/solr/licenses/jakarta.interceptor-api-2.1.0.jar.sha1
diff --git a/solr/licenses/jakarta.transaction-api-2.0.1.jar.sha1 b/solr/licenses/jakarta.transaction-api-2.0.1.jar.sha1
diff --git a/solr/licenses/jakarta.websocket-api-2.1.1.jar.sha1 b/solr/licenses/jakarta.websocket-api-2.1.1.jar.sha1
diff --git a/solr/licenses/jakarta.websocket-client-api-2.1.1.jar.sha1 b/solr/licenses/jakarta.websocket-client-api-2.1.1.jar.sha1
diff --git a/solr/licenses/jakarta.xml.bind-api-4.0.5.jar.sha1 b/solr/licenses/jakarta.xml.bind-api-4.0.5.jar.sha1
diff --git a/solr/licenses/jaxb-core-4.0.9.jar.sha1 b/solr/licenses/jaxb-core-4.0.9.jar.sha1
diff --git a/solr/licenses/jaxb-runtime-4.0.9.jar.sha1 b/solr/licenses/jaxb-runtime-4.0.9.jar.sha1
diff --git a/solr/licenses/jetty-ee10-annotations-12.0.12.jar.sha1 b/solr/licenses/jetty-ee10-annotations-12.0.12.jar.sha1
diff --git a/solr/licenses/jetty-ee10-plus-12.0.12.jar.sha1 b/solr/licenses/jetty-ee10-plus-12.0.12.jar.sha1
diff --git a/solr/licenses/jetty-ee10-websocket-jakarta-client-12.0.12.jar.sha1 b/solr/licenses/jetty-ee10-websocket-jakarta-client-12.0.12.jar.sha1
diff --git a/solr/licenses/jetty-ee10-websocket-jakarta-common-12.0.12.jar.sha1 b/solr/licenses/jetty-ee10-websocket-jakarta-common-12.0.12.jar.sha1
diff --git a/solr/licenses/jetty-ee10-websocket-jakarta-server-12.0.12.jar.sha1 b/solr/licenses/jetty-ee10-websocket-jakarta-server-12.0.12.jar.sha1
diff --git a/solr/licenses/jetty-ee10-websocket-jetty-server-12.0.12.jar.sha1 b/solr/licenses/jetty-ee10-websocket-jetty-server-12.0.12.jar.sha1
diff --git a/solr/licenses/jetty-ee10-websocket-servlet-12.0.12.jar.sha1 b/solr/licenses/jetty-ee10-websocket-servlet-12.0.12.jar.sha1
diff --git a/solr/licenses/jetty-websocket-core-client-12.0.12.jar.sha1 b/solr/licenses/jetty-websocket-core-client-12.0.12.jar.sha1
diff --git a/solr/licenses/jetty-websocket-core-common-12.0.12.jar.sha1 b/solr/licenses/jetty-websocket-core-common-12.0.12.jar.sha1
diff --git a/solr/licenses/jetty-websocket-core-server-12.0.12.jar.sha1 b/solr/licenses/jetty-websocket-core-server-12.0.12.jar.sha1
diff --git a/solr/licenses/jetty-websocket-jetty-api-12.0.12.jar.sha1 b/solr/licenses/jetty-websocket-jetty-api-12.0.12.jar.sha1
diff --git a/solr/licenses/jetty-websocket-jetty-common-12.0.12.jar.sha1 b/solr/licenses/jetty-websocket-jetty-common-12.0.12.jar.sha1
diff --git a/solr/licenses/jmespath-java-1.12.779.jar.sha1 b/solr/licenses/jmespath-java-1.12.779.jar.sha1
diff --git a/solr/licenses/jmespath-java-1.12.794.jar.sha1 b/solr/licenses/jmespath-java-1.12.794.jar.sha1
@@ -0,0 +1 @@
+3a3000c9e9ea0a372c438d7cf18d72faf037abed
diff --git a/solr/licenses/micrometer-commons-1.13.3.jar.sha1 b/solr/licenses/micrometer-commons-1.13.3.jar.sha1
diff --git a/solr/licenses/micrometer-commons-1.14.13.jar.sha1 b/solr/licenses/micrometer-commons-1.14.13.jar.sha1
@@ -0,0 +1 @@
+27570cdb63946dc2e95a0de5b75cd0bc9943a210
diff --git a/solr/licenses/micrometer-core-1.13.3.jar.sha1 b/solr/licenses/micrometer-core-1.13.3.jar.sha1
diff --git a/solr/licenses/micrometer-jakarta9-1.13.3.jar.sha1 b/solr/licenses/micrometer-jakarta9-1.13.3.jar.sha1
diff --git a/solr/licenses/micrometer-observation-1.13.3.jar.sha1 b/solr/licenses/micrometer-observation-1.13.3.jar.sha1
diff --git a/solr/licenses/micrometer-observation-1.14.13.jar.sha1 b/solr/licenses/micrometer-observation-1.14.13.jar.sha1
@@ -0,0 +1 @@
+b9414791188efbfd823886047d0e6c3d20b2cd8d
diff --git a/solr/licenses/s3mock-3.12.0.jar.sha1 b/solr/licenses/s3mock-3.12.0.jar.sha1
diff --git a/solr/licenses/s3mock-4.12.4.jar.sha1 b/solr/licenses/s3mock-4.12.4.jar.sha1
@@ -0,0 +1 @@
+92d7e1b5f8398b18d585ddae4ee2f5ef3bc53342
diff --git a/solr/licenses/s3mock-junit4-3.12.0.jar.sha1 b/solr/licenses/s3mock-junit4-3.12.0.jar.sha1
diff --git a/solr/licenses/s3mock-junit4-4.12.4.jar.sha1 b/solr/licenses/s3mock-junit4-4.12.4.jar.sha1
@@ -0,0 +1 @@
+7ccdf31e3db85f4228b6a076324573d452675800
diff --git a/solr/licenses/s3mock-testsupport-common-3.12.0.jar.sha1 b/solr/licenses/s3mock-testsupport-common-3.12.0.jar.sha1
diff --git a/solr/licenses/s3mock-testsupport-common-4.12.4.jar.sha1 b/solr/licenses/s3mock-testsupport-common-4.12.4.jar.sha1
@@ -0,0 +1 @@
+f96c0850fa5de07a15de2a9c6b9faae4db69e123
diff --git a/solr/licenses/snakeyaml-2.2.jar.sha1 b/solr/licenses/snakeyaml-2.2.jar.sha1
diff --git a/solr/licenses/snakeyaml-2.4.jar.sha1 b/solr/licenses/snakeyaml-2.4.jar.sha1
@@ -0,0 +1 @@
+e0666b825b796f85521f02360e77f4c92c5a7a07
diff --git a/solr/licenses/spring-aop-6.1.12.jar.sha1 b/solr/licenses/spring-aop-6.1.12.jar.sha1
diff --git a/solr/licenses/spring-aop-6.2.14.jar.sha1 b/solr/licenses/spring-aop-6.2.14.jar.sha1
@@ -0,0 +1 @@
+9928bf6218013fc04292bd2bb37a0099d7582e97
diff --git a/solr/licenses/spring-beans-6.1.12.jar.sha1 b/solr/licenses/spring-beans-6.1.12.jar.sha1
diff --git a/solr/licenses/spring-beans-6.2.14.jar.sha1 b/solr/licenses/spring-beans-6.2.14.jar.sha1
@@ -0,0 +1 @@
+7c3cc4477ba26f863848111a21e28886cadaccd9
diff --git a/solr/licenses/spring-boot-3.3.3.jar.sha1 b/solr/licenses/spring-boot-3.3.3.jar.sha1
diff --git a/solr/licenses/spring-boot-3.5.8.jar.sha1 b/solr/licenses/spring-boot-3.5.8.jar.sha1
@@ -0,0 +1 @@
+449b94d19de085ffb767c7e4b6e888e754a059b5
diff --git a/solr/licenses/spring-boot-autoconfigure-3.3.3.jar.sha1 b/solr/licenses/spring-boot-autoconfigure-3.3.3.jar.sha1
diff --git a/solr/licenses/spring-boot-autoconfigure-3.5.8.jar.sha1 b/solr/licenses/spring-boot-autoconfigure-3.5.8.jar.sha1
@@ -0,0 +1 @@
+313f6befb3e1e87b06703c087b6589ce15fd9ef7
diff --git a/solr/licenses/spring-boot-starter-3.3.3.jar.sha1 b/solr/licenses/spring-boot-starter-3.3.3.jar.sha1
diff --git a/solr/licenses/spring-boot-starter-3.5.8.jar.sha1 b/solr/licenses/spring-boot-starter-3.5.8.jar.sha1
@@ -0,0 +1 @@
+757ed1793f8c7d560cc837359f5816a1f495a087
diff --git a/solr/licenses/spring-boot-starter-actuator-3.3.3.jar.sha1 b/solr/licenses/spring-boot-starter-actuator-3.3.3.jar.sha1
diff --git a/solr/licenses/spring-boot-starter-jetty-3.3.3.jar.sha1 b/solr/licenses/spring-boot-starter-jetty-3.3.3.jar.sha1
diff --git a/solr/licenses/spring-boot-starter-json-3.3.3.jar.sha1 b/solr/licenses/spring-boot-starter-json-3.3.3.jar.sha1
diff --git a/solr/licenses/spring-boot-starter-json-3.5.8.jar.sha1 b/solr/licenses/spring-boot-starter-json-3.5.8.jar.sha1
@@ -0,0 +1 @@
+9ab24564f45685c64e90bbf228402fec824c157d
diff --git a/solr/licenses/spring-boot-starter-logging-3.3.3.jar.sha1 b/solr/licenses/spring-boot-starter-logging-3.3.3.jar.sha1
diff --git a/solr/licenses/spring-boot-starter-logging-3.5.8.jar.sha1 b/solr/licenses/spring-boot-starter-logging-3.5.8.jar.sha1
@@ -0,0 +1 @@
+86b7491d89ee273db4dfb6a162dd612be4710a6b
diff --git a/solr/licenses/spring-boot-starter-tomcat-3.5.8.jar.sha1 b/solr/licenses/spring-boot-starter-tomcat-3.5.8.jar.sha1
@@ -0,0 +1 @@
+91f0e20dc5ae0a5cc01153fedd0ed6375358fcfb
diff --git a/solr/licenses/spring-boot-starter-web-3.3.3.jar.sha1 b/solr/licenses/spring-boot-starter-web-3.3.3.jar.sha1
diff --git a/solr/licenses/spring-boot-starter-web-3.5.8.jar.sha1 b/solr/licenses/spring-boot-starter-web-3.5.8.jar.sha1
@@ -0,0 +1 @@
+f4afb8ae01d775b91dbfa365012be55789d3e0de
diff --git a/solr/licenses/spring-context-6.1.12.jar.sha1 b/solr/licenses/spring-context-6.1.12.jar.sha1
diff --git a/solr/licenses/spring-context-6.2.14.jar.sha1 b/solr/licenses/spring-context-6.2.14.jar.sha1
@@ -0,0 +1 @@
+68022d7abfd427ff31e95cac9b7c1832e92f43d8
diff --git a/solr/licenses/spring-core-6.1.12.jar.sha1 b/solr/licenses/spring-core-6.1.12.jar.sha1
diff --git a/solr/licenses/spring-core-6.2.14.jar.sha1 b/solr/licenses/spring-core-6.2.14.jar.sha1
@@ -0,0 +1 @@
+0f8096a2102dbd9b2e864e19276d36d79efb7f0f
diff --git a/solr/licenses/spring-expression-6.1.12.jar.sha1 b/solr/licenses/spring-expression-6.1.12.jar.sha1
diff --git a/solr/licenses/spring-expression-6.2.14.jar.sha1 b/solr/licenses/spring-expression-6.2.14.jar.sha1
@@ -0,0 +1 @@
+4da9a87ad43d4e95a542b0ee3ed53308c535d7da
diff --git a/solr/licenses/spring-jcl-6.1.12.jar.sha1 b/solr/licenses/spring-jcl-6.1.12.jar.sha1
diff --git a/solr/licenses/spring-jcl-6.2.14.jar.sha1 b/solr/licenses/spring-jcl-6.2.14.jar.sha1
@@ -0,0 +1 @@
+54e46d799759e21a4e32fdb5fe487c0330d4acb4
diff --git a/solr/licenses/spring-web-6.1.12.jar.sha1 b/solr/licenses/spring-web-6.1.12.jar.sha1
diff --git a/solr/licenses/spring-web-6.2.14.jar.sha1 b/solr/licenses/spring-web-6.2.14.jar.sha1
@@ -0,0 +1 @@
+e2d19ddcef801d93143b6337e62bfd53c1490fbf
diff --git a/solr/licenses/spring-webmvc-6.1.12.jar.sha1 b/solr/licenses/spring-webmvc-6.1.12.jar.sha1
diff --git a/solr/licenses/spring-webmvc-6.2.14.jar.sha1 b/solr/licenses/spring-webmvc-6.2.14.jar.sha1
@@ -0,0 +1 @@
+c3f0f0651a4ffe212cbf8389e043a7c20450859c
diff --git a/.../licenses/tomcat-embed-el-LICENSE-ASL.txt → solr/licenses/tomcat-LICENSE-ASL.txt b/.../licenses/tomcat-embed-el-LICENSE-ASL.txt → solr/licenses/tomcat-LICENSE-ASL.txt
diff --git a/solr/licenses/tomcat-embed-el-NOTICE.txt → solr/licenses/tomcat-NOTICE.txt b/solr/licenses/tomcat-embed-el-NOTICE.txt → solr/licenses/tomcat-NOTICE.txt
diff --git a/solr/licenses/tomcat-embed-core-10.1.49.jar.sha1 b/solr/licenses/tomcat-embed-core-10.1.49.jar.sha1
@@ -0,0 +1 @@
+e307b4b4e7ef975f5358c01ed014c80b830f39f9
diff --git a/solr/licenses/tomcat-embed-el-10.1.28.jar.sha1 b/solr/licenses/tomcat-embed-el-10.1.28.jar.sha1
diff --git a/solr/licenses/tomcat-embed-el-10.1.49.jar.sha1 b/solr/licenses/tomcat-embed-el-10.1.49.jar.sha1
@@ -0,0 +1 @@
+2258d147a49331d34e36ea96abc7664b263f399e
diff --git a/solr/licenses/tomcat-embed-websocket-10.1.49.jar.sha1 b/solr/licenses/tomcat-embed-websocket-10.1.49.jar.sha1
@@ -0,0 +1 @@
+9e89b260c504cb6c3be5e56707ef55869a684ed3
diff --git a/solr/licenses/txw2-4.0.9.jar.sha1 b/solr/licenses/txw2-4.0.9.jar.sha1
diff --git a/solr/modules/s3-repository/build.gradle b/solr/modules/s3-repository/build.gradle
@@ -19,6 +19,12 @@ apply plugin: 'java-library'
 
 description = 'S3 Repository'
 
+ext {
+  // S3Mock 4.x runs on embedded Tomcat, which is incompatible with the Java SecurityManager
+  // (Tomcat's PrivilegedSetAccessControlContext fails under an SM). Disable it for these tests.
+  useSecurityManager = false
+}
+
 dependencies {
   implementation platform(project(':platform'))
   api(project(':solr:core'))