You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2021/07/15 08:56:54 UTC
[netbeans] branch master updated: Update asm from 8.0.1 to 9.2
This is an automated email from the ASF dual-hosted git repository.
skygo 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 3117964 Update asm from 8.0.1 to 9.2
new 809c00f Merge pull request #2863 from pepness/asm-9.1
3117964 is described below
commit 3117964b0b708d8fba3b404e2a75312942368e51
Author: Jose Contreras <pe...@gmail.com>
AuthorDate: Mon Mar 22 18:11:58 2021 -0600
Update asm from 8.0.1 to 9.2
-Update ASM API version
---
.../modules/javaee/wildfly/WildflyDeploymentFactory.java | 2 +-
harness/apisupport.harness/build.xml | 4 ++--
.../org/netbeans/lib/jshell/agent/NbJShellAgent.java | 4 ++--
java/lib.jshell.agent/nbproject/project.properties | 2 +-
nbbuild/templates/common.xml | 6 +++---
.../core.startup/src/org/netbeans/core/startup/Asm.java | 14 +++++++-------
.../{asm-8.0.1-license.txt => asm-9.2-license.txt} | 4 ++--
platform/libs.asm/external/binaries-list | 6 +++---
platform/libs.asm/nbproject/project.properties | 8 ++++----
platform/libs.asm/nbproject/project.xml | 12 ++++++------
10 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentFactory.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentFactory.java
index 466165c..a6b1924 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentFactory.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentFactory.java
@@ -153,7 +153,7 @@ public class WildflyDeploymentFactory implements DeploymentFactory {
return super.getCommonSuperClass(string, string1);
}
};
- ClassNode node = new ClassNode(Opcodes.ASM7);
+ ClassNode node = new ClassNode(Opcodes.ASM9);
cr.accept(node, 0);
for (MethodNode m : (Collection<MethodNode>) node.methods) {
diff --git a/harness/apisupport.harness/build.xml b/harness/apisupport.harness/build.xml
index abf7eb4..cab9251 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">3F5199523FB95304B44563F5D56D9F5A07270669 org.ow2.asm:asm:8.0.1</echo>
+ <echo file="build/binaries-list">81A03F76019C67362299C40E0BA13405F5467BFF org.ow2.asm:asm:9.2</echo>
<TestDownload>
<manifest dir="build">
<include name="binaries-list"/>
</manifest>
</TestDownload>
- <delete file="build/asm-8.0.1.jar"/>
+ <delete file="build/asm-9.2.jar"/>
</target>
<target name="compile-jnlp-launcher" depends="init,compile">
diff --git a/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/NbJShellAgent.java b/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/NbJShellAgent.java
index 8fd0ee3..2fccafd 100644
--- a/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/NbJShellAgent.java
+++ b/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/NbJShellAgent.java
@@ -377,7 +377,7 @@ public class NbJShellAgent implements Runnable, ClassFileTransformer {
*/
private void insertClassInit(String className, ClassNode target) {
// method void static clinit()
- MethodNode clinit = new MethodNode(Opcodes.ASM7,
+ MethodNode clinit = new MethodNode(Opcodes.ASM9,
Opcodes.ACC_STATIC | Opcodes.ACC_SYNTHETIC,
CLASS_INIT_NAME,
CLASS_INIT_DESC,
@@ -400,7 +400,7 @@ public class NbJShellAgent implements Runnable, ClassFileTransformer {
istm = new ByteArrayInputStream(classfileBuffer);
ClassReader reader = new ClassReader(istm);
ClassWriter wr = new ClassWriter(reader, 0);
- ClassNode clazz = new ClassNode(Opcodes.ASM7);
+ ClassNode clazz = new ClassNode(Opcodes.ASM9);
reader.accept(clazz, 0);
boolean found = false;
diff --git a/java/lib.jshell.agent/nbproject/project.properties b/java/lib.jshell.agent/nbproject/project.properties
index e8ee891..de4c0e9 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-8.0.1.jar
+agentsrc.asm.cp=${libs.asm.dir}/core/asm-9.2.jar
agentsrc.jshell.cp=${nb_all}/java/libs.jshell.compile/external/jshell-9.jar
diff --git a/nbbuild/templates/common.xml b/nbbuild/templates/common.xml
index fcac762..7449f0a 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-8.0.1.jar">
- <available file="${nbplatform.active.dir}/platform/core/asm-8.0.1.jar"/>
+ <condition property="asm.jar" value="${nbplatform.active.dir}/platform/core/asm-9.2.jar">
+ <available file="${nbplatform.active.dir}/platform/core/asm-9.2.jar"/>
</condition>
- <property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-8.0.1.jar"/>
+ <property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.2.jar"/>
<property name="tsaurl" value=""/>
<property name="tsacert" value=""/>
</target>
diff --git a/platform/core.startup/src/org/netbeans/core/startup/Asm.java b/platform/core.startup/src/org/netbeans/core/startup/Asm.java
index ed2bb7e..65c6573 100644
--- a/platform/core.startup/src/org/netbeans/core/startup/Asm.java
+++ b/platform/core.startup/src/org/netbeans/core/startup/Asm.java
@@ -57,7 +57,7 @@ final class Asm {
// must analyze the extender class, as some annotations there may trigger
ClassReader clr = new ClassReader(data);
ClassWriter wr = new ClassWriter(clr, 0);
- ClassNode theClass = new ClassNode(Opcodes.ASM7);
+ ClassNode theClass = new ClassNode(Opcodes.ASM9);
clr.accept(theClass, 0);
@@ -74,7 +74,7 @@ final class Asm {
throw new IOException("Could not find classfile for extender class"); // NOI18N
}
ClassReader extenderReader = new ClassReader(istm);
- ClassNode extenderClass = new ClassNode(Opcodes.ASM7);
+ ClassNode extenderClass = new ClassNode(Opcodes.ASM9);
extenderReader.accept(extenderClass, ClassReader.SKIP_FRAMES);
// search for a no-arg ctor, replace all invokespecial calls in ctors
@@ -145,7 +145,7 @@ final class Asm {
*/
private static class NullSignVisitor extends SignatureVisitor {
public NullSignVisitor() {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM9);
}
}
@@ -168,13 +168,13 @@ final class Asm {
* @param firstSelf if true, assumes the first parameter is reference to self and will generate aload_0
*/
public CallParametersWriter(MethodNode mn, boolean firstSelf) {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM9);
this.mn = mn;
this.paramIndex = firstSelf ? 0 : 1;
}
public CallParametersWriter(MethodNode mn, int[] indices) {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM9);
this.mn = mn;
this.paramIndices = indices;
}
@@ -387,11 +387,11 @@ final class Asm {
MethodNode noArgCtor
) {
String desc = targetMethod.desc;
- CtorDelVisitor v = new CtorDelVisitor(Opcodes.ASM7);
+ CtorDelVisitor v = new CtorDelVisitor(Opcodes.ASM9);
an.accept(v);
int nextPos = desc.indexOf(';', 2); // NOI18N
desc = "(" + desc.substring(nextPos + 1); // NOI18N
- MethodNode mn = new MethodNode(Opcodes.ASM7,
+ MethodNode mn = new MethodNode(Opcodes.ASM9,
targetMethod.access & (~Opcodes.ACC_STATIC), CONSTRUCTOR_NAME,
desc,
targetMethod.signature,
diff --git a/platform/libs.asm/external/asm-8.0.1-license.txt b/platform/libs.asm/external/asm-9.2-license.txt
similarity index 96%
rename from platform/libs.asm/external/asm-8.0.1-license.txt
rename to platform/libs.asm/external/asm-9.2-license.txt
index 16c1579..c66790f 100644
--- a/platform/libs.asm/external/asm-8.0.1-license.txt
+++ b/platform/libs.asm/external/asm-9.2-license.txt
@@ -1,6 +1,6 @@
Name: OW2 ASM
-Version: 8.0.1
-Files: asm-tree-8.0.1.jar asm-commons-8.0.1.jar asm-8.0.1.jar
+Version: 9.2
+Files: asm-tree-9.2.jar asm-commons-9.2.jar asm-9.2.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 39f46d5..043d3bc 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.
-3F5199523FB95304B44563F5D56D9F5A07270669 org.ow2.asm:asm:8.0.1
-DFCAD5ABBCFF36F8BDAD5647FE6F4972E958AD59 org.ow2.asm:asm-tree:8.0.1
-019C7BA355F0737815205518E332A8DC08B417C6 org.ow2.asm:asm-commons:8.0.1
+81A03F76019C67362299C40E0BA13405F5467BFF org.ow2.asm:asm:9.2
+D96C99A30F5E1A19B0E609DBB19A44D8518AC01E org.ow2.asm:asm-tree:9.2
+F4D7F0FC9054386F2893B602454D48E07D4FBEAD org.ow2.asm:asm-commons:9.2
diff --git a/platform/libs.asm/nbproject/project.properties b/platform/libs.asm/nbproject/project.properties
index 150f2b0..de0d23f 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-8.0.1.jar=core/asm-8.0.1.jar
-release.external/asm-tree-8.0.1.jar=core/asm-tree-8.0.1.jar
-release.external/asm-commons-8.0.1.jar=core/asm-commons-8.0.1.jar
-license.file=../external/asm-8.0.1-license.txt
+release.external/asm-9.2.jar=core/asm-9.2.jar
+release.external/asm-tree-9.2.jar=core/asm-tree-9.2.jar
+release.external/asm-commons-9.2.jar=core/asm-commons-9.2.jar
+license.file=../external/asm-9.2-license.txt
diff --git a/platform/libs.asm/nbproject/project.xml b/platform/libs.asm/nbproject/project.xml
index e0ce859..0c2cb54 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-8.0.1.jar</runtime-relative-path>
- <binary-origin>external/asm-8.0.1.jar</binary-origin>
+ <runtime-relative-path>asm-9.2.jar</runtime-relative-path>
+ <binary-origin>external/asm-9.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>asm-tree-8.0.1.jar</runtime-relative-path>
- <binary-origin>external/asm-tree-8.0.1.jar</binary-origin>
+ <runtime-relative-path>asm-tree-9.2.jar</runtime-relative-path>
+ <binary-origin>external/asm-tree-9.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>asm-commons-8.0.1.jar</runtime-relative-path>
- <binary-origin>external/asm-commons-8.0.1.jar</binary-origin>
+ <runtime-relative-path>asm-commons-9.2.jar</runtime-relative-path>
+ <binary-origin>external/asm-commons-9.2.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists