From b64e18e1c59b38eec7e77ba5ab005651ef0cadda Mon Sep 17 00:00:00 2001
From: hengyunabc <hengyunabc@gmail.com>
Date: Mon, 2 Nov 2020 17:26:13 +0800
Subject: [PATCH] upgrade bytekit to 0.0.2. #1545

---
 .../arthas/core/advisor/ArthasMethod.java     |  2 +-
 .../taobao/arthas/core/advisor/Enhancer.java  | 38 +++++++++----------
 .../arthas/core/advisor/SpyInterceptors.java  | 12 +++---
 .../command/klass100/RedefineCommand.java     |  2 +-
 .../core/command/logger/AsmRenameUtil.java    | 10 ++---
 .../taobao/arthas/core/util/ClassUtils.java   |  2 +-
 .../arthas/core/advisor/EnhancerTest.java     | 10 ++---
 .../arthas/core/bytecode/TestHelper.java      | 18 ++++-----
 pom.xml                                       |  7 ++--
 9 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/core/src/main/java/com/taobao/arthas/core/advisor/ArthasMethod.java b/core/src/main/java/com/taobao/arthas/core/advisor/ArthasMethod.java
index 0672c11d6..6f3a74bc5 100644
--- a/core/src/main/java/com/taobao/arthas/core/advisor/ArthasMethod.java
+++ b/core/src/main/java/com/taobao/arthas/core/advisor/ArthasMethod.java
@@ -4,7 +4,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import com.alibaba.arthas.deps.org.objectweb.asm.Type;
+import com.alibaba.deps.org.objectweb.asm.Type;
 import com.taobao.arthas.core.util.StringUtils;
 
 /**
diff --git a/core/src/main/java/com/taobao/arthas/core/advisor/Enhancer.java b/core/src/main/java/com/taobao/arthas/core/advisor/Enhancer.java
index 6704ebf27..ecb1e318b 100644
--- a/core/src/main/java/com/taobao/arthas/core/advisor/Enhancer.java
+++ b/core/src/main/java/com/taobao/arthas/core/advisor/Enhancer.java
@@ -21,27 +21,27 @@ import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;
 
-import com.alibaba.arthas.deps.org.objectweb.asm.ClassReader;
-import com.alibaba.arthas.deps.org.objectweb.asm.Opcodes;
-import com.alibaba.arthas.deps.org.objectweb.asm.Type;
-import com.alibaba.arthas.deps.org.objectweb.asm.tree.AbstractInsnNode;
-import com.alibaba.arthas.deps.org.objectweb.asm.tree.ClassNode;
-import com.alibaba.arthas.deps.org.objectweb.asm.tree.MethodInsnNode;
-import com.alibaba.arthas.deps.org.objectweb.asm.tree.MethodNode;
+import com.alibaba.deps.org.objectweb.asm.ClassReader;
+import com.alibaba.deps.org.objectweb.asm.Opcodes;
+import com.alibaba.deps.org.objectweb.asm.Type;
+import com.alibaba.deps.org.objectweb.asm.tree.AbstractInsnNode;
+import com.alibaba.deps.org.objectweb.asm.tree.ClassNode;
+import com.alibaba.deps.org.objectweb.asm.tree.MethodInsnNode;
+import com.alibaba.deps.org.objectweb.asm.tree.MethodNode;
 import com.alibaba.arthas.deps.org.slf4j.Logger;
 import com.alibaba.arthas.deps.org.slf4j.LoggerFactory;
-import com.taobao.arthas.bytekit.asm.MethodProcessor;
-import com.taobao.arthas.bytekit.asm.interceptor.InterceptorProcessor;
-import com.taobao.arthas.bytekit.asm.interceptor.parser.DefaultInterceptorClassParser;
-import com.taobao.arthas.bytekit.asm.location.Location;
-import com.taobao.arthas.bytekit.asm.location.LocationType;
-import com.taobao.arthas.bytekit.asm.location.MethodInsnNodeWare;
-import com.taobao.arthas.bytekit.asm.location.filter.GroupLocationFilter;
-import com.taobao.arthas.bytekit.asm.location.filter.InvokeCheckLocationFilter;
-import com.taobao.arthas.bytekit.asm.location.filter.InvokeContainLocationFilter;
-import com.taobao.arthas.bytekit.asm.location.filter.LocationFilter;
-import com.taobao.arthas.bytekit.utils.AsmOpUtils;
-import com.taobao.arthas.bytekit.utils.AsmUtils;
+import com.alibaba.bytekit.asm.MethodProcessor;
+import com.alibaba.bytekit.asm.interceptor.InterceptorProcessor;
+import com.alibaba.bytekit.asm.interceptor.parser.DefaultInterceptorClassParser;
+import com.alibaba.bytekit.asm.location.Location;
+import com.alibaba.bytekit.asm.location.LocationType;
+import com.alibaba.bytekit.asm.location.MethodInsnNodeWare;
+import com.alibaba.bytekit.asm.location.filter.GroupLocationFilter;
+import com.alibaba.bytekit.asm.location.filter.InvokeCheckLocationFilter;
+import com.alibaba.bytekit.asm.location.filter.InvokeContainLocationFilter;
+import com.alibaba.bytekit.asm.location.filter.LocationFilter;
+import com.alibaba.bytekit.utils.AsmOpUtils;
+import com.alibaba.bytekit.utils.AsmUtils;
 import com.taobao.arthas.core.GlobalOptions;
 import com.taobao.arthas.core.advisor.SpyInterceptors.SpyInterceptor1;
 import com.taobao.arthas.core.advisor.SpyInterceptors.SpyInterceptor2;
diff --git a/core/src/main/java/com/taobao/arthas/core/advisor/SpyInterceptors.java b/core/src/main/java/com/taobao/arthas/core/advisor/SpyInterceptors.java
index 0d73c5443..027d1044d 100644
--- a/core/src/main/java/com/taobao/arthas/core/advisor/SpyInterceptors.java
+++ b/core/src/main/java/com/taobao/arthas/core/advisor/SpyInterceptors.java
@@ -2,12 +2,12 @@ package com.taobao.arthas.core.advisor;
 
 import java.arthas.SpyAPI;
 
-import com.taobao.arthas.bytekit.asm.binding.Binding;
-import com.taobao.arthas.bytekit.asm.interceptor.annotation.AtEnter;
-import com.taobao.arthas.bytekit.asm.interceptor.annotation.AtExceptionExit;
-import com.taobao.arthas.bytekit.asm.interceptor.annotation.AtExit;
-import com.taobao.arthas.bytekit.asm.interceptor.annotation.AtInvoke;
-import com.taobao.arthas.bytekit.asm.interceptor.annotation.AtInvokeException;
+import com.alibaba.bytekit.asm.binding.Binding;
+import com.alibaba.bytekit.asm.interceptor.annotation.AtEnter;
+import com.alibaba.bytekit.asm.interceptor.annotation.AtExceptionExit;
+import com.alibaba.bytekit.asm.interceptor.annotation.AtExit;
+import com.alibaba.bytekit.asm.interceptor.annotation.AtInvoke;
+import com.alibaba.bytekit.asm.interceptor.annotation.AtInvokeException;
 
 /**
  * 
diff --git a/core/src/main/java/com/taobao/arthas/core/command/klass100/RedefineCommand.java b/core/src/main/java/com/taobao/arthas/core/command/klass100/RedefineCommand.java
index 60ac3762d..b720e8161 100644
--- a/core/src/main/java/com/taobao/arthas/core/command/klass100/RedefineCommand.java
+++ b/core/src/main/java/com/taobao/arthas/core/command/klass100/RedefineCommand.java
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Collection;
 
-import com.alibaba.arthas.deps.org.objectweb.asm.ClassReader;
+import com.alibaba.deps.org.objectweb.asm.ClassReader;
 import com.alibaba.arthas.deps.org.slf4j.Logger;
 import com.alibaba.arthas.deps.org.slf4j.LoggerFactory;
 import com.taobao.arthas.core.command.Constants;
diff --git a/core/src/main/java/com/taobao/arthas/core/command/logger/AsmRenameUtil.java b/core/src/main/java/com/taobao/arthas/core/command/logger/AsmRenameUtil.java
index 8a3f3da1d..637c2e42b 100644
--- a/core/src/main/java/com/taobao/arthas/core/command/logger/AsmRenameUtil.java
+++ b/core/src/main/java/com/taobao/arthas/core/command/logger/AsmRenameUtil.java
@@ -1,10 +1,10 @@
 package com.taobao.arthas.core.command.logger;
 
-import com.alibaba.arthas.deps.org.objectweb.asm.ClassReader;
-import com.alibaba.arthas.deps.org.objectweb.asm.ClassVisitor;
-import com.alibaba.arthas.deps.org.objectweb.asm.ClassWriter;
-import com.alibaba.arthas.deps.org.objectweb.asm.commons.ClassRemapper;
-import com.alibaba.arthas.deps.org.objectweb.asm.commons.SimpleRemapper;
+import com.alibaba.deps.org.objectweb.asm.ClassReader;
+import com.alibaba.deps.org.objectweb.asm.ClassVisitor;
+import com.alibaba.deps.org.objectweb.asm.ClassWriter;
+import com.alibaba.deps.org.objectweb.asm.commons.ClassRemapper;
+import com.alibaba.deps.org.objectweb.asm.commons.SimpleRemapper;
 
 /**
  * 
diff --git a/core/src/main/java/com/taobao/arthas/core/util/ClassUtils.java b/core/src/main/java/com/taobao/arthas/core/util/ClassUtils.java
index ea4f18df0..0d6ca77ae 100644
--- a/core/src/main/java/com/taobao/arthas/core/util/ClassUtils.java
+++ b/core/src/main/java/com/taobao/arthas/core/util/ClassUtils.java
@@ -10,7 +10,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
-import com.alibaba.arthas.deps.org.objectweb.asm.Type;
+import com.alibaba.deps.org.objectweb.asm.Type;
 import com.taobao.arthas.core.command.model.ClassDetailVO;
 import com.taobao.arthas.core.command.model.ClassLoaderVO;
 import com.taobao.arthas.core.command.model.ClassVO;
diff --git a/core/src/test/java/com/taobao/arthas/core/advisor/EnhancerTest.java b/core/src/test/java/com/taobao/arthas/core/advisor/EnhancerTest.java
index c514149f2..622af097b 100644
--- a/core/src/test/java/com/taobao/arthas/core/advisor/EnhancerTest.java
+++ b/core/src/test/java/com/taobao/arthas/core/advisor/EnhancerTest.java
@@ -11,11 +11,11 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.zeroturnaround.zip.ZipUtil;
 
-import com.alibaba.arthas.deps.org.objectweb.asm.Type;
-import com.alibaba.arthas.deps.org.objectweb.asm.tree.ClassNode;
-import com.alibaba.arthas.deps.org.objectweb.asm.tree.MethodNode;
-import com.taobao.arthas.bytekit.utils.AsmUtils;
-import com.taobao.arthas.bytekit.utils.Decompiler;
+import com.alibaba.deps.org.objectweb.asm.Type;
+import com.alibaba.deps.org.objectweb.asm.tree.ClassNode;
+import com.alibaba.deps.org.objectweb.asm.tree.MethodNode;
+import com.alibaba.bytekit.utils.AsmUtils;
+import com.alibaba.bytekit.utils.Decompiler;
 import com.taobao.arthas.core.bytecode.TestHelper;
 import com.taobao.arthas.core.server.ArthasBootstrap;
 import com.taobao.arthas.core.util.affect.EnhancerAffect;
diff --git a/core/src/test/java/com/taobao/arthas/core/bytecode/TestHelper.java b/core/src/test/java/com/taobao/arthas/core/bytecode/TestHelper.java
index d5f9a19a4..059647424 100644
--- a/core/src/test/java/com/taobao/arthas/core/bytecode/TestHelper.java
+++ b/core/src/test/java/com/taobao/arthas/core/bytecode/TestHelper.java
@@ -9,16 +9,16 @@ import java.util.jar.JarFile;
 
 import org.zeroturnaround.zip.ZipUtil;
 
-import com.alibaba.arthas.deps.org.objectweb.asm.tree.ClassNode;
-import com.alibaba.arthas.deps.org.objectweb.asm.tree.MethodNode;
+import com.alibaba.deps.org.objectweb.asm.tree.ClassNode;
+import com.alibaba.deps.org.objectweb.asm.tree.MethodNode;
 
-import com.taobao.arthas.bytekit.asm.MethodProcessor;
-import com.taobao.arthas.bytekit.asm.interceptor.InterceptorProcessor;
-import com.taobao.arthas.bytekit.asm.interceptor.parser.DefaultInterceptorClassParser;
-import com.taobao.arthas.bytekit.utils.AgentUtils;
-import com.taobao.arthas.bytekit.utils.AsmUtils;
-import com.taobao.arthas.bytekit.utils.MatchUtils;
-import com.taobao.arthas.bytekit.utils.VerifyUtils;
+import com.alibaba.bytekit.asm.MethodProcessor;
+import com.alibaba.bytekit.asm.interceptor.InterceptorProcessor;
+import com.alibaba.bytekit.asm.interceptor.parser.DefaultInterceptorClassParser;
+import com.alibaba.bytekit.utils.AgentUtils;
+import com.alibaba.bytekit.utils.AsmUtils;
+import com.alibaba.bytekit.utils.MatchUtils;
+import com.alibaba.bytekit.utils.VerifyUtils;
 
 /**
  * 
diff --git a/pom.xml b/pom.xml
index f3b1fc84f..6493c90f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,7 @@
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>bytekit-core</artifactId>
-                <version>0.0.1</version>
+                <version>0.0.2</version>
             </dependency>
             <dependency>
                 <groupId>org.benf</groupId>
@@ -253,13 +253,13 @@
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy</artifactId>
-                <version>1.10.13</version>
+                <version>1.10.18</version>
             </dependency>
 
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy-agent</artifactId>
-                <version>1.10.13</version>
+                <version>1.10.18</version>
             </dependency>
 
             <dependency>
@@ -424,7 +424,6 @@
                         <configuration>
                             <excludes>
                                 <exclude>com/taobao/arthas/core/view/ObjectViewTest*</exclude>
-                                <exclude>com/taobao/arthas/bytekit/asm/interceptor*</exclude>
                             </excludes>
                         </configuration>
                     </execution>