update ASM

0001-update-ASM-to-eat-jdk12-bytecode.patch

@@ -0,0 +1,78 @@
+From 9f8cfa58eb19e1c14140054554c58af2f900971c Mon Sep 17 00:00:00 2001
+From: Andrew Dinn <adinn@redhat.com>
+Date: Wed, 24 Oct 2018 17:10:27 +0100
+Subject: [PATCH] update ASM to eat jdk12 bytecode
+
+---
+ .../main/java/org/jboss/byteman/agent/adapter/BMJSRInliner.java | 2 +-
+ .../org/jboss/byteman/agent/adapter/BMLocalScopeAdapter.java    | 2 +-
+ .../main/java/org/jboss/byteman/agent/adapter/RuleAdapter.java  | 2 +-
+ .../org/jboss/byteman/agent/check/ClassStructureAdapter.java    | 2 +-
+ pom.xml                                                         | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/agent/src/main/java/org/jboss/byteman/agent/adapter/BMJSRInliner.java b/agent/src/main/java/org/jboss/byteman/agent/adapter/BMJSRInliner.java
+index 4627c8af..fd24681a 100644
+--- a/agent/src/main/java/org/jboss/byteman/agent/adapter/BMJSRInliner.java
++++ b/agent/src/main/java/org/jboss/byteman/agent/adapter/BMJSRInliner.java
+@@ -35,7 +35,7 @@
+ {
+     public BMJSRInliner(ClassVisitor cv)
+     {
+-        super(Opcodes.ASM7_EXPERIMENTAL, cv);
++        super(Opcodes.ASM7, cv);
+     }
+ 
+     @Override
+diff --git a/agent/src/main/java/org/jboss/byteman/agent/adapter/BMLocalScopeAdapter.java b/agent/src/main/java/org/jboss/byteman/agent/adapter/BMLocalScopeAdapter.java
+index c8197634..60d15d0f 100644
+--- a/agent/src/main/java/org/jboss/byteman/agent/adapter/BMLocalScopeAdapter.java
++++ b/agent/src/main/java/org/jboss/byteman/agent/adapter/BMLocalScopeAdapter.java
+@@ -34,7 +34,7 @@
+ {
+     public BMLocalScopeAdapter(ClassVisitor cv)
+     {
+-        super(OpcodesHelper.ASM7_EXPERIMENTAL, cv);
++        super(OpcodesHelper.ASM7, cv);
+     }
+ 
+     @Override
+diff --git a/agent/src/main/java/org/jboss/byteman/agent/adapter/RuleAdapter.java b/agent/src/main/java/org/jboss/byteman/agent/adapter/RuleAdapter.java
+index 31c52c4a..8ffc7186 100644
+--- a/agent/src/main/java/org/jboss/byteman/agent/adapter/RuleAdapter.java
++++ b/agent/src/main/java/org/jboss/byteman/agent/adapter/RuleAdapter.java
+@@ -34,7 +34,7 @@
+ {
+     protected RuleAdapter(ClassVisitor cv, TransformContext transformContext)
+     {
+-        super(Opcodes.ASM7_EXPERIMENTAL, cv);
++        super(Opcodes.ASM7, cv);
+         this.transformContext =  transformContext;
+     }
+ 
+diff --git a/agent/src/main/java/org/jboss/byteman/agent/check/ClassStructureAdapter.java b/agent/src/main/java/org/jboss/byteman/agent/check/ClassStructureAdapter.java
+index 7859252d..53fecb7c 100644
+--- a/agent/src/main/java/org/jboss/byteman/agent/check/ClassStructureAdapter.java
++++ b/agent/src/main/java/org/jboss/byteman/agent/check/ClassStructureAdapter.java
+@@ -38,7 +38,7 @@
+     private String superName = null;
+     private String outerClass = null;
+ 
+-    public ClassStructureAdapter() { super(Opcodes.ASM7_EXPERIMENTAL); }
++    public ClassStructureAdapter() { super(Opcodes.ASM7); }
+ 
+     public boolean isInterface() {
+         return isInterface;
+diff --git a/pom.xml b/pom.xml
+index f3d39858..198de97e 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -106,7 +106,7 @@
+         <!-- for testing: command line args to enable debugger and verbose trace -->
+         <debug.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -Dorg.jboss.byteman.verbose</debug.args>
+         <!-- asm release version to use -->
+-        <asm.version>6.2</asm.version>
++        <asm.version>7.0-beta</asm.version>
+     </properties>
+ 
+     <dependencyManagement>

byteman.spec

@@ -1,6 +1,6 @@
 Name:             byteman
 Version:          4.0.4
-Release:          4 
+Release:          5
 Summary:          Injection of track and test into Java programs
 License:          LGPLv2+
 URL:              https://byteman.jboss.org/
@@ -16,7 +16,8 @@ BuildRequires:    maven-dependency-plugin java_cup jarjar objectweb-asm junit te
 BuildRequires:    mvn(org.jboss.modules:jboss-modules)
 Provides:         bundled(objectweb-asm) = 6.2 bundled(java_cup) = 1:0.11b-8
 Requires:         java-headless >= 1:1.8
-Patch1:           remove_submit_integration_test_verification.patch
+Patch0000:        remove_submit_integration_test_verification.patch
+Patch0001:        0001-update-ASM-to-eat-jdk12-bytecode.patch
 
 %description
 Byteman is a tool which makes it easy to trace, monitor and test the behaviour \
@@ -67,7 +68,8 @@ done
 for id in submit.TestSubmit submit.TestSubmit.compiled; do
 %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-failsafe-plugin']/pom:executions/pom:execution[pom:id='${id}']" agent
 done
-%patch1 -p2
+%patch0000 -p2
+%patch0001 -p1
 
 for id in submit.TestSubmit submit.TestSubmit.compiled; do
 %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-failsafe-plugin']/pom:executions/pom:execution[pom:id='${id}']" tests
@@ -150,6 +152,9 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{_datadir}/byteman/lib/byt
 %{_datadir}/byteman/lib/byteman-dtest.jar
 
 %changelog
+* Mon Sep 14 2020 huanghaitao <huanghaitao8@huawei.com> - 4.0.4-5
+- update ASM to eat jdk bytecode
+
 * Mon May 11 2020 Senlin Xia <xiasenlin1@huawei.com> - 4.0.4-4
 - update openjdk and use xmvn-javadoc for maven-javadoc-plugin