Update asm from 9.4 to 9.5

- Use the lib from the platform directly instead of downloading it again for 'java/maven/build.xml' - Remove now unnecessary entry in ignored-overlaps file
georgemayko · Apr 3, 2023 · ea4e570 · ea4e570
1 parent 8f943c2
commit ea4e570
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 70 deletions.
diff --git 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">B4E0E2D2E023AA317B7CFCFC916377EA348E07D1 org.ow2.asm:asm:9.4</echo>
+        <echo file="build/binaries-list">DC6EA1875F4D64FBC85E1691C95B96A3D8569C90 org.ow2.asm:asm:9.5</echo>
         <TestDownload>
             <manifest dir="build">
                 <include name="binaries-list"/>
             </manifest>
         </TestDownload>
-        <delete file="build/asm-9.4.jar"/>
+        <delete file="build/asm-9.5.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
@@ -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.4.jar
+agentsrc.asm.cp=${libs.asm.dir}/core/asm-9.5.jar
 agentsrc.jshell.cp=${nb_all}/java/libs.jshell.compile/external/jshell-9.jar
diff --git a/java/maven/build.xml b/java/maven/build.xml
@@ -56,8 +56,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="./external/asm-9.4.jar"/>
-                <pathelement location="./external/asm-commons-9.4.jar"/>
+                <pathelement location="${libs.asm.dir}/core/asm-9.5.jar"/>
+                <pathelement location="${libs.asm.dir}/core/asm-commons-9.5.jar"/>
                 <pathelement location="./external/jarjar-1.7.2.jar"/>
             </classpath>
         </taskdef>

diff --git a/java/maven/external/asm-9.4-license.txt b/java/maven/external/asm-9.4-license.txt
diff --git a/java/maven/external/binaries-list b/java/maven/external/binaries-list
@@ -15,6 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 8E258F158B4572D40598D7F4793CFBFE84A7CC70 org.pantsbuild:jarjar:1.7.2
-B4E0E2D2E023AA317B7CFCFC916377EA348E07D1 org.ow2.asm:asm:9.4
-8FC2810DDBCBBEC0A8BBCCB3F8EDA58321839912 org.ow2.asm:asm-commons:9.4
 E48292EAE5E14EC44978AA53DEBB1AF7DDD6DF93 org.sonatype.aether:aether-api:1.13.1
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -45,9 +45,6 @@ enterprise/javaee.api/external/javax.annotation-api-1.2.jar java/maven.indexer/e
 enterprise/javaee7.api/external/javax.annotation-api-1.2.jar enterprise/javaee8.api/external/javax.annotation-api-1.2.jar
 enterprise/javaee8.api/external/javax.annotation-api-1.3.2.jar java/maven.embedder/external/apache-maven-3.9.1-bin.zip
 
-java/maven/external/asm-9.4.jar platform/libs.asm/external/asm-9.4.jar
-java/maven/external/asm-commons-9.4.jar platform/libs.asm/external/asm-commons-9.4.jar
-
 # jaxb-api-osgi is used by multiple modules.
 enterprise/javaee.api/external/jaxb-api-osgi-2.2.7.jar enterprise/javaee7.api/external/jaxb-api-osgi-2.2.7.jar
 

diff --git a/nbbuild/templates/common.xml b/nbbuild/templates/common.xml
@@ -79,10 +79,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.4.jar">
-            <available file="${nbplatform.active.dir}/platform/core/asm-9.4.jar"/>
+        <condition property="asm.jar" value="${nbplatform.active.dir}/platform/core/asm-9.5.jar">
+            <available file="${nbplatform.active.dir}/platform/core/asm-9.5.jar"/>
         </condition>
-        <property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.4.jar"/>
+        <property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.5.jar"/>
         <property name="tsaurl" value=""/>
         <property name="tsacert" value=""/>
     </target>

diff --git a/...orm/libs.asm/external/asm-9.4-license.txt → ...orm/libs.asm/external/asm-9.5-license.txt b/...orm/libs.asm/external/asm-9.4-license.txt → ...orm/libs.asm/external/asm-9.5-license.txt
@@ -1,6 +1,6 @@
 Name: OW2 ASM
-Version: 9.4
-Files: asm-tree-9.4.jar asm-commons-9.4.jar asm-9.4.jar
+Version: 9.5
+Files: asm-tree-9.5.jar asm-commons-9.5.jar asm-9.5.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
@@ -14,6 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-B4E0E2D2E023AA317B7CFCFC916377EA348E07D1 org.ow2.asm:asm:9.4
-A99175A17D7FDC18CBCBD0E8EA6A5D276844190A org.ow2.asm:asm-tree:9.4
-8FC2810DDBCBBEC0A8BBCCB3F8EDA58321839912 org.ow2.asm:asm-commons:9.4
+DC6EA1875F4D64FBC85E1691C95B96A3D8569C90 org.ow2.asm:asm:9.5
+FD33C8B6373ABAA675BE407082FDFDA35021254A org.ow2.asm:asm-tree:9.5
+19AB5B5800A3910D30D3A3E64FDB00FD0CB42DE0 org.ow2.asm:asm-commons:9.5
diff --git a/platform/libs.asm/nbproject/project.properties b/platform/libs.asm/nbproject/project.properties
@@ -19,7 +19,7 @@ javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.8
 module.jar.dir=core
 
-release.external/asm-9.4.jar=core/asm-9.4.jar
-release.external/asm-tree-9.4.jar=core/asm-tree-9.4.jar
-release.external/asm-commons-9.4.jar=core/asm-commons-9.4.jar
-license.file=../external/asm-9.4-license.txt
+release.external/asm-9.5.jar=core/asm-9.5.jar
+release.external/asm-tree-9.5.jar=core/asm-tree-9.5.jar
+release.external/asm-commons-9.5.jar=core/asm-commons-9.5.jar
+license.file=../external/asm-9.5-license.txt
diff --git 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.4.jar</runtime-relative-path>
-                <binary-origin>external/asm-9.4.jar</binary-origin>
+                <runtime-relative-path>asm-9.5.jar</runtime-relative-path>
+                <binary-origin>external/asm-9.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>asm-tree-9.4.jar</runtime-relative-path>
-                <binary-origin>external/asm-tree-9.4.jar</binary-origin>
+                <runtime-relative-path>asm-tree-9.5.jar</runtime-relative-path>
+                <binary-origin>external/asm-tree-9.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>asm-commons-9.4.jar</runtime-relative-path>
-                <binary-origin>external/asm-commons-9.4.jar</binary-origin>
+                <runtime-relative-path>asm-commons-9.5.jar</runtime-relative-path>
+                <binary-origin>external/asm-commons-9.5.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>