Upgrade ASM JARs to 9.6 (jython#306)

Fixes jython#304.
jeff5 · Feb 17, 2024 · 93911c7 · 93911c7
1 parent 9cf8499
commit 93911c7
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/NEWS b/NEWS
@@ -20,6 +20,8 @@ New Features
 
 
 Jython 2.7.4a1 Bugs fixed
+    - [ GH-304 ] from java import * not working in Java 21
+    - [ GH-280 ] LineNumberTable deprecated for removal in 2.6 still there
     - [ GH-277 ] Fix automatic conversions of function/method args for java
                  interfaces with default methods.
     - [ GH-269 ] Upgrade Google Guava to 32.0.1 (CVE-2023-2976)

diff --git a/build.gradle b/build.gradle
@@ -160,9 +160,9 @@ dependencies {
     implementation 'org.bouncycastle:bcpkix-jdk18on:1.71'
     implementation 'org.bouncycastle:bcprov-jdk18on:1.71'
 
-    implementation 'org.ow2.asm:asm:9.3'
-    implementation 'org.ow2.asm:asm-commons:9.3'
-    implementation 'org.ow2.asm:asm-util:9.3'
+    implementation 'org.ow2.asm:asm:9.6'
+    implementation 'org.ow2.asm:asm-commons:9.6'
+    implementation 'org.ow2.asm:asm-util:9.6'
 
     implementation 'com.google.guava:guava:32.1.2-jre'
 

diff --git a/build.xml b/build.xml
@@ -251,9 +251,9 @@ informix.jar = ../support/jdbc-4.10.12.jar
             <!-- Other JARs (alphabetical) -->
             <filelist dir="${extlibs.dir}">
                 <file name="antlr-complete-3.5.2.jar" /> <!-- ANTLR 3 until we upgrade parsing -->
-                <file name="asm-9.3.jar" />
-                <file name="asm-commons-9.3.jar" />
-                <file name="asm-util-9.3.jar" />
+                <file name="asm-9.6.jar" />
+                <file name="asm-commons-9.6.jar" />
+                <file name="asm-util-9.6.jar" />
                 <file name="commons-compress-1.21.jar"/>
                 <file name="failureaccess-1.0.1.jar" />
                 <file name="guava-32.1.2-jre.jar" />
@@ -846,9 +846,9 @@ The text for an official release would continue like ...
             <!-- pin to Antlr 3 until we upgrade parsing -->
             <zipfileset src="extlibs/antlr-runtime-3.5.2.jar"/>
             <rule pattern="org.antlr.runtime.**" result="org.python.antlr.runtime.@1"/>
-            <zipfileset src="extlibs/asm-9.3.jar" excludes="module-info.class"/>
-            <zipfileset src="extlibs/asm-commons-9.3.jar" excludes="module-info.class"/>
-            <zipfileset src="extlibs/asm-util-9.3.jar" excludes="module-info.class"/>
+            <zipfileset src="extlibs/asm-9.6.jar" excludes="module-info.class"/>
+            <zipfileset src="extlibs/asm-commons-9.6.jar" excludes="module-info.class"/>
+            <zipfileset src="extlibs/asm-util-9.6.jar" excludes="module-info.class"/>
             <rule pattern="org.objectweb.asm.**" result="org.python.objectweb.asm.@1"/>
             <zipfileset src="extlibs/bcpkix-jdk18on-1.71.jar" excludes="META-INF/**"/>
             <zipfileset src="extlibs/bcprov-jdk18on-1.71.jar" excludes="META-INF/**"/>

diff --git a/extlibs/asm-9.3.jar b/extlibs/asm-9.3.jar
diff --git a/extlibs/asm-9.6.jar b/extlibs/asm-9.6.jar
diff --git a/extlibs/asm-commons-9.3.jar b/extlibs/asm-commons-9.3.jar
diff --git a/extlibs/asm-commons-9.6.jar b/extlibs/asm-commons-9.6.jar
diff --git a/extlibs/asm-util-9.3.jar b/extlibs/asm-util-9.3.jar
diff --git a/extlibs/asm-util-9.6.jar b/extlibs/asm-util-9.6.jar