From 3f200a073aecd28fb17a3ceb16b59fb2f74b6ba1 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Fri, 1 May 2026 02:27:35 +0000 Subject: [PATCH 1/2] Update dependency com.adobe.testing:s3mock-junit4 to v4 (branch_9x) --- versions.lock | 132 +++++++++++++++++++++++-------------------------- versions.props | 2 +- 2 files changed, 63 insertions(+), 71 deletions(-) diff --git a/versions.lock b/versions.lock index 659611f7d41..4735bdc6472 100644 --- a/versions.lock +++ b/versions.lock @@ -4,17 +4,17 @@ 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.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) -com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.18.0 (2 constraints: ec19ff7a) -com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.0 (1 constraints: bb0eb266) -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.0 (6 constraints: e3582669) -com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.0 (2 constraints: ab241ae1) -com.fasterxml.jackson.module:jackson-module-scala_2.13:2.18.0 (2 constraints: ec19ff7a) -com.fasterxml.woodstox:woodstox-core:7.0.0 (1 constraints: 3b174526) +com.fasterxml.jackson:jackson-bom:2.19.4 (13 constraints: 6214b04b) +com.fasterxml.jackson.core:jackson-annotations:2.19.4 (13 constraints: 6b012d96) +com.fasterxml.jackson.core:jackson-core:2.19.4 (15 constraints: 1b37850c) +com.fasterxml.jackson.core:jackson-databind:2.19.4 (33 constraints: f94a3143) +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.19.4 (2 constraints: 6a1cdef1) +com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.19.4 (2 constraints: f119bf7b) +com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.19.4 (1 constraints: c00eb966) +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.19.4 (6 constraints: f2587471) +com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.19.4 (2 constraints: b02457e2) +com.fasterxml.jackson.module:jackson-module-scala_2.13:2.19.4 (2 constraints: f119bf7b) +com.fasterxml.woodstox:woodstox-core:7.1.1 (1 constraints: 3d174926) com.github.ben-manes.caffeine:caffeine:3.2.3 (2 constraints: 0d121317) com.github.luben:zstd-jni:1.5.6-4 (1 constraints: 600d6236) com.github.spotbugs:spotbugs-annotations:4.8.6 (1 constraints: 14051d36) @@ -70,7 +70,7 @@ com.squareup.okio:okio-jvm:3.15.0 (1 constraints: 800a50c4) com.squareup.retrofit2:converter-jackson:2.9.0 (4 constraints: ce36e7ea) com.squareup.retrofit2:retrofit:2.9.0 (5 constraints: 4a48510b) com.tdunning:t-digest:3.3 (1 constraints: aa04232c) -com.thoughtworks.paranamer:paranamer:2.8 (1 constraints: 7c15bdd4) +com.thoughtworks.paranamer:paranamer:2.8.3 (1 constraints: dd155300) com.typesafe.scala-logging:scala-logging_2.13:3.9.5 (1 constraints: 080b20e8) com.yammer.metrics:metrics-core:2.2.0 (7 constraints: 8760e867) com.zaxxer:SparseBitSet:1.3 (1 constraints: 0e081f75) @@ -163,7 +163,7 @@ io.prometheus:simpleclient_common:0.16.0 (1 constraints: 1a1139c0) io.prometheus:simpleclient_httpserver:0.16.0 (1 constraints: 3905353b) io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: b0107fb9) io.swagger.core.v3:swagger-annotations-jakarta:2.2.22 (1 constraints: 3a05373b) -jakarta.annotation:jakarta.annotation-api:2.1.1 (4 constraints: c94095a4) +jakarta.annotation:jakarta.annotation-api:2.1.1 (5 constraints: ad5604a4) 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) @@ -315,10 +315,10 @@ org.immutables:value-annotations:2.12.1 (1 constraints: 3805363b) org.javassist:javassist:3.30.2-GA (1 constraints: 2811fff0) org.jctools:jctools-core:4.0.6 (1 constraints: 0c050536) org.jetbrains:annotations:17.0.0 (2 constraints: 371c92e0) -org.jetbrains.kotlin:kotlin-stdlib:2.2.0 (7 constraints: db6ba2e1) +org.jetbrains.kotlin:kotlin-stdlib:2.2.21 (8 constraints: fe76507e) org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (2 constraints: f31f0a21) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (8 constraints: 5f7a37d5) -org.jspecify:jspecify:1.0.0 (3 constraints: b1233dfa) +org.jspecify:jspecify:1.0.0 (6 constraints: 1e4e536e) org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760) org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a) org.locationtech.proj4j:proj4j:1.2.2 (1 constraints: 5d0daf2c) @@ -335,17 +335,17 @@ org.pcollections:pcollections:4.0.1 (1 constraints: 530f2e7d) org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530) org.reactivestreams:reactive-streams:1.0.4 (4 constraints: 073bf033) org.rocksdb:rocksdbjni:7.9.2 (1 constraints: 120d091d) -org.scala-lang:scala-library:2.13.15 (6 constraints: cd67c5a6) +org.scala-lang:scala-library:2.13.16 (6 constraints: ce67c0a7) org.scala-lang:scala-reflect:2.13.15 (2 constraints: c11d80f4) org.scala-lang.modules:scala-collection-compat_2.13:2.10.0 (1 constraints: 2a0b2af3) 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:jul-to-slf4j:2.0.17 (2 constraints: ba1bb97e) org.slf4j:slf4j-api:2.0.17 (68 constraints: 6cd32dae) 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) +software.amazon.awssdk:annotations:2.42.37 (31 constraints: d2db0e8e) software.amazon.awssdk:apache-client:2.42.37 (4 constraints: 092a12e2) software.amazon.awssdk:arns:2.42.37 (2 constraints: 1f1828c1) software.amazon.awssdk:auth:2.42.37 (5 constraints: 4738643e) @@ -355,42 +355,42 @@ software.amazon.awssdk:aws-xml-protocol:2.42.37 (2 constraints: 1f1828c1) software.amazon.awssdk:bom:2.42.37 (1 constraints: 7405b840) software.amazon.awssdk:checksums:2.42.37 (4 constraints: 883656f4) software.amazon.awssdk:checksums-spi:2.42.37 (7 constraints: 6f622c0d) -software.amazon.awssdk:crt-core:2.42.37 (1 constraints: c40b9df9) +software.amazon.awssdk:crt-core:2.42.37 (2 constraints: 4e1c550f) software.amazon.awssdk:endpoints-spi:2.42.37 (5 constraints: 09414072) software.amazon.awssdk:http-auth:2.42.37 (5 constraints: a33ffc76) software.amazon.awssdk:http-auth-aws:2.42.37 (5 constraints: 9a3f655a) software.amazon.awssdk:http-auth-aws-eventstream:2.42.37 (2 constraints: 2b190fff) software.amazon.awssdk:http-auth-spi:2.42.37 (8 constraints: c86c0fd5) -software.amazon.awssdk:http-client-spi:2.42.37 (15 constraints: 68da0709) +software.amazon.awssdk:http-client-spi:2.42.37 (16 constraints: f2ea54c7) software.amazon.awssdk:identity-spi:2.42.37 (9 constraints: fd7c9bb9) software.amazon.awssdk:json-utils:2.42.37 (5 constraints: 793fae3c) -software.amazon.awssdk:metrics-spi:2.42.37 (7 constraints: 3662850f) +software.amazon.awssdk:metrics-spi:2.42.37 (8 constraints: c072c082) software.amazon.awssdk:profiles:2.42.37 (8 constraints: 5f617a41) software.amazon.awssdk:protocol-core:2.42.37 (5 constraints: 85483c58) -software.amazon.awssdk:regions:2.42.37 (7 constraints: 40501bad) +software.amazon.awssdk:regions:2.42.37 (7 constraints: 0150ba6d) software.amazon.awssdk:retries:2.42.37 (3 constraints: cf284227) software.amazon.awssdk:retries-spi:2.42.37 (7 constraints: 9754df98) -software.amazon.awssdk:s3:2.42.37 (4 constraints: e32f12c0) +software.amazon.awssdk:s3:2.42.37 (4 constraints: 652fa96c) software.amazon.awssdk:sdk-core:2.42.37 (10 constraints: 7e877bde) software.amazon.awssdk:sts:2.42.37 (2 constraints: cf110715) software.amazon.awssdk:third-party-jackson-core:2.42.37 (2 constraints: 911bdaa7) -software.amazon.awssdk:utils:2.42.37 (26 constraints: 2684ebff) +software.amazon.awssdk:utils:2.42.37 (27 constraints: 71940061) software.amazon.awssdk:utils-lite:2.42.37 (2 constraints: 9a1a0d72) software.amazon.eventstream:eventstream:1.0.1 (3 constraints: cd2e5385) ua.net.nlp:morfologik-ukrainian-search:4.9.1 (1 constraints: d5126e1e) [Test dependencies] -com.adobe.testing:s3mock:2.17.0 (1 constraints: b012901d) -com.adobe.testing:s3mock-junit4:2.17.0 (1 constraints: 3c05443b) -com.adobe.testing:s3mock-testsupport-common:2.17.0 (1 constraints: 7b0d9839) -com.amazonaws:aws-java-sdk-core:1.12.501 (2 constraints: b01a32b3) -com.amazonaws:aws-java-sdk-kms:1.12.501 (1 constraints: 060dbd37) -com.amazonaws:aws-java-sdk-s3:1.12.501 (1 constraints: 10136f43) -com.amazonaws:jmespath-java:1.12.501 (2 constraints: b01a32b3) -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.18.0 (2 constraints: ab195b13) -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.adobe.testing:s3mock:4.12.4 (1 constraints: b112911d) +com.adobe.testing:s3mock-junit4:4.12.4 (1 constraints: 3d05453b) +com.adobe.testing:s3mock-testsupport-common:4.12.4 (1 constraints: 7c0d9939) +com.amazonaws:aws-java-sdk-core:1.12.794 (2 constraints: cc1aa6b5) +com.amazonaws:aws-java-sdk-kms:1.12.794 (1 constraints: 140dd837) +com.amazonaws:aws-java-sdk-s3:1.12.794 (1 constraints: 1e138a43) +com.amazonaws:jmespath-java:1.12.794 (2 constraints: cc1aa6b5) +com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.19.4 (2 constraints: b5194a14) +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.4 (3 constraints: 0c2fe6b7) +com.fasterxml.jackson.module:jackson-module-kotlin:2.19.4 (2 constraints: af1d5061) +com.fasterxml.jackson.module:jackson-module-parameter-names:2.19.4 (2 constraints: 1724c083) 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) @@ -400,17 +400,13 @@ com.nimbusds:lang-tag:1.7 (1 constraints: dc0b6aeb) com.nimbusds:nimbus-jose-jwt:9.30.2 (1 constraints: 700c4b10) com.nimbusds:oauth2-oidc-sdk:10.10.1 (1 constraints: 190f9b80) com.squareup.okhttp3:mockwebserver:4.11.0 (1 constraints: ec0e9471) -com.sun.activation:jakarta.activation:1.2.2 (1 constraints: ba0dac35) -com.sun.istack:istack-commons-runtime:3.0.12 (1 constraints: eb0d9a43) io.github.microutils:kotlin-logging:3.0.5 (1 constraints: be0ea162) io.github.microutils:kotlin-logging-jvm:3.0.5 (1 constraints: 810f8b7c) -io.micrometer:micrometer-core:1.9.12 (1 constraints: fe162919) +io.micrometer:micrometer-commons:1.14.13 (1 constraints: 891098b4) +io.micrometer:micrometer-observation:1.14.13 (2 constraints: e81dc66b) io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b) -jakarta.servlet:jakarta.servlet-api:4.0.4 (1 constraints: 961568b9) -jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9) -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (1 constraints: bd0db535) javax.inject:javax.inject:1 (1 constraints: 7a0df617) -joda-time:joda-time:2.8.1 (1 constraints: 7a0dd431) +joda-time:joda-time:2.12.7 (1 constraints: ab0d6f3f) 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) @@ -426,7 +422,9 @@ org.apache.kerby:kerb-common:2.1.0 (3 constraints: d92524b2) org.apache.kerby:kerb-identity:2.1.0 (1 constraints: 600cbd02) org.apache.kerby:kerb-server:2.1.0 (1 constraints: d20b6cf2) org.apache.kerby:kerb-simplekdc:2.1.0 (1 constraints: df0d853e) -org.apache.tomcat.embed:tomcat-embed-el:9.0.76 (1 constraints: d41558cf) +org.apache.tomcat.embed:tomcat-embed-core:10.1.49 (2 constraints: f4290025) +org.apache.tomcat.embed:tomcat-embed-el:10.1.49 (1 constraints: 55163efd) +org.apache.tomcat.embed:tomcat-embed-websocket:10.1.49 (1 constraints: 55163efd) org.bouncycastle:bcpkix-jdk15on:1.70 (1 constraints: 900eeb53) org.bouncycastle:bcpkix-jdk18on:1.82 (1 constraints: df040131) org.bouncycastle:bcprov-jdk15on:1.70 (2 constraints: b11aac5a) @@ -434,36 +432,30 @@ org.bouncycastle:bcprov-jdk18on:1.82 (1 constraints: 600d6d29) org.bouncycastle:bcutil-jdk15on:1.70 (1 constraints: 580d0529) org.bouncycastle:bcutil-jdk18on:1.82 (1 constraints: 5e0d2a29) org.freemarker:freemarker:2.3.32 (1 constraints: f00e9371) -org.glassfish.jaxb:jaxb-runtime:2.3.8 (1 constraints: c30a41cb) -org.glassfish.jaxb:txw2:2.3.8 (1 constraints: c20dba35) -org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029) org.hsqldb:hsqldb:2.7.4 (1 constraints: 0f050e36) -org.jetbrains.kotlin:kotlin-reflect:1.8.22 (2 constraints: 6624c6e2) -org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0 (2 constraints: 0820970a) -org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b) +org.jetbrains.kotlin:kotlin-reflect:1.9.25 (2 constraints: 6d2405e4) +org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21 (2 constraints: 3b20d42a) org.mockito:mockito-core:5.23.0 (2 constraints: 3612e31b) org.mockito:mockito-subclass:5.23.0 (1 constraints: 3c054e3b) org.objenesis:objenesis:3.3 (1 constraints: b20a14bd) org.rnorth.duct-tape:duct-tape:1.0.8 (1 constraints: 3d0f5267) -org.springframework:spring-aop:5.3.28 (2 constraints: de1e8f9a) -org.springframework:spring-beans:5.3.28 (4 constraints: b03ac3c9) -org.springframework:spring-context:5.3.28 (2 constraints: 6f1fced2) -org.springframework:spring-core:5.3.28 (8 constraints: 0f7e33c8) -org.springframework:spring-expression:5.3.28 (2 constraints: de1e8f9a) -org.springframework:spring-jcl:5.3.28 (1 constraints: 540ea44f) -org.springframework:spring-web:5.3.28 (3 constraints: 6539c38e) -org.springframework:spring-webmvc:5.3.28 (1 constraints: de14709e) -org.springframework.boot:spring-boot:2.7.13 (4 constraints: 8f56c646) -org.springframework.boot:spring-boot-actuator:2.7.13 (1 constraints: 7419a3b8) -org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.13 (1 constraints: fe162819) -org.springframework.boot:spring-boot-autoconfigure:2.7.13 (2 constraints: e12ccb5d) -org.springframework.boot:spring-boot-starter:2.7.13 (3 constraints: 2a41eac5) -org.springframework.boot:spring-boot-starter-actuator:2.7.13 (2 constraints: 7018b7d0) -org.springframework.boot:spring-boot-starter-jetty:2.7.13 (1 constraints: f30a39d6) -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.springframework:spring-aop:6.2.14 (2 constraints: d41eb099) +org.springframework:spring-beans:6.2.14 (4 constraints: 9c3ac2c4) +org.springframework:spring-context:6.2.14 (2 constraints: 651fe0d1) +org.springframework:spring-core:6.2.14 (8 constraints: e77dafae) +org.springframework:spring-expression:6.2.14 (2 constraints: d41eb099) +org.springframework:spring-jcl:6.2.14 (1 constraints: 4f0ea04f) +org.springframework:spring-web:6.2.14 (3 constraints: 56394c8b) +org.springframework:spring-webmvc:6.2.14 (1 constraints: d9146c9e) +org.springframework.boot:spring-boot:3.5.8 (2 constraints: f728286d) +org.springframework.boot:spring-boot-autoconfigure:3.5.8 (1 constraints: 41132433) +org.springframework.boot:spring-boot-starter:3.5.8 (2 constraints: d32901e1) +org.springframework.boot:spring-boot-starter-json:3.5.8 (1 constraints: ac149489) +org.springframework.boot:spring-boot-starter-logging:3.5.8 (1 constraints: 41132433) +org.springframework.boot:spring-boot-starter-tomcat:3.5.8 (1 constraints: ac149489) +org.springframework.boot:spring-boot-starter-web:3.5.8 (1 constraints: c60a4ccb) org.testcontainers:testcontainers:1.20.4 (1 constraints: 3905313b) -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) +org.yaml:snakeyaml:2.4 (1 constraints: d912d60c) +software.amazon.awssdk:aws-crt-client:2.42.37 (2 constraints: 4717e074) +software.amazon.awssdk:url-connection-client:2.42.37 (2 constraints: 071ffdda) +software.amazon.awssdk.crt:aws-crt:0.45.1 (1 constraints: 531084b1) diff --git a/versions.props b/versions.props index 9696656c75e..ee6eadbbab6 100644 --- a/versions.props +++ b/versions.props @@ -2,7 +2,7 @@ # Please only add direct dependencies. Overrides of transitive versions should be called out in a comment. # The lines in this file needs to be lexicographically sorted. biz.aQute.bnd:biz.aQute.bnd.annotation=6.4.1 -com.adobe.testing:s3mock-junit4=2.17.0 +com.adobe.testing:s3mock-junit4=4.12.4 com.carrotsearch.randomizedtesting:*=2.8.4 com.carrotsearch:hppc=0.10.0 com.cybozu.labs:langdetect=1.1-20120112 From 596c8fd3483a533a68e58c82353d827d6101e98b Mon Sep 17 00:00:00 2001 From: SolrBot Date: Fri, 1 May 2026 02:27:56 +0000 Subject: [PATCH 2/2] Update changelog entry --- .../PR#4385-update-com-adobe-testing-s3mock-junit4.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4385-update-com-adobe-testing-s3mock-junit4.yml diff --git a/changelog/unreleased/PR#4385-update-com-adobe-testing-s3mock-junit4.yml b/changelog/unreleased/PR#4385-update-com-adobe-testing-s3mock-junit4.yml new file mode 100644 index 00000000000..080fb5810cf --- /dev/null +++ b/changelog/unreleased/PR#4385-update-com-adobe-testing-s3mock-junit4.yml @@ -0,0 +1,7 @@ +title: Update com.adobe.testing:s3mock-junit4 to v4 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4385 + url: https://github.com/apache/solr/pull/4385