Update ASM 9.7 -> 9.7.1 to support JDK 24 (elastic#118094)

piergm · Dec 6, 2024 · 7bd5c69 · 7bd5c69
1 parent dc44352
commit 7bd5c69
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 36 deletions.
diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle
@@ -25,8 +25,8 @@ dependencies {
   implementation project(":libs:plugin-api")
   implementation project(":libs:plugin-scanner")
   // TODO: asm is picked up from the plugin scanner, we should consolidate so it is not defined twice
-  implementation 'org.ow2.asm:asm:9.7'
-  implementation 'org.ow2.asm:asm-tree:9.7'
+  implementation 'org.ow2.asm:asm:9.7.1'
+  implementation 'org.ow2.asm:asm-tree:9.7.1'
 
   api "org.bouncycastle:bcpg-fips:1.0.7.1"
   api "org.bouncycastle:bc-fips:1.0.2.5"

diff --git a/docs/changelog/118094.yaml b/docs/changelog/118094.yaml
@@ -0,0 +1,5 @@
+pr: 118094
+summary: Update ASM 9.7 -> 9.7.1 to support JDK 24
+area: Infra/Core
+type: upgrade
+issues: []
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -4383,11 +4383,6 @@
             <sha256 value="3c6fac2424db3d4a853b669f4e3d1d9c3c552235e19a319673f887083c2303a1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.ow2.asm" name="asm" version="9.7">
-         <artifact name="asm-9.7.jar">
-            <sha256 value="adf46d5e34940bdf148ecdd26a9ee8eea94496a72034ff7141066b3eea5c4e9d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.ow2.asm" name="asm" version="9.7.1">
          <artifact name="asm-9.7.1.jar">
             <sha256 value="8cadd43ac5eb6d09de05faecca38b917a040bb9139c7edeb4cc81c740b713281" origin="Generated by Gradle"/>
@@ -4408,9 +4403,9 @@
             <sha256 value="878fbe521731c072d14d2d65b983b1beae6ad06fda0007b6a8bae81f73f433c4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.ow2.asm" name="asm-analysis" version="9.7">
-         <artifact name="asm-analysis-9.7.jar">
-            <sha256 value="7bc6bcbc21379948a0c8c467fb0f864206e5b818f6bc0b546872f5c9f941556f" origin="Generated by Gradle"/>
+      <component group="org.ow2.asm" name="asm-analysis" version="9.7.1">
+         <artifact name="asm-analysis-9.7.1.jar">
+            <sha256 value="85b29371884ba31bb76edf22323c2c24e172c3267a67152eba3d1ccc2e041ef2" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.ow2.asm" name="asm-commons" version="7.2">
@@ -4433,11 +4428,6 @@
             <sha256 value="0c128a9ec3f33c98959272f6d16cf14247b508f58951574bcdbd2b56d6326364" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.ow2.asm" name="asm-commons" version="9.7">
-         <artifact name="asm-commons-9.7.jar">
-            <sha256 value="389bc247958e049fc9a0408d398c92c6d370c18035120395d4cba1d9d9304b7a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.ow2.asm" name="asm-commons" version="9.7.1">
          <artifact name="asm-commons-9.7.1.jar">
             <sha256 value="9a579b54d292ad9be171d4313fd4739c635592c2b5ac3a459bbd1049cddec6a0" origin="Generated by Gradle"/>
@@ -4478,11 +4468,6 @@
             <sha256 value="c43ecf17b539c777e15da7b5b86553b377e2d39a683de6285567d5283888e7ef" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.ow2.asm" name="asm-tree" version="9.7">
-         <artifact name="asm-tree-9.7.jar">
-            <sha256 value="62f4b3bc436045c1acb5c3ba2d8ec556ec3369093d7f5d06c747eb04b56d52b1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.ow2.asm" name="asm-tree" version="9.7.1">
          <artifact name="asm-tree-9.7.1.jar">
             <sha256 value="9929881f59eb6b840e86d54570c77b59ce721d104e6dfd7a40978991c2d3b41f" origin="Generated by Gradle"/>
@@ -4493,11 +4478,11 @@
             <sha256 value="6e24913b021ffacfe8e7e053d6e0ccc731941148cfa078d4f1ed3d96904530f8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.ow2.asm" name="asm-util" version="9.7">
-         <artifact name="asm-util-9.7.jar">
-            <sha256 value="37a6414d36641973f1af104937c95d6d921b2ddb4d612c66c5a9f2b13fc14211" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
+       <component group="org.ow2.asm" name="asm-util" version="9.7.1">
+           <artifact name="asm-util-9.7.1.jar">
+               <sha256 value="f885be71b5c90556f5f1ad1c4f9276b29b96057c497d46666fe4ddbec3cb43c6" origin="Generated by Gradle"/>
+           </artifact>
+       </component>
       <component group="org.reactivestreams" name="reactive-streams" version="1.0.4">
          <artifact name="reactive-streams-1.0.4.jar">
             <sha256 value="f75ca597789b3dac58f61857b9ac2e1034a68fa672db35055a8fb4509e325f28" origin="Generated by Gradle"/>

diff --git a/libs/entitlement/asm-provider/build.gradle b/libs/entitlement/asm-provider/build.gradle
@@ -11,10 +11,10 @@ apply plugin: 'elasticsearch.build'
 
 dependencies {
   compileOnly project(':libs:entitlement')
-  implementation 'org.ow2.asm:asm:9.7'
+  implementation 'org.ow2.asm:asm:9.7.1'
   testImplementation project(":test:framework")
   testImplementation project(":libs:entitlement:bridge")
-  testImplementation 'org.ow2.asm:asm-util:9.7'
+  testImplementation 'org.ow2.asm:asm-util:9.7.1'
 }
 
 tasks.named('test').configure {

diff --git a/libs/entitlement/tools/securitymanager-scanner/build.gradle b/libs/entitlement/tools/securitymanager-scanner/build.gradle
@@ -47,8 +47,8 @@ repositories {
 
 dependencies {
   compileOnly(project(':libs:core'))
-  implementation 'org.ow2.asm:asm:9.7'
-  implementation 'org.ow2.asm:asm-util:9.7'
+  implementation 'org.ow2.asm:asm:9.7.1'
+  implementation 'org.ow2.asm:asm-util:9.7.1'
   implementation(project(':libs:entitlement:tools:common'))
 }
 

diff --git a/libs/plugin-scanner/build.gradle b/libs/plugin-scanner/build.gradle
@@ -20,8 +20,8 @@ dependencies {
   api project(':libs:plugin-api')
   api project(":libs:x-content")
 
-  api 'org.ow2.asm:asm:9.7'
-  api 'org.ow2.asm:asm-tree:9.7'
+  api 'org.ow2.asm:asm:9.7.1'
+  api 'org.ow2.asm:asm-tree:9.7.1'
 
   testImplementation "junit:junit:${versions.junit}"
   testImplementation(project(":test:framework")) {

diff --git a/test/immutable-collections-patch/build.gradle b/test/immutable-collections-patch/build.gradle
@@ -17,8 +17,8 @@ configurations {
 }
 
 dependencies {
-  implementation 'org.ow2.asm:asm:9.7'
-  implementation 'org.ow2.asm:asm-tree:9.7'
+  implementation 'org.ow2.asm:asm:9.7.1'
+  implementation 'org.ow2.asm:asm-tree:9.7.1'
 }
 
 def outputDir = layout.buildDirectory.dir("jdk-patches")

diff --git a/test/logger-usage/build.gradle b/test/logger-usage/build.gradle
@@ -10,9 +10,9 @@
 apply plugin: 'elasticsearch.java'
 
 dependencies {
-  api 'org.ow2.asm:asm:9.7'
-  api 'org.ow2.asm:asm-tree:9.7'
-  api 'org.ow2.asm:asm-analysis:9.7'
+  api 'org.ow2.asm:asm:9.7.1'
+  api 'org.ow2.asm:asm-tree:9.7.1'
+  api 'org.ow2.asm:asm-analysis:9.7.1'
   api "org.apache.logging.log4j:log4j-api:${versions.log4j}"
   testImplementation project(":test:framework")
 }