From 05ce75f519a4f20c913ea1c5b7fbc2fd576d901f Mon Sep 17 00:00:00 2001 From: Young Date: Sat, 20 Aug 2022 21:49:44 +0800 Subject: [PATCH] release_1.3.4 to support jdk18 Signed-off-by: Young --- pom.xml | 4 ++-- sandbox-agent/pom.xml | 2 +- sandbox-api/pom.xml | 2 +- sandbox-common-api/pom.xml | 2 +- sandbox-core/pom.xml | 8 ++++---- .../jvm/sandbox/core/enhance/EventEnhancer.java | 4 ++-- .../core/enhance/weaver/asm/ReWriteMethod.java | 2 +- .../matcher/structure/ClassStructureImplByAsm.java | 11 +++++------ .../core/enhance/transformer/TestThirdEnhance.java | 4 ++-- sandbox-debug-module/pom.xml | 2 +- sandbox-mgr-module/pom.xml | 2 +- sandbox-mgr-provider/pom.xml | 2 +- sandbox-module-starter/pom.xml | 2 +- sandbox-provider-api/pom.xml | 2 +- sandbox-spy/pom.xml | 2 +- 15 files changed, 25 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index caa0c659..45022fe4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,14 +5,14 @@ com.alibaba.jvm.sandbox sandbox - 1.3.3 + 1.3.4 pom sandbox ${sandbox.version} UTF-8 - 1.3.3 + 1.3.4 diff --git a/sandbox-agent/pom.xml b/sandbox-agent/pom.xml index a4dfab24..999a073e 100755 --- a/sandbox-agent/pom.xml +++ b/sandbox-agent/pom.xml @@ -6,7 +6,7 @@ com.alibaba.jvm.sandbox sandbox - 1.3.3 + 1.3.4 sandbox-agent sandbox-agent ${sandbox.version} diff --git a/sandbox-api/pom.xml b/sandbox-api/pom.xml index f635b2d4..31f3b51c 100755 --- a/sandbox-api/pom.xml +++ b/sandbox-api/pom.xml @@ -6,7 +6,7 @@ com.alibaba.jvm.sandbox sandbox - 1.3.3 + 1.3.4 sandbox-api sandbox-api ${sandbox.version} diff --git a/sandbox-common-api/pom.xml b/sandbox-common-api/pom.xml index 5dfd0391..82e94aff 100644 --- a/sandbox-common-api/pom.xml +++ b/sandbox-common-api/pom.xml @@ -6,7 +6,7 @@ sandbox com.alibaba.jvm.sandbox - 1.3.3 + 1.3.4 sandbox-common-api sandbox-common-api ${sandbox.version} diff --git a/sandbox-core/pom.xml b/sandbox-core/pom.xml index 4b932d51..0ccb0e50 100644 --- a/sandbox-core/pom.xml +++ b/sandbox-core/pom.xml @@ -6,7 +6,7 @@ com.alibaba.jvm.sandbox sandbox - 1.3.3 + 1.3.4 sandbox-core sandbox-core ${sandbox.version} @@ -150,17 +150,17 @@ org.ow2.asm asm - 7.2 + 9.2 org.ow2.asm asm-commons - 7.2 + 9.2 org.ow2.asm asm-util - 7.2 + 9.2 diff --git a/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/enhance/EventEnhancer.java b/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/enhance/EventEnhancer.java index b35b1a40..f2dc09c6 100755 --- a/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/enhance/EventEnhancer.java +++ b/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/enhance/EventEnhancer.java @@ -17,7 +17,7 @@ import static org.objectweb.asm.ClassReader.EXPAND_FRAMES; import static org.objectweb.asm.ClassWriter.COMPUTE_FRAMES; import static org.objectweb.asm.ClassWriter.COMPUTE_MAXS; -import static org.objectweb.asm.Opcodes.ASM7; +import static org.objectweb.asm.Opcodes.ASM9; /** * 事件代码增强器 @@ -99,7 +99,7 @@ public byte[] toByteCodeArray(final ClassLoader targetClassLoader, final int targetClassLoaderObjectID = ObjectIDs.instance.identity(targetClassLoader); cr.accept( new EventWeaver( - ASM7, cw, namespace, listenerId, + ASM9, cw, namespace, listenerId, targetClassLoaderObjectID, cr.getClassName(), signCodes, diff --git a/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/enhance/weaver/asm/ReWriteMethod.java b/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/enhance/weaver/asm/ReWriteMethod.java index 211911a6..964f3e51 100755 --- a/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/enhance/weaver/asm/ReWriteMethod.java +++ b/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/enhance/weaver/asm/ReWriteMethod.java @@ -18,7 +18,7 @@ public class ReWriteMethod extends AdviceAdapter implements Opcodes, AsmTypes, A * Creates a new {@link AdviceAdapter}. * * @param api the ASM API version implemented by this visitor. Must be one - * of {@link Opcodes#ASM4} or {@link Opcodes#ASM7}. + * of {@link Opcodes#ASM4} or {@link Opcodes#ASM9}. * @param mv the method visitor to which this adapter delegates calls. * @param access the method's access flags (see {@link Opcodes}). * @param name the method's name. diff --git a/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/util/matcher/structure/ClassStructureImplByAsm.java b/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/util/matcher/structure/ClassStructureImplByAsm.java index b4467214..a50bd798 100644 --- a/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/util/matcher/structure/ClassStructureImplByAsm.java +++ b/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/util/matcher/structure/ClassStructureImplByAsm.java @@ -256,14 +256,14 @@ public class ClassStructureImplByAsm extends FamilyClassStructure { private Access fixAccess() { final AtomicInteger accessRef = new AtomicInteger(this.classReader.getAccess()); final String internalClassName = this.classReader.getClassName(); - this.classReader.accept(new ClassVisitor(ASM7) { + this.classReader.accept(new ClassVisitor(ASM9) { @Override public void visitInnerClass(String name, String outerName, String innerName, int access) { if (StringUtils.equals(name, internalClassName)) { accessRef.set(access); } } - }, ASM7); + }, ASM9); return new AccessImplByAsm(accessRef.get()); } @@ -402,7 +402,7 @@ public List getInterfaceClassStructures() { @Override protected List initialValue() { final List annotationTypeClassStructures = new ArrayList(); - accept(new ClassVisitor(ASM7) { + accept(new ClassVisitor(ASM9) { @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { @@ -431,8 +431,7 @@ public List getAnnotationTypeClassStructures() { @Override protected List initialValue() { final List behaviorStructures = new ArrayList(); - accept(new ClassVisitor(ASM7) { - + accept(new ClassVisitor(ASM9) { @Override public MethodVisitor visitMethod(final int access, final String name, @@ -446,7 +445,7 @@ public MethodVisitor visitMethod(final int access, return super.visitMethod(access, name, desc, signature, exceptions); } - return new MethodVisitor(ASM7, super.visitMethod(access, name, desc, signature, exceptions)) { + return new MethodVisitor(ASM9, super.visitMethod(access, name, desc, signature, exceptions)) { private final Type methodType = Type.getMethodType(desc); private final List annotationTypeClassStructures = new ArrayList(); diff --git a/sandbox-core/src/test/java/com/alibaba/jvm/sandbox/qatest/core/enhance/transformer/TestThirdEnhance.java b/sandbox-core/src/test/java/com/alibaba/jvm/sandbox/qatest/core/enhance/transformer/TestThirdEnhance.java index 540e5761..90722da7 100644 --- a/sandbox-core/src/test/java/com/alibaba/jvm/sandbox/qatest/core/enhance/transformer/TestThirdEnhance.java +++ b/sandbox-core/src/test/java/com/alibaba/jvm/sandbox/qatest/core/enhance/transformer/TestThirdEnhance.java @@ -22,7 +22,7 @@ import static org.objectweb.asm.ClassReader.EXPAND_FRAMES; import static org.objectweb.asm.ClassWriter.COMPUTE_FRAMES; import static org.objectweb.asm.ClassWriter.COMPUTE_MAXS; -import static org.objectweb.asm.Opcodes.ASM7; +import static org.objectweb.asm.Opcodes.ASM9; /** * 测试第三方增强冲突情况 @@ -42,7 +42,7 @@ public byte[] transform(ClassLoader loader, byte[] classfileBuffer){ // 返回增强后字节码 final ClassReader cr = new ClassReader(classfileBuffer); final ClassWriter cw = createClassWriter(loader, cr); - cr.accept(new ThirdClassVisitor(ASM7,cw,signCodes,cr.getClassName()), + cr.accept(new ThirdClassVisitor(ASM9,cw,signCodes,cr.getClassName()), EXPAND_FRAMES ); return dumpClassIfNecessary(cr.getClassName(), cw.toByteArray()); diff --git a/sandbox-debug-module/pom.xml b/sandbox-debug-module/pom.xml index 72b4a792..91d814b8 100644 --- a/sandbox-debug-module/pom.xml +++ b/sandbox-debug-module/pom.xml @@ -6,7 +6,7 @@ com.alibaba.jvm.sandbox sandbox-module-starter - 1.3.3 + 1.3.4 ../sandbox-module-starter/pom.xml sandbox-debug-module diff --git a/sandbox-mgr-module/pom.xml b/sandbox-mgr-module/pom.xml index a203ce0e..701f3082 100755 --- a/sandbox-mgr-module/pom.xml +++ b/sandbox-mgr-module/pom.xml @@ -6,7 +6,7 @@ com.alibaba.jvm.sandbox sandbox-module-starter - 1.3.3 + 1.3.4 ../sandbox-module-starter/pom.xml sandbox-mgr-module diff --git a/sandbox-mgr-provider/pom.xml b/sandbox-mgr-provider/pom.xml index 5e051a74..e0e51de9 100644 --- a/sandbox-mgr-provider/pom.xml +++ b/sandbox-mgr-provider/pom.xml @@ -6,7 +6,7 @@ sandbox com.alibaba.jvm.sandbox - 1.3.3 + 1.3.4 sandbox-mgr-provider sandbox-mgr-provider ${sandbox.version} diff --git a/sandbox-module-starter/pom.xml b/sandbox-module-starter/pom.xml index 29bb1f23..47c3371f 100644 --- a/sandbox-module-starter/pom.xml +++ b/sandbox-module-starter/pom.xml @@ -6,7 +6,7 @@ com.alibaba.jvm.sandbox sandbox - 1.3.3 + 1.3.4 sandbox-module-starter sandbox-module-starter ${sandbox.version} diff --git a/sandbox-provider-api/pom.xml b/sandbox-provider-api/pom.xml index 172bc500..a661fae6 100644 --- a/sandbox-provider-api/pom.xml +++ b/sandbox-provider-api/pom.xml @@ -6,7 +6,7 @@ sandbox com.alibaba.jvm.sandbox - 1.3.3 + 1.3.4 sandbox-provider-api sandbox-provider-api ${sandbox.version} diff --git a/sandbox-spy/pom.xml b/sandbox-spy/pom.xml index 1661f6b6..fb2ae248 100755 --- a/sandbox-spy/pom.xml +++ b/sandbox-spy/pom.xml @@ -6,7 +6,7 @@ com.alibaba.jvm.sandbox sandbox - 1.3.3 + 1.3.4 sandbox-spy sandbox-spy ${sandbox.version}