This is an automated email from the ASF dual-hosted git repository.
pepness pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new ea4e57043d Update asm from 9.4 to 9.5
new 9fc937253b Merge pull request #5751 from pepness/asm-9.5
ea4e57043d is described below
commit ea4e57043db5332b359de3b315c3735ae2994e47
Author: José Contreras <[email protected]>
AuthorDate: Mon Apr 3 17:15:40 2023 -0600
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
---
harness/apisupport.harness/build.xml | 4 +--
java/lib.jshell.agent/nbproject/project.properties | 2 +-
java/maven/build.xml | 4 +--
java/maven/external/asm-9.4-license.txt | 42 ----------------------
java/maven/external/binaries-list | 2 --
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 3 --
nbbuild/templates/common.xml | 6 ++--
.../{asm-9.4-license.txt => asm-9.5-license.txt} | 4 +--
platform/libs.asm/external/binaries-list | 6 ++--
platform/libs.asm/nbproject/project.properties | 8 ++---
platform/libs.asm/nbproject/project.xml | 12 +++----
11 files changed, 23 insertions(+), 70 deletions(-)
diff --git a/harness/apisupport.harness/build.xml
b/harness/apisupport.harness/build.xml
index aa12e50600..2e4f9d833e 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">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
index e9908fa5ff..9a58d0e75f 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.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
index eb3885b28e..6bd5eb7fd1 100644
--- 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
deleted file mode 100644
index b1fa17d0fb..0000000000
--- a/java/maven/external/asm-9.4-license.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-Name: ASM
-Description: ASM is an all purpose Java bytecode manipulation and analysis
framework
-Origin: https://asm.ow2.io/
-Version: 9.4
-License: ASM
-URL: https://asm.ow2.io/
-Files: asm-9.4.jar, asm-commons-9.4.jar
-Type: compile-time
-Comment: Used to build ueber-jar bundling for simple json library into
NbEventSpy
-
-ASM License
-
-ASM: a very small and fast Java bytecode manipulation framework
-Copyright (c) 2000-2011 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/java/maven/external/binaries-list
b/java/maven/external/binaries-list
index 1cf2d410d9..d448e40002 100644
--- 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
index 471b212f7a..279598545c 100644
--- 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
index 8f9aebc50d..ed6f32c25d 100644
--- 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/platform/libs.asm/external/asm-9.4-license.txt
b/platform/libs.asm/external/asm-9.5-license.txt
similarity index 96%
rename from platform/libs.asm/external/asm-9.4-license.txt
rename to platform/libs.asm/external/asm-9.5-license.txt
index 5fa2af68b7..a8c09a620f 100644
--- a/platform/libs.asm/external/asm-9.4-license.txt
+++ b/platform/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
index dcb39e7454..34219d26ea 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.
-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
index 05112652d2..11534ea4ca 100644
--- 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
index fcf6778896..6045f41070 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.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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
