diff --git a/harness/apisupport.harness/build.xml b/harness/apisupport.harness/build.xml index 170678385224..abe65d7bf3a7 100644 --- a/harness/apisupport.harness/build.xml +++ b/harness/apisupport.harness/build.xml @@ -39,13 +39,13 @@ - C29635C8A7AFA03D74B33C1884DF8ABB2B3F3DCC org.ow2.asm:asm:9.9 + A7BB37D71A6E5CA0DD1E66983BA8CC6BB8894332 org.ow2.asm:asm:9.10 - + diff --git a/ide/o.n.agent/nbproject/project.properties b/ide/o.n.agent/nbproject/project.properties index 4079ed3b1ecd..fbfde1e04e47 100644 --- a/ide/o.n.agent/nbproject/project.properties +++ b/ide/o.n.agent/nbproject/project.properties @@ -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 \ No newline at end of file diff --git a/java/lib.jshell.agent/nbproject/project.properties b/java/lib.jshell.agent/nbproject/project.properties index 0ca87b9c6088..42de08800b9d 100644 --- a/java/lib.jshell.agent/nbproject/project.properties +++ b/java/lib.jshell.agent/nbproject/project.properties @@ -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 diff --git a/java/maven/build.xml b/java/maven/build.xml index c6e5210bbfbe..34c6edc20a5d 100644 --- a/java/maven/build.xml +++ b/java/maven/build.xml @@ -48,8 +48,8 @@ - - + + diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 9e62dc7965f7..580afd5ca114 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -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 diff --git a/nbbuild/templates/common.xml b/nbbuild/templates/common.xml index 6de819595775..929862a3d713 100644 --- a/nbbuild/templates/common.xml +++ b/nbbuild/templates/common.xml @@ -82,10 +82,10 @@ - - + + - + diff --git a/platform/libs.asm/external/asm-9.9-license.txt b/platform/libs.asm/external/asm-9.10-license.txt similarity index 96% rename from platform/libs.asm/external/asm-9.9-license.txt rename to platform/libs.asm/external/asm-9.10-license.txt index ba2c2f048370..e513e74ec14d 100644 --- a/platform/libs.asm/external/asm-9.9-license.txt +++ b/platform/libs.asm/external/asm-9.10-license.txt @@ -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/ diff --git a/platform/libs.asm/external/binaries-list b/platform/libs.asm/external/binaries-list index c500f4bee8af..9487715a8f0d 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. -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 diff --git a/platform/libs.asm/nbproject/project.properties b/platform/libs.asm/nbproject/project.properties index 4bf7befc70ea..42fca6d0c436 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.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 diff --git a/platform/libs.asm/nbproject/project.xml b/platform/libs.asm/nbproject/project.xml index 2f2c2510465b..8387da7336b5 100644 --- a/platform/libs.asm/nbproject/project.xml +++ b/platform/libs.asm/nbproject/project.xml @@ -29,16 +29,16 @@ org - asm-9.9.jar - external/asm-9.9.jar + asm-9.10.jar + external/asm-9.10.jar - asm-tree-9.9.jar - external/asm-tree-9.9.jar + asm-tree-9.10.jar + external/asm-tree-9.10.jar - asm-commons-9.9.jar - external/asm-commons-9.9.jar + asm-commons-9.10.jar + external/asm-commons-9.10.jar