From 6caff99baea5f0651412108dff7c2acc005c5224 Mon Sep 17 00:00:00 2001 From: Christos Malliaridis Date: Fri, 8 Nov 2024 18:48:05 +0100 Subject: [PATCH] Sync versions with current main --- gradle/libs.versions.toml | 4 +++- gradle/validation/dependencies.gradle | 5 +++++ solr/licenses/hamcrest-core-3.0.jar.sha1 | 1 - solr/licenses/proto-google-common-protos-2.41.0.jar.sha1 | 1 + solr/licenses/proto-google-common-protos-2.42.0.jar.sha1 | 1 - 5 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 solr/licenses/hamcrest-core-3.0.jar.sha1 create mode 100644 solr/licenses/proto-google-common-protos-2.41.0.jar.sha1 delete mode 100644 solr/licenses/proto-google-common-protos-2.42.0.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ba552368b4f..e4c0e79ca24 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -86,7 +86,7 @@ fasterxml-woodstox = "7.0.0" flexmark = "0.64.8" google-api-gax = "2.33.0" # @keep for version alignment -google-api-grpc-proto = "2.42.0" +google-api-grpc-proto = "2.41.0" google-auth = "1.19.0" # @keep for version alignment google-autovalue = "1.10.4" @@ -376,6 +376,8 @@ grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" } grpc-util = { module = "io.grpc:grpc-util", version.ref = "grpc" } hamcrest-hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" } hk2-api = { module = "org.glassfish.hk2:hk2-api", version.ref = "hk2" } +# @keep transitive dependency for version alignment +hk2-locator = { module = "org.glassfish.hk2:hk2-locator", version.ref = "hk2" } hsqldb-hsqldb = { module = "org.hsqldb:hsqldb", version.ref = "hsqldb" } ibm-icu-icu4j = { module = "com.ibm.icu:icu4j", version.ref = "ibm-icu" } immutables-valueannotations = { module = "org.immutables:value-annotations", version.ref = "immutables-valueannotations" } diff --git a/gradle/validation/dependencies.gradle b/gradle/validation/dependencies.gradle index 41900019a50..583f46f3352 100644 --- a/gradle/validation/dependencies.gradle +++ b/gradle/validation/dependencies.gradle @@ -303,6 +303,11 @@ allprojects { "\n- ${getFullName(libs.apache.calcite.core)} uses 1.1.2" + "\n- ${getFullName(libs.junit.junit)} (api) uses 1.1.0" }) + handler.add(conf.name, libs.hk2.locator, { + because "transitive version alignment for consistency across project" + + "\n- ${getFullName(libs.jersey.inject.hk2)} uses 3.0.6" + + "\n- ${getFullName(libs.hk2.api)} uses 3.1.1" + }) } } } diff --git a/solr/licenses/hamcrest-core-3.0.jar.sha1 b/solr/licenses/hamcrest-core-3.0.jar.sha1 deleted file mode 100644 index 0801ceea637..00000000000 --- a/solr/licenses/hamcrest-core-3.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -254f69f4b0ca22198acfc19fcdd5f96140431c3e diff --git a/solr/licenses/proto-google-common-protos-2.41.0.jar.sha1 b/solr/licenses/proto-google-common-protos-2.41.0.jar.sha1 new file mode 100644 index 00000000000..c243a867079 --- /dev/null +++ b/solr/licenses/proto-google-common-protos-2.41.0.jar.sha1 @@ -0,0 +1 @@ +13dfa68e2a2693660c0aa91928733f9296e12456 diff --git a/solr/licenses/proto-google-common-protos-2.42.0.jar.sha1 b/solr/licenses/proto-google-common-protos-2.42.0.jar.sha1 deleted file mode 100644 index b616f91ddc0..00000000000 --- a/solr/licenses/proto-google-common-protos-2.42.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -26d5aaff30d262212f454ee1123fc90572c284fe