Skip to content

Commit 7bd5c69

Browse files
authored
Update ASM 9.7 -> 9.7.1 to support JDK 24 (#118094)
1 parent dc44352 commit 7bd5c69

File tree

8 files changed

+26
-36
lines changed

8 files changed

+26
-36
lines changed

distribution/tools/plugin-cli/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ dependencies {
2525
implementation project(":libs:plugin-api")
2626
implementation project(":libs:plugin-scanner")
2727
// TODO: asm is picked up from the plugin scanner, we should consolidate so it is not defined twice
28-
implementation 'org.ow2.asm:asm:9.7'
29-
implementation 'org.ow2.asm:asm-tree:9.7'
28+
implementation 'org.ow2.asm:asm:9.7.1'
29+
implementation 'org.ow2.asm:asm-tree:9.7.1'
3030

3131
api "org.bouncycastle:bcpg-fips:1.0.7.1"
3232
api "org.bouncycastle:bc-fips:1.0.2.5"

docs/changelog/118094.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 118094
2+
summary: Update ASM 9.7 -> 9.7.1 to support JDK 24
3+
area: Infra/Core
4+
type: upgrade
5+
issues: []

gradle/verification-metadata.xml

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4383,11 +4383,6 @@
43834383
<sha256 value="3c6fac2424db3d4a853b669f4e3d1d9c3c552235e19a319673f887083c2303a1" origin="Generated by Gradle"/>
43844384
</artifact>
43854385
</component>
4386-
<component group="org.ow2.asm" name="asm" version="9.7">
4387-
<artifact name="asm-9.7.jar">
4388-
<sha256 value="adf46d5e34940bdf148ecdd26a9ee8eea94496a72034ff7141066b3eea5c4e9d" origin="Generated by Gradle"/>
4389-
</artifact>
4390-
</component>
43914386
<component group="org.ow2.asm" name="asm" version="9.7.1">
43924387
<artifact name="asm-9.7.1.jar">
43934388
<sha256 value="8cadd43ac5eb6d09de05faecca38b917a040bb9139c7edeb4cc81c740b713281" origin="Generated by Gradle"/>
@@ -4408,9 +4403,9 @@
44084403
<sha256 value="878fbe521731c072d14d2d65b983b1beae6ad06fda0007b6a8bae81f73f433c4" origin="Generated by Gradle"/>
44094404
</artifact>
44104405
</component>
4411-
<component group="org.ow2.asm" name="asm-analysis" version="9.7">
4412-
<artifact name="asm-analysis-9.7.jar">
4413-
<sha256 value="7bc6bcbc21379948a0c8c467fb0f864206e5b818f6bc0b546872f5c9f941556f" origin="Generated by Gradle"/>
4406+
<component group="org.ow2.asm" name="asm-analysis" version="9.7.1">
4407+
<artifact name="asm-analysis-9.7.1.jar">
4408+
<sha256 value="85b29371884ba31bb76edf22323c2c24e172c3267a67152eba3d1ccc2e041ef2" origin="Generated by Gradle"/>
44144409
</artifact>
44154410
</component>
44164411
<component group="org.ow2.asm" name="asm-commons" version="7.2">
@@ -4433,11 +4428,6 @@
44334428
<sha256 value="0c128a9ec3f33c98959272f6d16cf14247b508f58951574bcdbd2b56d6326364" origin="Generated by Gradle"/>
44344429
</artifact>
44354430
</component>
4436-
<component group="org.ow2.asm" name="asm-commons" version="9.7">
4437-
<artifact name="asm-commons-9.7.jar">
4438-
<sha256 value="389bc247958e049fc9a0408d398c92c6d370c18035120395d4cba1d9d9304b7a" origin="Generated by Gradle"/>
4439-
</artifact>
4440-
</component>
44414431
<component group="org.ow2.asm" name="asm-commons" version="9.7.1">
44424432
<artifact name="asm-commons-9.7.1.jar">
44434433
<sha256 value="9a579b54d292ad9be171d4313fd4739c635592c2b5ac3a459bbd1049cddec6a0" origin="Generated by Gradle"/>
@@ -4478,11 +4468,6 @@
44784468
<sha256 value="c43ecf17b539c777e15da7b5b86553b377e2d39a683de6285567d5283888e7ef" origin="Generated by Gradle"/>
44794469
</artifact>
44804470
</component>
4481-
<component group="org.ow2.asm" name="asm-tree" version="9.7">
4482-
<artifact name="asm-tree-9.7.jar">
4483-
<sha256 value="62f4b3bc436045c1acb5c3ba2d8ec556ec3369093d7f5d06c747eb04b56d52b1" origin="Generated by Gradle"/>
4484-
</artifact>
4485-
</component>
44864471
<component group="org.ow2.asm" name="asm-tree" version="9.7.1">
44874472
<artifact name="asm-tree-9.7.1.jar">
44884473
<sha256 value="9929881f59eb6b840e86d54570c77b59ce721d104e6dfd7a40978991c2d3b41f" origin="Generated by Gradle"/>
@@ -4493,11 +4478,11 @@
44934478
<sha256 value="6e24913b021ffacfe8e7e053d6e0ccc731941148cfa078d4f1ed3d96904530f8" origin="Generated by Gradle"/>
44944479
</artifact>
44954480
</component>
4496-
<component group="org.ow2.asm" name="asm-util" version="9.7">
4497-
<artifact name="asm-util-9.7.jar">
4498-
<sha256 value="37a6414d36641973f1af104937c95d6d921b2ddb4d612c66c5a9f2b13fc14211" origin="Generated by Gradle"/>
4499-
</artifact>
4500-
</component>
4481+
<component group="org.ow2.asm" name="asm-util" version="9.7.1">
4482+
<artifact name="asm-util-9.7.1.jar">
4483+
<sha256 value="f885be71b5c90556f5f1ad1c4f9276b29b96057c497d46666fe4ddbec3cb43c6" origin="Generated by Gradle"/>
4484+
</artifact>
4485+
</component>
45014486
<component group="org.reactivestreams" name="reactive-streams" version="1.0.4">
45024487
<artifact name="reactive-streams-1.0.4.jar">
45034488
<sha256 value="f75ca597789b3dac58f61857b9ac2e1034a68fa672db35055a8fb4509e325f28" origin="Generated by Gradle"/>

libs/entitlement/asm-provider/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ apply plugin: 'elasticsearch.build'
1111

1212
dependencies {
1313
compileOnly project(':libs:entitlement')
14-
implementation 'org.ow2.asm:asm:9.7'
14+
implementation 'org.ow2.asm:asm:9.7.1'
1515
testImplementation project(":test:framework")
1616
testImplementation project(":libs:entitlement:bridge")
17-
testImplementation 'org.ow2.asm:asm-util:9.7'
17+
testImplementation 'org.ow2.asm:asm-util:9.7.1'
1818
}
1919

2020
tasks.named('test').configure {

libs/entitlement/tools/securitymanager-scanner/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ repositories {
4747

4848
dependencies {
4949
compileOnly(project(':libs:core'))
50-
implementation 'org.ow2.asm:asm:9.7'
51-
implementation 'org.ow2.asm:asm-util:9.7'
50+
implementation 'org.ow2.asm:asm:9.7.1'
51+
implementation 'org.ow2.asm:asm-util:9.7.1'
5252
implementation(project(':libs:entitlement:tools:common'))
5353
}
5454

libs/plugin-scanner/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ dependencies {
2020
api project(':libs:plugin-api')
2121
api project(":libs:x-content")
2222

23-
api 'org.ow2.asm:asm:9.7'
24-
api 'org.ow2.asm:asm-tree:9.7'
23+
api 'org.ow2.asm:asm:9.7.1'
24+
api 'org.ow2.asm:asm-tree:9.7.1'
2525

2626
testImplementation "junit:junit:${versions.junit}"
2727
testImplementation(project(":test:framework")) {

test/immutable-collections-patch/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ configurations {
1717
}
1818

1919
dependencies {
20-
implementation 'org.ow2.asm:asm:9.7'
21-
implementation 'org.ow2.asm:asm-tree:9.7'
20+
implementation 'org.ow2.asm:asm:9.7.1'
21+
implementation 'org.ow2.asm:asm-tree:9.7.1'
2222
}
2323

2424
def outputDir = layout.buildDirectory.dir("jdk-patches")

test/logger-usage/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
apply plugin: 'elasticsearch.java'
1111

1212
dependencies {
13-
api 'org.ow2.asm:asm:9.7'
14-
api 'org.ow2.asm:asm-tree:9.7'
15-
api 'org.ow2.asm:asm-analysis:9.7'
13+
api 'org.ow2.asm:asm:9.7.1'
14+
api 'org.ow2.asm:asm-tree:9.7.1'
15+
api 'org.ow2.asm:asm-analysis:9.7.1'
1616
api "org.apache.logging.log4j:log4j-api:${versions.log4j}"
1717
testImplementation project(":test:framework")
1818
}

0 commit comments

Comments
 (0)