Sync versions with current main

apache · Nov 8, 2024 · 788d305 · 788d305
1 parent 017fe17
commit 788d305
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 6 deletions.
diff --git 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"
@@ -145,7 +145,7 @@ morethan-jmhreport = "0.9.0"
 navsecurity = "0.5.10"
 netty = "4.1.112.Final"
 # @keep for version alignment
-netty-tcnative = "2.0.65.Final"
+netty-tcnative = "2.0.61.Final"
 nimbusds-josejwt = "9.30.2"
 nodegradle-node = "7.0.1"
 openapi = "7.6.0"
@@ -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
@@ -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
diff --git a/solr/licenses/netty-tcnative-boringssl-static-2.0.61.Final.jar.sha1 b/solr/licenses/netty-tcnative-boringssl-static-2.0.61.Final.jar.sha1
@@ -0,0 +1 @@
+944722ba2883fe5825a0c6b38dc727d7151a9371
diff --git a/solr/licenses/netty-tcnative-boringssl-static-2.0.65.Final.jar.sha1 b/solr/licenses/netty-tcnative-boringssl-static-2.0.65.Final.jar.sha1
diff --git a/solr/licenses/netty-tcnative-classes-2.0.61.Final.jar.sha1 b/solr/licenses/netty-tcnative-classes-2.0.61.Final.jar.sha1
@@ -0,0 +1 @@
+4c6ae851ed97921bc6c6b64e019c2b039f49131a
diff --git a/solr/licenses/netty-tcnative-classes-2.0.65.Final.jar.sha1 b/solr/licenses/netty-tcnative-classes-2.0.65.Final.jar.sha1
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
@@ -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