diff --git a/build.gradle b/build.gradle index 1ed79c9095c..4175422e2e0 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ import java.time.format.DateTimeFormatter plugins { id 'base' - id 'com.palantir.consistent-versions' version '2.16.0' + id 'com.palantir.consistent-versions' version '2.32.0' id 'org.owasp.dependencycheck' version '12.1.3' id 'ca.cutterslade.analyze' version '1.10.0' id 'de.thetaphi.forbiddenapis' version '3.9' apply false diff --git a/solr/licenses/aopalliance-repackaged-3.0.6.jar.sha1 b/solr/licenses/aopalliance-repackaged-3.0.6.jar.sha1 new file mode 100644 index 00000000000..c7bbeed782b --- /dev/null +++ b/solr/licenses/aopalliance-repackaged-3.0.6.jar.sha1 @@ -0,0 +1 @@ +e3c3f17b649c97155640616026bd32b1043b3c1d diff --git a/solr/licenses/aopalliance-repackaged-3.1.1.jar.sha1 b/solr/licenses/aopalliance-repackaged-3.1.1.jar.sha1 deleted file mode 100644 index 9c73a4a5a50..00000000000 --- a/solr/licenses/aopalliance-repackaged-3.1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -271bbab4cb1e3e5c556acf2580f75cb184818c1f diff --git a/solr/licenses/hk2-api-3.0.6.jar.sha1 b/solr/licenses/hk2-api-3.0.6.jar.sha1 new file mode 100644 index 00000000000..69892ef5805 --- /dev/null +++ b/solr/licenses/hk2-api-3.0.6.jar.sha1 @@ -0,0 +1 @@ +5a5152dea2c43384f5c07985eb27140134074ecb diff --git a/solr/licenses/hk2-api-3.1.1.jar.sha1 b/solr/licenses/hk2-api-3.1.1.jar.sha1 deleted file mode 100644 index 88c7e86b976..00000000000 --- a/solr/licenses/hk2-api-3.1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -18d114e0da203809052f5f000803f2db6c9e9cf5 diff --git a/solr/licenses/hk2-locator-3.0.6.jar.sha1 b/solr/licenses/hk2-locator-3.0.6.jar.sha1 new file mode 100644 index 00000000000..a250b3b5ef6 --- /dev/null +++ b/solr/licenses/hk2-locator-3.0.6.jar.sha1 @@ -0,0 +1 @@ +92d5c92c9f23bea4b8681c6f8d6ba3d708619f81 diff --git a/solr/licenses/hk2-locator-3.1.1.jar.sha1 b/solr/licenses/hk2-locator-3.1.1.jar.sha1 deleted file mode 100644 index 877f8041a96..00000000000 --- a/solr/licenses/hk2-locator-3.1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -620df6f26ca3c67984907d9531a2d3f9f831ba08 diff --git a/solr/licenses/hk2-utils-3.0.6.jar.sha1 b/solr/licenses/hk2-utils-3.0.6.jar.sha1 new file mode 100644 index 00000000000..ed4974965d6 --- /dev/null +++ b/solr/licenses/hk2-utils-3.0.6.jar.sha1 @@ -0,0 +1 @@ +b3187d0673c0fd52de197e52c62545c34d4eda29 diff --git a/solr/licenses/hk2-utils-3.1.1.jar.sha1 b/solr/licenses/hk2-utils-3.1.1.jar.sha1 deleted file mode 100644 index 2f421cd17b8..00000000000 --- a/solr/licenses/hk2-utils-3.1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d7f6959b2a724d479d8b1420c4aa03751eb4447f diff --git a/versions.lock b/versions.lock index 01a44605c90..1325016ddfc 100644 --- a/versions.lock +++ b/versions.lock @@ -1,4 +1,4 @@ -# Run ./gradlew --write-locks to regenerate this file +# Run ./gradlew writeVersionsLocks to regenerate this file biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1 (1 constraints: 0d051636) com.adobe.xmp:xmpcore:6.1.10 (1 constraints: fd0d5947) com.beust:jcommander:1.82 (2 constraints: 2b123714) @@ -350,11 +350,11 @@ org.eclipse.jetty.http2:http2-server:10.0.24 (1 constraints: 69059240) org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 (4 constraints: 883053bf) org.gagravarr:vorbis-java-core:0.8 (1 constraints: 010c57e9) org.gagravarr:vorbis-java-tika:0.8 (1 constraints: 010c57e9) -org.glassfish.hk2:hk2-api:3.1.1 (2 constraints: 70114901) -org.glassfish.hk2:hk2-locator:3.1.1 (1 constraints: 4410d8ad) -org.glassfish.hk2:hk2-utils:3.1.1 (2 constraints: 19178676) +org.glassfish.hk2:hk2-api:3.0.6 (1 constraints: 6e0c5a0c) +org.glassfish.hk2:hk2-locator:3.0.6 (1 constraints: 4410d8ad) +org.glassfish.hk2:hk2-utils:3.0.6 (2 constraints: 21172277) org.glassfish.hk2:osgi-resource-locator:1.0.3 (1 constraints: ef10e7c2) -org.glassfish.hk2.external:aopalliance-repackaged:3.1.1 (2 constraints: 19178676) +org.glassfish.hk2.external:aopalliance-repackaged:3.0.6 (2 constraints: 21172277) org.glassfish.jaxb:jaxb-runtime:2.3.8 (2 constraints: 23175d5b) org.glassfish.jaxb:txw2:2.3.8 (1 constraints: c20dba35) org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1 (1 constraints: 4105533b) diff --git a/versions.props b/versions.props index 55ac9addbbd..a53b92e6b70 100644 --- a/versions.props +++ b/versions.props @@ -26,10 +26,12 @@ dev.langchain4j:langchain4j-*=0.35.0 io.dropwizard.metrics:*=4.2.26 io.grpc:grpc-*=1.65.1 io.jaegertracing:*=1.8.1 -io.netty:*=4.2.4.Final +io.netty:netty* = 4.2.4.Final +io.netty:netty-tcnative* = 2.0.72.Final io.opentelemetry:opentelemetry-bom=1.40.0 io.opentracing:*=0.33.0 -io.prometheus:*=0.16.0 +io.prometheus:* = 0.16.0 +io.prometheus:prometheus-metrics* = 1.1.0 io.swagger.core.v3:*=2.2.22 jakarta.ws.rs:jakarta.ws.rs-api=3.1.0 junit:junit=4.13.2 @@ -63,8 +65,8 @@ org.carrot2:carrot2-core=4.5.1 org.codehaus.woodstox:stax2-api=4.2.2 org.eclipse.jetty*:*=10.0.24 org.eclipse.jetty.toolchain:jetty-servlet-api=4.0.6 -org.glassfish.hk2*:*=3.1.1 org.glassfish.hk2.external:jakarta.inject=2.6.1 +org.glassfish.hk2:osgi*=3.1.1 org.glassfish.jersey*:*=3.1.9 org.glassfish.jersey.containers:jersey-container-jetty-http=2.39.1 org.hamcrest:*=3.0