Skip to content

Update ASM from 9.9 to 9.10 #9397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbien wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update ASM from 9.9 to 9.10 #9397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions harness/apisupport.harness/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
<pathelement location="${cluster}/tasks.jar"></pathelement>
</classpath>
</taskdef>
<echo file="build/binaries-list">C29635C8A7AFA03D74B33C1884DF8ABB2B3F3DCC org.ow2.asm:asm:9.9</echo>
<echo file="build/binaries-list">A7BB37D71A6E5CA0DD1E66983BA8CC6BB8894332 org.ow2.asm:asm:9.10</echo>
<TestDownload server="${binaries.server}" repos="${binaries.repos}">
<manifest dir="build">
<include name="binaries-list"/>
</manifest>
</TestDownload>
<delete file="build/asm-9.9.jar"/>
<delete file="build/asm-9.10.jar"/>
</target>

<target name="compile-jnlp-launcher" depends="init,compile">
Expand Down
6 changes: 3 additions & 3 deletions ide/o.n.agent/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ javac.compilerargs=-Xlint -Xlint:-serial
agent.src.dir=src-agent
agent.build.classes.dir=${build.dir}/agent/classes/
agent.jar=${cluster}/netbeans-javaagent.jar
agent.asm.lib.1=../../platform/libs.asm/external/asm-commons-9.9.jar
agent.asm.lib.2=../../platform/libs.asm/external/asm-tree-9.9.jar
agent.asm.lib.3=../../platform/libs.asm/external/asm-9.9.jar
agent.asm.lib.1=../../platform/libs.asm/external/asm-commons-9.10.jar
agent.asm.lib.2=../../platform/libs.asm/external/asm-tree-9.10.jar
agent.asm.lib.3=../../platform/libs.asm/external/asm-9.10.jar
agent.cp=${agent.asm.lib.1}:${agent.asm.lib.2}:${agent.asm.lib.3}

extra.module.files=${cluster}/netbeans-javaagent.jar
2 changes: 1 addition & 1 deletion java/lib.jshell.agent/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
extra.module.files=modules/ext/nb-custom-jshell-probe.jar
jnlp.indirect.jars=modules/ext/nb-custom-jshell-probe.jar

agentsrc.asm.cp=${libs.asm.dir}/core/asm-9.9.jar
agentsrc.asm.cp=${libs.asm.dir}/core/asm-9.10.jar
4 changes: 2 additions & 2 deletions java/maven/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,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.9.jar"/>
<pathelement location="${libs.asm.dir}/core/asm-commons-9.9.jar"/>
<pathelement location="${libs.asm.dir}/core/asm-9.10.jar"/>
<pathelement location="${libs.asm.dir}/core/asm-commons-9.10.jar"/>
<pathelement location="./external/jarjar-1.7.2.jar"/>
</classpath>
</taskdef>
Expand Down
2 changes: 1 addition & 1 deletion nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ide/db.sql.visualeditor/external/javacc-7.0.10.jar java/performance/external/jav

# bundled maven conflicts with other libraries
java/maven.embedder/external/apache-maven-3.9.15-bin.zip ide/slf4j.api/external/slf4j-api-1.7.36.jar
java/maven.embedder/external/apache-maven-3.9.15-bin.zip platform/libs.asm/external/asm-9.9.jar
java/maven.embedder/external/apache-maven-3.9.15-bin.zip platform/libs.asm/external/asm-9.10.jar
java/maven.embedder/external/apache-maven-3.9.15-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.21.0.jar
java/maven.embedder/external/apache-maven-3.9.15-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.3.jar
java/maven.embedder/external/apache-maven-3.9.15-bin.zip ide/c.google.guava/external/guava-33.4.6-jre.jar
Expand Down
6 changes: 3 additions & 3 deletions nbbuild/templates/common.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,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.9.jar">
<available file="${nbplatform.active.dir}/platform/core/asm-9.9.jar"/>
<condition property="asm.jar" value="${nbplatform.active.dir}/platform/core/asm-9.10.jar">
<available file="${nbplatform.active.dir}/platform/core/asm-9.10.jar"/>
</condition>
<property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.9.jar"/>
<property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.10.jar"/>
<property name="tsaurl" value=""/>
<property name="tsacert" value=""/>
</target>
Expand Down
4 changes: 2 additions & 2 deletions ...orm/libs.asm/external/asm-9.9-license.txt → ...rm/libs.asm/external/asm-9.10-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: OW2 ASM
Version: 9.9
Files: asm-tree-9.9.jar asm-commons-9.9.jar asm-9.9.jar
Version: 9.10
Files: asm-tree-9.10.jar asm-commons-9.10.jar asm-9.10.jar
License: BSD-INRIA
Origin: OW2 Consortium
URL: https://repository.ow2.org/nexus/content/repositories/releases/org/ow2/asm/
Expand Down
6 changes: 3 additions & 3 deletions platform/libs.asm/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
C29635C8A7AFA03D74B33C1884DF8ABB2B3F3DCC org.ow2.asm:asm:9.9
F8DE6EEAD6D24DD0F45BD065BBE112B2CDA6EA21 org.ow2.asm:asm-tree:9.9
DB9165A3BF908DED6B08612D583A15D1D0C7BDA0 org.ow2.asm:asm-commons:9.9
A7BB37D71A6E5CA0DD1E66983BA8CC6BB8894332 org.ow2.asm:asm:9.10
ADCFE5104041E599764A657B6531252DA8AACCD0 org.ow2.asm:asm-tree:9.10
665EF9F42CF3B51B7CA98551651B3A3A8083D612 org.ow2.asm:asm-commons:9.10
8 changes: 4 additions & 4 deletions platform/libs.asm/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ javac.compilerargs=-Xlint -Xlint:-serial
javac.release=17
module.jar.dir=core

release.external/asm-9.9.jar=core/asm-9.9.jar
release.external/asm-tree-9.9.jar=core/asm-tree-9.9.jar
release.external/asm-commons-9.9.jar=core/asm-commons-9.9.jar
license.file=../external/asm-9.9-license.txt
release.external/asm-9.10.jar=core/asm-9.10.jar
release.external/asm-tree-9.10.jar=core/asm-tree-9.10.jar
release.external/asm-commons-9.10.jar=core/asm-commons-9.10.jar
license.file=../external/asm-9.10-license.txt

12 changes: 6 additions & 6 deletions platform/libs.asm/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@
<subpackages>org</subpackages>
</public-packages>
<class-path-extension>
<runtime-relative-path>asm-9.9.jar</runtime-relative-path>
<binary-origin>external/asm-9.9.jar</binary-origin>
<runtime-relative-path>asm-9.10.jar</runtime-relative-path>
<binary-origin>external/asm-9.10.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>asm-tree-9.9.jar</runtime-relative-path>
<binary-origin>external/asm-tree-9.9.jar</binary-origin>
<runtime-relative-path>asm-tree-9.10.jar</runtime-relative-path>
<binary-origin>external/asm-tree-9.10.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>asm-commons-9.9.jar</runtime-relative-path>
<binary-origin>external/asm-commons-9.9.jar</binary-origin>
<runtime-relative-path>asm-commons-9.10.jar</runtime-relative-path>
<binary-origin>external/asm-commons-9.10.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
Loading