Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions changelog/unreleased/PR#4094-update-aws-sdk-to-v2-42-34.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
title: Update AWS SDK to v2.42.34
type: dependency_update
authors:
- name: solrbot
links:
- name: PR#4094
url: https://github.com/apache/solr/pull/4094
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
[versions]
adobe-testing-s3mock = "3.12.0"
amazon-awssdk = "2.32.31"
amazon-awssdk = "2.42.34"
# @keep Antora version used in ref-guide
antora = "3.1.12"
# @keep Most recent commit as of 2025-08-03, this repo does not have tags
Expand Down
1 change: 0 additions & 1 deletion solr/licenses/annotations-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/annotations-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
382b7ab2c748d4bed8ed77e3a217dd198ab81645
1 change: 0 additions & 1 deletion solr/licenses/apache-client-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/apache-client-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
95ae945f68c49ae68250485a2f47d5a7e4b980ce
1 change: 0 additions & 1 deletion solr/licenses/arns-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/arns-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
093b5ace0d1b25a465db638f4ed4000a1019aec8
1 change: 0 additions & 1 deletion solr/licenses/auth-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/auth-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
51f8492ee90528d627d67f73e44e909cea96ae73
1 change: 0 additions & 1 deletion solr/licenses/aws-core-2.32.31.jar.sha1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
b215ea75cb3baf9b819f5bc0bce3a78ec7b7037e
d674662f2e4278c49779c8067ffbc174424ef91b
1 change: 0 additions & 1 deletion solr/licenses/aws-query-protocol-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/aws-query-protocol-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4dee216947dc853f89e88ee69f77b080bb5ed536
1 change: 0 additions & 1 deletion solr/licenses/aws-xml-protocol-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/aws-xml-protocol-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
370d32995c0b3eee9e8666087b0ea14aad716bad
1 change: 0 additions & 1 deletion solr/licenses/checksums-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/checksums-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9c37b0a59fd5a53aa31144499a8bb935f820b399
1 change: 0 additions & 1 deletion solr/licenses/checksums-spi-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/checksums-spi-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bae624134c01c2dc23d5a74f4736ce7a2a6a08cf
1 change: 0 additions & 1 deletion solr/licenses/crt-core-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/crt-core-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9cd810db75aa265cef797931d51c84108184e3a4
1 change: 0 additions & 1 deletion solr/licenses/endpoints-spi-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/endpoints-spi-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
97d5f53c29fe48f366e515cecc6472bf6e245be9
1 change: 0 additions & 1 deletion solr/licenses/http-auth-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/http-auth-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0ba9c736c823423677cbed2b3e9c73dbda52b1b7
1 change: 0 additions & 1 deletion solr/licenses/http-auth-aws-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/http-auth-aws-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b692455066584f6fd494039b37d3004472de4d6f
1 change: 0 additions & 1 deletion solr/licenses/http-auth-aws-eventstream-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/http-auth-aws-eventstream-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
075c67bc3ce9a2468d7929e6c0ea87c127eeb389
1 change: 0 additions & 1 deletion solr/licenses/http-auth-spi-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/http-auth-spi-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f09cf794eb406cfaf20a080d9836a560c1150f83
1 change: 0 additions & 1 deletion solr/licenses/http-client-spi-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/http-client-spi-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9fb520800c4a1d948d9be5bf3454af661938d67c
1 change: 0 additions & 1 deletion solr/licenses/identity-spi-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/identity-spi-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fbb287007255a41932d3855bf99817e4333b7488
1 change: 0 additions & 1 deletion solr/licenses/json-utils-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/json-utils-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5171a6ce037e5f12f9ffd251a120c7f119fae307
1 change: 0 additions & 1 deletion solr/licenses/metrics-spi-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/metrics-spi-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
470d41ca229b09542563aeca6fb0cd6f5ed72951
1 change: 1 addition & 0 deletions solr/licenses/profiles-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8c209a0830b3af903e563f62ba2ee41a4a4a3bc7
1 change: 0 additions & 1 deletion solr/licenses/protocol-core-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/protocol-core-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6d13b04e4ae0316146c6c1eac72ce99c0f80ce1a
1 change: 0 additions & 1 deletion solr/licenses/regions-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/regions-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ef9866412f40184210ece7b47b17a905e8890152
1 change: 0 additions & 1 deletion solr/licenses/retries-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/retries-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c99bed1ac17f7de3dfcab3c8afc4d6ef863e1f19
1 change: 0 additions & 1 deletion solr/licenses/retries-spi-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/retries-spi-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
da44135c6002bfe069f470fc5106a4cbcffe0c4b
1 change: 0 additions & 1 deletion solr/licenses/s3-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/s3-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9a6cc131e36184832c8244023db6fc562d116788
1 change: 0 additions & 1 deletion solr/licenses/sdk-core-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/sdk-core-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3a631d96ad8bf79a3f39c15e7fd4ecb8a88d6048
1 change: 0 additions & 1 deletion solr/licenses/sts-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/sts-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
305710cb83cf3a46d5e6c211991be7aadbb4312d
1 change: 0 additions & 1 deletion solr/licenses/third-party-jackson-core-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/third-party-jackson-core-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
899587999eaad8d9aa8416c82a2e6abd8b217bcc
1 change: 0 additions & 1 deletion solr/licenses/url-connection-client-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/url-connection-client-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2be42d0002963e24b9a76a60cf1c6d6ff5e375e7
1 change: 0 additions & 1 deletion solr/licenses/utils-2.32.31.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/utils-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fb2062b34a110edebd8c877c0c75d849333321aa
1 change: 1 addition & 0 deletions solr/licenses/utils-lite-2.42.34.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
afa81aecdd193cc52eb7a70a81ea67fcf61e96c3
63 changes: 32 additions & 31 deletions solr/modules/s3-repository/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -236,36 +236,37 @@ org.springframework:spring-web:6.1.12=jarValidation,testCompileClasspath,testRun
org.springframework:spring-webmvc:6.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath
org.xerial.snappy:snappy-java:1.1.10.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.yaml:snakeyaml:2.2=jarValidation,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:annotations:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:apache-client:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:arns:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:auth:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:aws-core:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:aws-query-protocol:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:aws-xml-protocol:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:bom:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:checksums-spi:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:checksums:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:crt-core:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:endpoints-spi:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth-aws-eventstream:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth-aws:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth-spi:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-client-spi:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:identity-spi:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:json-utils:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:metrics-spi:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:profiles:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:protocol-core:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:regions:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:retries-spi:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:retries:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:s3:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:sdk-core:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:sts:2.32.31=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
software.amazon.awssdk:third-party-jackson-core:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:url-connection-client:2.32.31=jarValidation,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:utils:2.32.31=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:annotations:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:apache-client:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:arns:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:auth:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:aws-core:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:aws-query-protocol:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:aws-xml-protocol:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:bom:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:checksums-spi:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:checksums:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:crt-core:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:endpoints-spi:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth-aws-eventstream:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth-aws:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth-spi:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-client-spi:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:identity-spi:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:json-utils:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:metrics-spi:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:profiles:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:protocol-core:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:regions:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:retries-spi:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:retries:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:s3:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:sdk-core:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:sts:2.42.34=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
software.amazon.awssdk:third-party-jackson-core:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:url-connection-client:2.42.34=jarValidation,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:utils-lite:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:utils:2.42.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.eventstream:eventstream:1.0.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
empty=apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,packaging,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,permitUsedUndeclared,signatures
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,13 @@ public boolean reject(Thread t) {
return true;
}

// AWS SDK v2 response input stream timeout scheduler (introduced in 2.32.32).
// The thread times out naturally after 60s but outlives short test suites.
// See https://github.com/aws/aws-sdk-java-v2/issues/6567
if (threadName.equals("response-input-stream-timeout-scheduler")) {
return true;
}

// TestContainers
if (threadName.startsWith("testcontainers-ryuk")
|| threadName.startsWith("testcontainers-wait-")
Expand Down
Loading