Skip to content

Commit 93911c7

Browse files
authored
Upgrade ASM JARs to 9.6 (jython#306)
Fixes jython#304.
1 parent 9cf8499 commit 93911c7

9 files changed

+11
-9
lines changed

NEWS

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ New Features
2020

2121

2222
Jython 2.7.4a1 Bugs fixed
23+
- [ GH-304 ] from java import * not working in Java 21
24+
- [ GH-280 ] LineNumberTable deprecated for removal in 2.6 still there
2325
- [ GH-277 ] Fix automatic conversions of function/method args for java
2426
interfaces with default methods.
2527
- [ GH-269 ] Upgrade Google Guava to 32.0.1 (CVE-2023-2976)

build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ dependencies {
160160
implementation 'org.bouncycastle:bcpkix-jdk18on:1.71'
161161
implementation 'org.bouncycastle:bcprov-jdk18on:1.71'
162162

163-
implementation 'org.ow2.asm:asm:9.3'
164-
implementation 'org.ow2.asm:asm-commons:9.3'
165-
implementation 'org.ow2.asm:asm-util:9.3'
163+
implementation 'org.ow2.asm:asm:9.6'
164+
implementation 'org.ow2.asm:asm-commons:9.6'
165+
implementation 'org.ow2.asm:asm-util:9.6'
166166

167167
implementation 'com.google.guava:guava:32.1.2-jre'
168168

build.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ informix.jar = ../support/jdbc-4.10.12.jar
251251
<!-- Other JARs (alphabetical) -->
252252
<filelist dir="${extlibs.dir}">
253253
<file name="antlr-complete-3.5.2.jar" /> <!-- ANTLR 3 until we upgrade parsing -->
254-
<file name="asm-9.3.jar" />
255-
<file name="asm-commons-9.3.jar" />
256-
<file name="asm-util-9.3.jar" />
254+
<file name="asm-9.6.jar" />
255+
<file name="asm-commons-9.6.jar" />
256+
<file name="asm-util-9.6.jar" />
257257
<file name="commons-compress-1.21.jar"/>
258258
<file name="failureaccess-1.0.1.jar" />
259259
<file name="guava-32.1.2-jre.jar" />
@@ -846,9 +846,9 @@ The text for an official release would continue like ...
846846
<!-- pin to Antlr 3 until we upgrade parsing -->
847847
<zipfileset src="extlibs/antlr-runtime-3.5.2.jar"/>
848848
<rule pattern="org.antlr.runtime.**" result="org.python.antlr.runtime.@1"/>
849-
<zipfileset src="extlibs/asm-9.3.jar" excludes="module-info.class"/>
850-
<zipfileset src="extlibs/asm-commons-9.3.jar" excludes="module-info.class"/>
851-
<zipfileset src="extlibs/asm-util-9.3.jar" excludes="module-info.class"/>
849+
<zipfileset src="extlibs/asm-9.6.jar" excludes="module-info.class"/>
850+
<zipfileset src="extlibs/asm-commons-9.6.jar" excludes="module-info.class"/>
851+
<zipfileset src="extlibs/asm-util-9.6.jar" excludes="module-info.class"/>
852852
<rule pattern="org.objectweb.asm.**" result="org.python.objectweb.asm.@1"/>
853853
<zipfileset src="extlibs/bcpkix-jdk18on-1.71.jar" excludes="META-INF/**"/>
854854
<zipfileset src="extlibs/bcprov-jdk18on-1.71.jar" excludes="META-INF/**"/>

extlibs/asm-9.3.jar

-119 KB
Binary file not shown.

extlibs/asm-9.6.jar

121 KB
Binary file not shown.

extlibs/asm-commons-9.3.jar

-71 KB
Binary file not shown.

extlibs/asm-commons-9.6.jar

70.5 KB
Binary file not shown.

extlibs/asm-util-9.3.jar

-83.7 KB
Binary file not shown.

extlibs/asm-util-9.6.jar

89 KB
Binary file not shown.

0 commit comments

Comments
 (0)