From e8ccb2477f2a425717a460e7ecad744d4d7d90a6 Mon Sep 17 00:00:00 2001 From: hht8 Date: Mon, 14 Sep 2020 11:32:33 +0800 Subject: [PATCH] update ASM --- 0001-update-ASM-to-eat-jdk12-bytecode.patch | 78 +++++++++++++++++++++ byteman.spec | 11 ++- 2 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 0001-update-ASM-to-eat-jdk12-bytecode.patch diff --git a/0001-update-ASM-to-eat-jdk12-bytecode.patch b/0001-update-ASM-to-eat-jdk12-bytecode.patch new file mode 100644 index 0000000..50c2b5d --- /dev/null +++ b/0001-update-ASM-to-eat-jdk12-bytecode.patch @@ -0,0 +1,78 @@ +From 9f8cfa58eb19e1c14140054554c58af2f900971c Mon Sep 17 00:00:00 2001 +From: Andrew Dinn +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 @@ + + -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -Dorg.jboss.byteman.verbose + +- 6.2 ++ 7.0-beta + + + diff --git a/byteman.spec b/byteman.spec index 8bfd488..9987343 100644 --- a/byteman.spec +++ b/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 - 4.0.4-5 +- update ASM to eat jdk bytecode + * Mon May 11 2020 Senlin Xia - 4.0.4-4 - update openjdk and use xmvn-javadoc for maven-javadoc-plugin