Apache Solr open-source search software
SOLR-17718: Upgrade bytebuddy to 1.17.4 (#3286)
Houston Putman13f0fee15880
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 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-guidebrowserify = "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.lockfileindex 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=permitUnusedDeclaredjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjavax.servlet:javax.servlet-api:3.1.0=permitUnusedDeclaredjunit: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,testRuntimeClasspathorg.antlr:antlr4-runtime:4.11.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.4.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.apache.commons:commons-lang3:3.15.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/cross-dc-manager/build.gradle b/solr/cross-dc-manager/build.gradleindex 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.testframeworktestImplementation libs.carrotsearch.randomizedtesting.runnertestImplementation 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.agenttestImplementation(libs.apache.kafka.streams) {artifact {diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfileindex 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,rjakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit: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,testRuntimeClasspathnet.sf.jopt-simple:jopt-simple:5.0.4=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathnet.sourceforge.argparse4j:argparse4j:0.7.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathorg.antlr:antlr4-runtime:4.11.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/licenses/byte-buddy-1.15.11.jar.sha1 b/solr/licenses/byte-buddy-1.15.11.jar.sha1deleted file mode 100644index db27b6a09ef..00000000000--- a/solr/licenses/byte-buddy-1.15.11.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f61886478e0f9ee4c21d09574736f0ff45e0a46cdiff --git a/solr/licenses/byte-buddy-1.17.4.jar.sha1 b/solr/licenses/byte-buddy-1.17.4.jar.sha1new file mode 100644index 00000000000..1ce022efb40--- /dev/null+++ b/solr/licenses/byte-buddy-1.17.4.jar.sha1@@ -0,0 +1 @@+ffb8488d93290eff074fb542a596e4c5a26d0315diff --git a/solr/licenses/byte-buddy-agent-1.15.11.jar.sha1 b/solr/licenses/byte-buddy-agent-1.15.11.jar.sha1deleted file mode 100644index 1943ee37a7d..00000000000--- a/solr/licenses/byte-buddy-agent-1.15.11.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a38b16385e867f59a641330f0362ebe742788ed8diff --git a/solr/licenses/byte-buddy-agent-1.17.4.jar.sha1 b/solr/licenses/byte-buddy-agent-1.17.4.jar.sha1new file mode 100644index 00000000000..ebc431ad92b--- /dev/null+++ b/solr/licenses/byte-buddy-agent-1.17.4.jar.sha1@@ -0,0 +1 @@+9dd4f0adf859ffc402508141fcbe940551ffa3b6diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfileindex 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,runtimeCjakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit: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,testRuntimeClasspathorg.antlr:antlr4-runtime:4.11.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-lang3:3.15.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/cross-dc/build.gradle b/solr/modules/cross-dc/build.gradleindex 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.testframeworktestImplementation libs.junit.junittestImplementation libs.commonsio.commonsio- testImplementation libs.mockito.coretestImplementation 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.agenttestImplementation(libs.apache.kafka.clients) {artifact {diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfileindex 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,runtimeCjakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit: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,testRuntimeClasspathorg.antlr:antlr4-runtime:4.11.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-lang3:3.15.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfileindex 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,rjakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit: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,testRuntimeClasspathnet.minidev:accessors-smart:2.4.9=jarValidation,testCompileClasspath,testRuntimeClasspathnet.minidev:json-smart:2.4.10=jarValidation,testCompileClasspath,testRuntimeClasspathno.nav.security:mock-oauth2-server:0.5.10=jarValidation,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfileindex 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,rjakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit: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,testRuntimeClasspathorg.antlr:antlr4-runtime:4.11.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.4.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-lang3:3.15.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfileindex 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,tjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjoda-time:joda-time:2.13.0=jarValidation,testCompileClasspath,testRuntimeClasspathjunit: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,testRuntimeClasspathorg.antlr:antlr4-runtime:4.11.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-lang3:3.15.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfileindex 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,testRuntimeClasspajakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit: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,testRuntimeClasspathorg.antlr:antlr4-runtime:4.11.1=jarValidation,testRuntimeClasspathorg.apache.commons:commons-exec:1.4.0=jarValidation,testRuntimeClasspathorg.apache.commons:commons-lang3:3.15.0=jarValidation,testCompileClasspath,testRuntimeClasspath