From 6b8399130aade177a3c0310021a7efcfee9c5812 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien42@gmail.com>
Date: Fri, 18 Oct 2024 17:53:55 +0200
Subject: [PATCH] Update ASM from 9.7 to 9.7.1

JDK 24 support
---
 harness/apisupport.harness/build.xml                 |  4 ++--
 java/lib.jshell.agent/nbproject/project.properties   |  2 +-
 java/maven/build.xml                                 |  4 ++--
 nbbuild/templates/common.xml                         |  6 +++---
 .../{asm-9.7-license.txt => asm-9.7.1-license.txt}   |  4 ++--
 platform/libs.asm/external/binaries-list             |  6 +++---
 platform/libs.asm/nbproject/project.properties       |  8 ++++----
 platform/libs.asm/nbproject/project.xml              | 12 ++++++------
 8 files changed, 23 insertions(+), 23 deletions(-)
 rename platform/libs.asm/external/{asm-9.7-license.txt => asm-9.7.1-license.txt} (96%)

diff --git a/harness/apisupport.harness/build.xml b/harness/apisupport.harness/build.xml
index 7d5c42be31ae..7730185af52a 100644
--- a/harness/apisupport.harness/build.xml
+++ b/harness/apisupport.harness/build.xml
@@ -39,13 +39,13 @@
                 <pathelement location="${cluster}/tasks.jar"></pathelement>
             </classpath>
         </taskdef>
-        <echo file="build/binaries-list">073D7B3086E14BEB604CED229C302FEFF6449723 org.ow2.asm:asm:9.7</echo>
+        <echo file="build/binaries-list">F0ED132A49244B042CD0E15702AB9F2CE3CC8436 org.ow2.asm:asm:9.7.1</echo>
         <TestDownload>
             <manifest dir="build">
                 <include name="binaries-list"/>
             </manifest>
         </TestDownload>
-        <delete file="build/asm-9.7.jar"/>
+        <delete file="build/asm-9.7.1.jar"/>
     </target>
 
     <target name="compile-jnlp-launcher" depends="init,compile">
diff --git a/java/lib.jshell.agent/nbproject/project.properties b/java/lib.jshell.agent/nbproject/project.properties
index dad68136d973..2d8dc06c4ffe 100644
--- a/java/lib.jshell.agent/nbproject/project.properties
+++ b/java/lib.jshell.agent/nbproject/project.properties
@@ -21,5 +21,5 @@ javac.compilerargs=-Xlint -Xlint:-serial
 extra.module.files=modules/ext/nb-custom-jshell-probe.jar,modules/ext/nb-mod-jshell-probe.jar
 jnlp.indirect.jars=modules/ext/nb-custom-jshell-probe.jar,modules/ext/nb-mod-jshell-probe.jar
 
-agentsrc.asm.cp=${libs.asm.dir}/core/asm-9.7.jar
+agentsrc.asm.cp=${libs.asm.dir}/core/asm-9.7.1.jar
 agentsrc.jshell.cp=external/jshell-9.jar
diff --git a/java/maven/build.xml b/java/maven/build.xml
index 0baa8b004303..c848f507f52b 100644
--- a/java/maven/build.xml
+++ b/java/maven/build.xml
@@ -55,8 +55,8 @@
         <!-- we use jarjar to repackage simple json, to avoid clashes with 3rd party maven plugins possibly including it in their dependencies -->
         <taskdef name="jarjar" classname="org.pantsbuild.jarjar.JarJarTask" loaderref="lib.path.loader">
             <classpath>
-                <pathelement location="${libs.asm.dir}/core/asm-9.7.jar"/>
-                <pathelement location="${libs.asm.dir}/core/asm-commons-9.7.jar"/>
+                <pathelement location="${libs.asm.dir}/core/asm-9.7.1.jar"/>
+                <pathelement location="${libs.asm.dir}/core/asm-commons-9.7.1.jar"/>
                 <pathelement location="./external/jarjar-1.7.2.jar"/>
             </classpath>
         </taskdef>
diff --git a/nbbuild/templates/common.xml b/nbbuild/templates/common.xml
index 073a2c1ca109..1b14cdd5f7e0 100644
--- a/nbbuild/templates/common.xml
+++ b/nbbuild/templates/common.xml
@@ -80,10 +80,10 @@
         <tstamp>
             <format property="module.build.started.time" pattern="yyyy-MM-dd'T'HH:mm:ss.SSSZ"/>
         </tstamp>
-        <condition property="asm.jar" value="${nbplatform.active.dir}/platform/core/asm-9.7.jar">
-            <available file="${nbplatform.active.dir}/platform/core/asm-9.7.jar"/>
+        <condition property="asm.jar" value="${nbplatform.active.dir}/platform/core/asm-9.7.1.jar">
+            <available file="${nbplatform.active.dir}/platform/core/asm-9.7.1.jar"/>
         </condition>
-        <property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.7.jar"/>
+        <property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.7.1.jar"/>
         <property name="tsaurl" value=""/>
         <property name="tsacert" value=""/>
     </target>
diff --git a/platform/libs.asm/external/asm-9.7-license.txt b/platform/libs.asm/external/asm-9.7.1-license.txt
similarity index 96%
rename from platform/libs.asm/external/asm-9.7-license.txt
rename to platform/libs.asm/external/asm-9.7.1-license.txt
index cd1e2c3ef22d..2f0c70874f8f 100644
--- a/platform/libs.asm/external/asm-9.7-license.txt
+++ b/platform/libs.asm/external/asm-9.7.1-license.txt
@@ -1,6 +1,6 @@
 Name: OW2 ASM
-Version: 9.7
-Files: asm-tree-9.7.jar asm-commons-9.7.jar asm-9.7.jar
+Version: 9.7.1
+Files: asm-tree-9.7.1.jar asm-commons-9.7.1.jar asm-9.7.1.jar
 License: BSD-INRIA
 Origin: OW2 Consortium
 URL: https://repository.ow2.org/nexus/content/repositories/releases/org/ow2/asm/
diff --git a/platform/libs.asm/external/binaries-list b/platform/libs.asm/external/binaries-list
index c686b4097812..5f898911f8cf 100755
--- a/platform/libs.asm/external/binaries-list
+++ b/platform/libs.asm/external/binaries-list
@@ -14,6 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-073D7B3086E14BEB604CED229C302FEFF6449723 org.ow2.asm:asm:9.7
-E446A17B175BFB733B87C5C2560CCB4E57D69F1A org.ow2.asm:asm-tree:9.7
-E86DDA4696D3C185FCC95D8D311904E7CE38A53F org.ow2.asm:asm-commons:9.7
+F0ED132A49244B042CD0E15702AB9F2CE3CC8436 org.ow2.asm:asm:9.7.1
+3A53139787663B139DE76B627FCA0084AB60D32C org.ow2.asm:asm-tree:9.7.1
+406C6A2225CFE1819F102A161E54CC16A5C24F75 org.ow2.asm:asm-commons:9.7.1
diff --git a/platform/libs.asm/nbproject/project.properties b/platform/libs.asm/nbproject/project.properties
index a4623cceb5dd..b35e4f0c343d 100644
--- a/platform/libs.asm/nbproject/project.properties
+++ b/platform/libs.asm/nbproject/project.properties
@@ -19,8 +19,8 @@ javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.8
 module.jar.dir=core
 
-release.external/asm-9.7.jar=core/asm-9.7.jar
-release.external/asm-tree-9.7.jar=core/asm-tree-9.7.jar
-release.external/asm-commons-9.7.jar=core/asm-commons-9.7.jar
-license.file=../external/asm-9.7-license.txt
+release.external/asm-9.7.1.jar=core/asm-9.7.1.jar
+release.external/asm-tree-9.7.1.jar=core/asm-tree-9.7.1.jar
+release.external/asm-commons-9.7.1.jar=core/asm-commons-9.7.1.jar
+license.file=../external/asm-9.7.1-license.txt
 
diff --git a/platform/libs.asm/nbproject/project.xml b/platform/libs.asm/nbproject/project.xml
index 820719f8ed8d..30e087c9ec2f 100644
--- a/platform/libs.asm/nbproject/project.xml
+++ b/platform/libs.asm/nbproject/project.xml
@@ -29,16 +29,16 @@
                 <subpackages>org</subpackages>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>asm-9.7.jar</runtime-relative-path>
-                <binary-origin>external/asm-9.7.jar</binary-origin>
+                <runtime-relative-path>asm-9.7.1.jar</runtime-relative-path>
+                <binary-origin>external/asm-9.7.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>asm-tree-9.7.jar</runtime-relative-path>
-                <binary-origin>external/asm-tree-9.7.jar</binary-origin>
+                <runtime-relative-path>asm-tree-9.7.1.jar</runtime-relative-path>
+                <binary-origin>external/asm-tree-9.7.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>asm-commons-9.7.jar</runtime-relative-path>
-                <binary-origin>external/asm-commons-9.7.jar</binary-origin>
+                <runtime-relative-path>asm-commons-9.7.1.jar</runtime-relative-path>
+                <binary-origin>external/asm-commons-9.7.1.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>