diff --git a/changelog/unreleased/PR#4386-update-org-testcontainers-testcontainers.yml b/changelog/unreleased/PR#4386-update-org-testcontainers-testcontainers.yml new file mode 100644 index 000000000000..8b0917c6b743 --- /dev/null +++ b/changelog/unreleased/PR#4386-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#4386 + url: https://github.com/apache/solr/pull/4386 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 bf5ca0d6db4c..000000000000 --- 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.1.jar.sha1 b/solr/licenses/docker-java-api-3.7.1.jar.sha1 new file mode 100644 index 000000000000..f233e26829a3 --- /dev/null +++ b/solr/licenses/docker-java-api-3.7.1.jar.sha1 @@ -0,0 +1 @@ +2df91233a782749e85139991cc94d4ef40b59038 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 c1232d24a6be..000000000000 --- 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.1.jar.sha1 b/solr/licenses/docker-java-transport-3.7.1.jar.sha1 new file mode 100644 index 000000000000..42b06b963c50 --- /dev/null +++ b/solr/licenses/docker-java-transport-3.7.1.jar.sha1 @@ -0,0 +1 @@ +7b8f1b7486e83f2871d9f98a7e12c529dfddc9c2 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 b658f8f0810d..000000000000 --- 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.1.jar.sha1 b/solr/licenses/docker-java-transport-zerodep-3.7.1.jar.sha1 new file mode 100644 index 000000000000..b5652c098114 --- /dev/null +++ b/solr/licenses/docker-java-transport-zerodep-3.7.1.jar.sha1 @@ -0,0 +1 @@ +6b1af9996b2004703a41e0fbbf1031cabbbe4e6b diff --git a/solr/licenses/jackson-annotations-2.18.0.jar.sha1 b/solr/licenses/jackson-annotations-2.18.0.jar.sha1 deleted file mode 100644 index 2303a2b31609..000000000000 --- a/solr/licenses/jackson-annotations-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9bddcc56af9d90f902ef5dba7348102cd12b04e2 diff --git a/solr/licenses/jackson-annotations-2.20.jar.sha1 b/solr/licenses/jackson-annotations-2.20.jar.sha1 new file mode 100644 index 000000000000..e1372cb64fd4 --- /dev/null +++ b/solr/licenses/jackson-annotations-2.20.jar.sha1 @@ -0,0 +1 @@ +6a5e7291ea3f2b590a7ce400adb7b3aea4d7e12c 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 29746a98e881..000000000000 --- a/solr/licenses/testcontainers-1.20.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee2fe3afc9fa6cb2e6a43233998f3633f761692f diff --git a/solr/licenses/testcontainers-2.0.5.jar.sha1 b/solr/licenses/testcontainers-2.0.5.jar.sha1 new file mode 100644 index 000000000000..a0f25a928a7c --- /dev/null +++ b/solr/licenses/testcontainers-2.0.5.jar.sha1 @@ -0,0 +1 @@ +7e5013c78fd678ba8958db23c6883274019f2f2f diff --git a/versions.lock b/versions.lock index 659611f7d411..01353e650985 100644 --- a/versions.lock +++ b/versions.lock @@ -4,8 +4,8 @@ biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1 (1 constraints: 0d051636) com.carrotsearch:hppc:0.10.0 (2 constraints: d40fecb0) com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4 (2 constraints: d21594e2) com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e) -com.fasterxml.jackson:jackson-bom:2.18.0 (13 constraints: 2614e9f5) -com.fasterxml.jackson.core:jackson-annotations:2.18.0 (13 constraints: 4301624c) +com.fasterxml.jackson:jackson-bom:2.18.0 (12 constraints: 2500f8a0) +com.fasterxml.jackson.core:jackson-annotations:2.20 (13 constraints: e300bf84) com.fasterxml.jackson.core:jackson-core:2.18.0 (15 constraints: e436f89c) com.fasterxml.jackson.core:jackson-databind:2.18.0 (34 constraints: ec643f77) com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.0 (2 constraints: 641ca1f1) @@ -167,7 +167,7 @@ jakarta.annotation:jakarta.annotation-api:2.1.1 (4 constraints: c94095a4) jakarta.inject:jakarta.inject-api:2.0.1 (5 constraints: 1d49b79e) jakarta.validation:jakarta.validation-api:3.0.2 (1 constraints: fe10bbc3) jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 (6 constraints: 7365f954) -junit:junit:4.13.2 (8 constraints: 807c2182) +junit:junit:4.13.2 (7 constraints: 136d2cb8) net.arnx:jsonic:1.2.7 (1 constraints: d00b47eb) net.sf.jopt-simple:jopt-simple:5.0.4 (3 constraints: 132590bf) net.sourceforge.argparse4j:argparse4j:0.7.0 (1 constraints: fe0a06e8) @@ -178,7 +178,7 @@ org.apache.calcite:calcite-linq4j:1.37.0 (2 constraints: cf12444c) org.apache.calcite.avatica:avatica-core:1.25.0 (3 constraints: 0121ddcc) org.apache.calcite.avatica:avatica-metrics:1.25.0 (1 constraints: 9b104fc4) org.apache.commons:commons-collections4:4.5.0 (3 constraints: 471880cc) -org.apache.commons:commons-compress:1.28.0 (3 constraints: a51f96f4) +org.apache.commons:commons-compress:1.28.0 (3 constraints: a91fa2f4) org.apache.commons:commons-configuration2:2.14.0 (1 constraints: 39053b3b) org.apache.commons:commons-exec:1.6.0 (1 constraints: 09050236) org.apache.commons:commons-lang3:3.20.0 (5 constraints: 3a422d95) @@ -342,7 +342,7 @@ org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 (1 constraints: fa0af8e7) org.semver4j:semver4j:5.8.0 (1 constraints: 0f051c36) org.slf4j:jcl-over-slf4j:2.0.17 (1 constraints: 3c05323b) org.slf4j:jul-to-slf4j:2.0.17 (2 constraints: c11bd27e) -org.slf4j:slf4j-api:2.0.17 (68 constraints: 6cd32dae) +org.slf4j:slf4j-api:2.0.17 (68 constraints: 6ed3c2c3) org.threeten:threetenbp:1.6.9 (4 constraints: 2833ea68) org.xerial.snappy:snappy-java:1.1.10.8 (5 constraints: c146fa38) software.amazon.awssdk:annotations:2.42.37 (30 constraints: 48cb1be0) @@ -391,9 +391,9 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.18.0 (2 constraints: a com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.0 (4 constraints: 6e48dd35) com.fasterxml.jackson.module:jackson-module-kotlin:2.18.0 (2 constraints: aa1d6d60) com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.0 (2 constraints: 0d248182) -com.github.docker-java:docker-java-api:3.4.0 (1 constraints: 3b0f6067) -com.github.docker-java:docker-java-transport:3.4.0 (1 constraints: c51513cb) -com.github.docker-java:docker-java-transport-zerodep:3.4.0 (1 constraints: 3b0f6067) +com.github.docker-java:docker-java-api:3.7.1 (1 constraints: 3f0f6a67) +com.github.docker-java:docker-java-transport:3.7.1 (1 constraints: c9151dcb) +com.github.docker-java:docker-java-transport-zerodep:3.7.1 (1 constraints: 3f0f6a67) com.google.cloud:google-cloud-nio:0.127.20 (1 constraints: c90e267b) com.nimbusds:content-type:2.2 (1 constraints: d80b68eb) com.nimbusds:lang-tag:1.7 (1 constraints: dc0b6aeb) @@ -413,7 +413,7 @@ javax.inject:javax.inject:1 (1 constraints: 7a0df617) joda-time:joda-time:2.8.1 (1 constraints: 7a0dd431) net.bytebuddy:byte-buddy:1.17.7 (2 constraints: 8b1044cc) net.bytebuddy:byte-buddy-agent:1.17.7 (1 constraints: 4205453b) -net.java.dev.jna:jna:5.18.1 (2 constraints: 371b0b62) +net.java.dev.jna:jna:5.18.1 (2 constraints: 3d1b1b62) net.minidev:accessors-smart:2.4.9 (1 constraints: 500a92b8) net.minidev:json-smart:2.4.10 (1 constraints: 400e9a7c) no.nav.security:mock-oauth2-server:0.5.10 (1 constraints: 3805333b) @@ -463,7 +463,7 @@ org.springframework.boot:spring-boot-starter-jetty:2.7.13 (1 constraints: f30a39 org.springframework.boot:spring-boot-starter-json:2.7.13 (1 constraints: d914679e) org.springframework.boot:spring-boot-starter-logging:2.7.13 (1 constraints: 6e138c46) org.springframework.boot:spring-boot-starter-web:2.7.13 (1 constraints: f30a39d6) -org.testcontainers:testcontainers:1.20.4 (1 constraints: 3905313b) +org.testcontainers:testcontainers:2.0.5 (1 constraints: 0905fa35) org.yaml:snakeyaml:1.30 (1 constraints: 0713d91f) software.amazon.awssdk:url-connection-client:2.42.37 (2 constraints: 461f04f7) software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831) diff --git a/versions.props b/versions.props index 9696656c75ea..320f289a69b2 100644 --- a/versions.props +++ b/versions.props @@ -83,6 +83,6 @@ org.osgi:osgi.annotation=8.1.0 org.quicktheories:quicktheories=0.26 org.semver4j:semver4j=5.8.0 org.slf4j:*=2.0.17 -org.testcontainers:testcontainers*=1.20.4 +org.testcontainers:testcontainers*=2.0.5 org.xerial.snappy:snappy-java=1.1.10.8 software.amazon.awssdk:*=2.42.37