This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 13f0fee1588 SOLR-17718: Upgrade bytebuddy to 1.17.4 (#3286)
13f0fee1588 is described below
commit 13f0fee15880adc859cb5bab50a8dabe22d173e1
Author: Houston Putman <[email protected]>
AuthorDate: Tue Mar 25 17:00:09 2025 -0500
SOLR-17718: Upgrade bytebuddy to 1.17.4 (#3286)
Fixes cross-dc and cross-dc-manager tests when running with Java 25
---
gradle/libs.versions.toml | 3 +++
solr/core/gradle.lockfile | 2 +-
solr/cross-dc-manager/build.gradle | 11 ++++++++++-
solr/cross-dc-manager/gradle.lockfile | 4 ++--
solr/licenses/byte-buddy-1.15.11.jar.sha1 | 1 -
solr/licenses/byte-buddy-1.17.4.jar.sha1 | 1 +
solr/licenses/byte-buddy-agent-1.15.11.jar.sha1 | 1 -
solr/licenses/byte-buddy-agent-1.17.4.jar.sha1 | 1 +
solr/modules/analysis-extras/gradle.lockfile | 2 +-
solr/modules/cross-dc/build.gradle | 11 ++++++++++-
solr/modules/cross-dc/gradle.lockfile | 4 ++--
solr/modules/jwt-auth/gradle.lockfile | 2 +-
solr/modules/ltr/gradle.lockfile | 2 +-
solr/modules/s3-repository/gradle.lockfile | 2 +-
solr/solrj/gradle.lockfile | 2 +-
15 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 415beb63fa0..90b73920005 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -63,6 +63,7 @@ benmanes-versions = "0.51.0"
bouncycastle = "1.78.1"
# @keep Browserify version used in ref-guide
browserify = "17.0.0"
+bytebuddy = "1.17.4"
carrot2-core = "4.5.1"
carrotsearch-hppc = "0.10.0"
carrotsearch-randomizedtesting = "2.8.1"
@@ -294,6 +295,8 @@ bc-jose4j = { module = "org.bitbucket.b_c:jose4j",
version.ref = "bc-jose4j" }
benmanes-caffeine = { module = "com.github.ben-manes.caffeine:caffeine",
version.ref = "benmanes-caffeine" }
bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on",
version.ref = "bouncycastle" }
bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk18on",
version.ref = "bouncycastle" }
+bytebuddy = { module = "net.bytebuddy:byte-buddy", version.ref = "bytebuddy" }
+bytebuddy-agent = { module = "net.bytebuddy:byte-buddy-agent", version.ref =
"bytebuddy" }
carrot2-core = { module = "org.carrot2:carrot2-core", version.ref =
"carrot2-core" }
carrotsearch-hppc = { module = "com.carrotsearch:hppc", version.ref =
"carrotsearch-hppc" }
carrotsearch-randomizedtesting-runner = { module =
"com.carrotsearch.randomizedtesting:randomizedtesting-runner", version.ref =
"carrotsearch-randomizedtesting" }
diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile
index ea9595d29b6..fb3d9bb7740 100644
--- a/solr/core/gradle.lockfile
+++ b/solr/core/gradle.lockfile
@@ -78,7 +78,7 @@
jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=permitUnusedDeclared
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
javax.servlet:javax.servlet-api:3.1.0=permitUnusedDeclared
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.15.11=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.4=jarValidation,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.11.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.apache.commons:commons-exec:1.4.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.15.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/cross-dc-manager/build.gradle
b/solr/cross-dc-manager/build.gradle
index 75b88e76fd2..5083a06c589 100644
--- a/solr/cross-dc-manager/build.gradle
+++ b/solr/cross-dc-manager/build.gradle
@@ -49,7 +49,16 @@ dependencies {
testImplementation libs.apache.lucene.testframework
testImplementation libs.carrotsearch.randomizedtesting.runner
testImplementation libs.junit.junit
- testImplementation libs.mockito.core
+ // The explicit dependency on bytebuddy is required for Java 25 support
+ // Once Mockito upgrades its dependency on ByteBuddy to 1.16.1, we should
+ // be able to remove this and merely use:
+ // testImplementation libs.mockito.core
+ testImplementation(libs.mockito.core, {
+ exclude group: "net.bytebuddy", module: "byte-buddy"
+ exclude group: "net.bytebuddy", module: "byte-buddy-agent"
+ })
+ testRuntimeOnly libs.bytebuddy
+ testRuntimeOnly libs.bytebuddy.agent
testImplementation(libs.apache.kafka.streams) {
artifact {
diff --git a/solr/cross-dc-manager/gradle.lockfile
b/solr/cross-dc-manager/gradle.lockfile
index cd0695b5a9e..07efb3712e3 100644
--- a/solr/cross-dc-manager/gradle.lockfile
+++ b/solr/cross-dc-manager/gradle.lockfile
@@ -83,8 +83,8 @@
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,r
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.15.11=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.15.11=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.17.4=jarValidation,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.4=jarValidation,testRuntimeClasspath
net.sf.jopt-simple:jopt-simple:5.0.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
net.sourceforge.argparse4j:argparse4j:0.7.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.antlr:antlr4-runtime:4.11.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/licenses/byte-buddy-1.15.11.jar.sha1
b/solr/licenses/byte-buddy-1.15.11.jar.sha1
deleted file mode 100644
index db27b6a09ef..00000000000
--- a/solr/licenses/byte-buddy-1.15.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f61886478e0f9ee4c21d09574736f0ff45e0a46c
diff --git a/solr/licenses/byte-buddy-1.17.4.jar.sha1
b/solr/licenses/byte-buddy-1.17.4.jar.sha1
new file mode 100644
index 00000000000..1ce022efb40
--- /dev/null
+++ b/solr/licenses/byte-buddy-1.17.4.jar.sha1
@@ -0,0 +1 @@
+ffb8488d93290eff074fb542a596e4c5a26d0315
diff --git a/solr/licenses/byte-buddy-agent-1.15.11.jar.sha1
b/solr/licenses/byte-buddy-agent-1.15.11.jar.sha1
deleted file mode 100644
index 1943ee37a7d..00000000000
--- a/solr/licenses/byte-buddy-agent-1.15.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a38b16385e867f59a641330f0362ebe742788ed8
diff --git a/solr/licenses/byte-buddy-agent-1.17.4.jar.sha1
b/solr/licenses/byte-buddy-agent-1.17.4.jar.sha1
new file mode 100644
index 00000000000..ebc431ad92b
--- /dev/null
+++ b/solr/licenses/byte-buddy-agent-1.17.4.jar.sha1
@@ -0,0 +1 @@
+9dd4f0adf859ffc402508141fcbe940551ffa3b6
diff --git a/solr/modules/analysis-extras/gradle.lockfile
b/solr/modules/analysis-extras/gradle.lockfile
index 1e885703556..a294ed4d924 100644
--- a/solr/modules/analysis-extras/gradle.lockfile
+++ b/solr/modules/analysis-extras/gradle.lockfile
@@ -67,7 +67,7 @@
jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeC
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.15.11=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.4=jarValidation,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.11.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-exec:1.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-lang3:3.15.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/cross-dc/build.gradle
b/solr/modules/cross-dc/build.gradle
index 9e17cf72f44..4e9ab5ab923 100644
--- a/solr/modules/cross-dc/build.gradle
+++ b/solr/modules/cross-dc/build.gradle
@@ -44,8 +44,17 @@ dependencies {
testImplementation libs.apache.lucene.testframework
testImplementation libs.junit.junit
testImplementation libs.commonsio.commonsio
- testImplementation libs.mockito.core
testImplementation libs.carrotsearch.randomizedtesting.runner
+ // The explicit dependency on bytebuddy is required for Java 25 support
+ // Once Mockito upgrades its dependency on ByteBuddy to 1.16.1, we should
+ // be able to remove this and merely use:
+ // testImplementation libs.mockito.core
+ testImplementation(libs.mockito.core, {
+ exclude group: "net.bytebuddy", module: "byte-buddy"
+ exclude group: "net.bytebuddy", module: "byte-buddy-agent"
+ })
+ testRuntimeOnly libs.bytebuddy
+ testRuntimeOnly libs.bytebuddy.agent
testImplementation(libs.apache.kafka.clients) {
artifact {
diff --git a/solr/modules/cross-dc/gradle.lockfile
b/solr/modules/cross-dc/gradle.lockfile
index cf6a61dac69..e148bf92bad 100644
--- a/solr/modules/cross-dc/gradle.lockfile
+++ b/solr/modules/cross-dc/gradle.lockfile
@@ -67,8 +67,8 @@
jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeC
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.15.11=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.15.11=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.17.4=jarValidation,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.4=jarValidation,testRuntimeClasspath
org.antlr:antlr4-runtime:4.11.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-exec:1.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-lang3:3.15.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/jwt-auth/gradle.lockfile
b/solr/modules/jwt-auth/gradle.lockfile
index 26f0055b310..b8ff16b1669 100644
--- a/solr/modules/jwt-auth/gradle.lockfile
+++ b/solr/modules/jwt-auth/gradle.lockfile
@@ -79,7 +79,7 @@
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,r
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.15.11=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.4=jarValidation,testCompileClasspath,testRuntimeClasspath
net.minidev:accessors-smart:2.4.9=jarValidation,testCompileClasspath,testRuntimeClasspath
net.minidev:json-smart:2.4.10=jarValidation,testCompileClasspath,testRuntimeClasspath
no.nav.security:mock-oauth2-server:0.5.10=jarValidation,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile
index ab753096bc8..ed50fdc04e4 100644
--- a/solr/modules/ltr/gradle.lockfile
+++ b/solr/modules/ltr/gradle.lockfile
@@ -66,7 +66,7 @@
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,r
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.15.11=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.4=jarValidation,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.11.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-exec:1.4.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-lang3:3.15.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/s3-repository/gradle.lockfile
b/solr/modules/s3-repository/gradle.lockfile
index 5ab573ab4be..c3367b9a64a 100644
--- a/solr/modules/s3-repository/gradle.lockfile
+++ b/solr/modules/s3-repository/gradle.lockfile
@@ -84,7 +84,7 @@
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=jarValidation,testCompileClasspath,t
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
joda-time:joda-time:2.13.0=jarValidation,testCompileClasspath,testRuntimeClasspath
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.15.11=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.4=jarValidation,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.11.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-exec:1.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.commons:commons-lang3:3.15.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile
index 491cf3a928c..84741aa1b0e 100644
--- a/solr/solrj/gradle.lockfile
+++ b/solr/solrj/gradle.lockfile
@@ -80,7 +80,7 @@
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,testRuntimeClasspa
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.15.11=jarValidation,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.4=jarValidation,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.11.1=jarValidation,testRuntimeClasspath
org.apache.commons:commons-exec:1.4.0=jarValidation,testRuntimeClasspath
org.apache.commons:commons-lang3:3.15.0=jarValidation,testCompileClasspath,testRuntimeClasspath
