This is an automated email from the ASF dual-hosted git repository. janhoy pushed a commit to branch branch_10x in repository https://gitbox.apache.org/repos/asf/solr.git
commit adc48bd75e6299798310eb730e6870f66673eebe Author: Solr Bot <[email protected]> AuthorDate: Sat Jan 3 00:20:38 2026 +0100 Update dependency org.testcontainers:testcontainers to v2 (#3795) (cherry picked from commit 25ce417dfca6fa1c2682500a77a8f9763d4eb9ff) --- .../PR#3795-update-org-testcontainers-testcontainers.yml | 7 +++++++ gradle/libs.versions.toml | 2 +- solr/licenses/docker-java-api-3.4.0.jar.sha1 | 1 - solr/licenses/docker-java-api-3.7.0.jar.sha1 | 1 + solr/licenses/docker-java-transport-3.4.0.jar.sha1 | 1 - solr/licenses/docker-java-transport-3.7.0.jar.sha1 | 1 + solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1 | 1 - solr/licenses/docker-java-transport-zerodep-3.7.0.jar.sha1 | 1 + solr/licenses/testcontainers-1.20.4.jar.sha1 | 1 - solr/licenses/testcontainers-2.0.3.jar.sha1 | 1 + solr/modules/extraction/gradle.lockfile | 8 ++++---- 11 files changed, 16 insertions(+), 9 deletions(-) diff --git a/changelog/unreleased/PR#3795-update-org-testcontainers-testcontainers.yml b/changelog/unreleased/PR#3795-update-org-testcontainers-testcontainers.yml new file mode 100644 index 00000000000..1ecfa0673b4 --- /dev/null +++ b/changelog/unreleased/PR#3795-update-org-testcontainers-testcontainers.yml @@ -0,0 +1,7 @@ +title: Update org.testcontainers:testcontainers to v2 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3795 + url: https://github.com/apache/solr/pull/3795 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4b6e3d7e00f..62fd6b86b32 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -200,7 +200,7 @@ squareup-okhttp3-okhttp = "4.12.0" stephenc-jcip = "1.0-1" swagger3 = "2.2.22" tdunning-tdigest = "3.3" -testcontainers = "1.20.4" +testcontainers = "2.0.3" thetaphi-forbiddenapis = "3.10" thisptr-jacksonjq = "0.0.13" threeten-bp = "1.6.8" diff --git a/solr/licenses/docker-java-api-3.4.0.jar.sha1 b/solr/licenses/docker-java-api-3.4.0.jar.sha1 deleted file mode 100644 index bf5ca0d6db4..00000000000 --- a/solr/licenses/docker-java-api-3.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9ef23dcc93693f15e69b64632be096c38e31bc44 diff --git a/solr/licenses/docker-java-api-3.7.0.jar.sha1 b/solr/licenses/docker-java-api-3.7.0.jar.sha1 new file mode 100644 index 00000000000..2a6ac52fd36 --- /dev/null +++ b/solr/licenses/docker-java-api-3.7.0.jar.sha1 @@ -0,0 +1 @@ +47d3e92a30fc1832197602cb1214b866024372cb diff --git a/solr/licenses/docker-java-transport-3.4.0.jar.sha1 b/solr/licenses/docker-java-transport-3.4.0.jar.sha1 deleted file mode 100644 index c1232d24a6b..00000000000 --- a/solr/licenses/docker-java-transport-3.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c058705684d782effc4b2edfdef1a87544ba4af8 diff --git a/solr/licenses/docker-java-transport-3.7.0.jar.sha1 b/solr/licenses/docker-java-transport-3.7.0.jar.sha1 new file mode 100644 index 00000000000..afe4f1c07cd --- /dev/null +++ b/solr/licenses/docker-java-transport-3.7.0.jar.sha1 @@ -0,0 +1 @@ +e68716970e65eb45c01c0207d15ff03bb32edf49 diff --git a/solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1 b/solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1 deleted file mode 100644 index b658f8f0810..00000000000 --- a/solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c4ce6d8695cfdb0027872f99cc20f8f679f8a969 diff --git a/solr/licenses/docker-java-transport-zerodep-3.7.0.jar.sha1 b/solr/licenses/docker-java-transport-zerodep-3.7.0.jar.sha1 new file mode 100644 index 00000000000..58dd424a477 --- /dev/null +++ b/solr/licenses/docker-java-transport-zerodep-3.7.0.jar.sha1 @@ -0,0 +1 @@ +55185d3af96befa953dcb0b89de3751f95999511 diff --git a/solr/licenses/testcontainers-1.20.4.jar.sha1 b/solr/licenses/testcontainers-1.20.4.jar.sha1 deleted file mode 100644 index 29746a98e88..00000000000 --- a/solr/licenses/testcontainers-1.20.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee2fe3afc9fa6cb2e6a43233998f3633f761692f diff --git a/solr/licenses/testcontainers-2.0.3.jar.sha1 b/solr/licenses/testcontainers-2.0.3.jar.sha1 new file mode 100644 index 00000000000..a72d50fe5f7 --- /dev/null +++ b/solr/licenses/testcontainers-2.0.3.jar.sha1 @@ -0,0 +1 @@ +457576cfd348a4c564569a7e9fc7a3b53f476454 diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index 420e9377973..357c2a87642 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -12,9 +12,9 @@ com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.20.1=j com.fasterxml.jackson:jackson-bom:2.20.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.2.2=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.7.0=jarValidation,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.7.0=jarValidation,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.7.0=jarValidation,testCompileClasspath,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor @@ -171,6 +171,6 @@ org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatf org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs org.slf4j:slf4j-api:2.0.17=compileClasspath,jarValidation,permitUsedUndeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.20.4=jarValidation,testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:2.0.3=jarValidation,testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath empty=apiHelper,apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,packaging,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,signatures
