Upgrade ASM to 9.3

Closes #157.
jython · May 21, 2022 · 7c11f58 · 7c11f58
1 parent 124e6d2
commit 7c11f58
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git a/NEWS b/NEWS
@@ -12,6 +12,7 @@ For more details, three sources are available according to type:
 Jython 2.7.3a1
   Bugs fixed
     - [ GH-160 ] Improve context of "Cannot create PyString with non-byte value"
+    - [ GH-157 ] Upgrade ASM to 9.3
     - [ GH-151 ] Upgrade Apache Xerces to 2.12.2 (CVE-2022-23437)
     - [ GH-150 ] Upgrade Netty to 4.1.73 (various CVEs)
     - [ GH-138 ] Upgrade Guava to 31.0.1 (CVE-2020-8908)

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

diff --git a/build.xml b/build.xml
@@ -245,9 +245,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-7.1.jar" />
-                <file name="asm-commons-7.1.jar" />
-                <file name="asm-util-7.1.jar" />
+                <file name="asm-9.3.jar" />
+                <file name="asm-commons-9.3.jar" />
+                <file name="asm-util-9.3.jar" />
                 <file name="commons-compress-1.21.jar"/>
                 <file name="failureaccess-1.0.1.jar" />
                 <file name="guava-31.0.1-jre.jar" />
@@ -832,9 +832,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-7.1.jar"/>
-            <zipfileset src="extlibs/asm-commons-7.1.jar"/>
-            <zipfileset src="extlibs/asm-util-7.1.jar"/>
+            <zipfileset src="extlibs/asm-9.3.jar"/>
+            <zipfileset src="extlibs/asm-commons-9.3.jar"/>
+            <zipfileset src="extlibs/asm-util-9.3.jar"/>
             <rule pattern="org.objectweb.asm.**" result="org.python.objectweb.asm.@1"/>
             <zipfileset src="extlibs/bcpkix-jdk15on-1.69.jar" excludes="META-INF/**"/>
             <zipfileset src="extlibs/bcprov-jdk15on-1.69.jar" excludes="META-INF/**"/>

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