fix compile error

XhinLiang · Apr 10, 2020 · 608bdef · 608bdef
1 parent 49fa4d7
commit 608bdef
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -216,6 +216,18 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>27.0.1-jre</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/core/src/main/java/com/taobao/arthas/core/command/express/MvelExpress.java b/core/src/main/java/com/taobao/arthas/core/command/express/MvelExpress.java
@@ -1,14 +1,14 @@
 package com.taobao.arthas.core.command.express;
 
-import com.taobao.arthas.core.util.LogUtil;
-import com.taobao.middleware.logger.Logger;
+import com.alibaba.arthas.deps.org.slf4j.Logger;
+import com.alibaba.arthas.deps.org.slf4j.LoggerFactory;
 
 /**
  * @author xhinliang
  */
 public class MvelExpress implements Express {
 
-    private final Logger logger = LogUtil.getArthasLogger();
+    private static final Logger logger = LoggerFactory.getLogger(MvelExpress.class);
 
     private final MvelEvalKiller evalKiller;
 
@@ -21,7 +21,7 @@ public Object get(String express) throws ExpressException {
         try {
             return evalKiller.eval(express);
         } catch (Exception e) {
-            logger.error(null, "Error during evaluating the expression:", e);
+            logger.error("Error during evaluating the expression:", e);
             throw new ExpressException(express, e);
         }
     }

diff --git a/core/src/main/java/com/taobao/arthas/core/command/klass100/MvelCommand.java b/core/src/main/java/com/taobao/arthas/core/command/klass100/MvelCommand.java
@@ -4,6 +4,8 @@
 
 import org.apache.commons.lang.exception.ExceptionUtils;
 
+import com.alibaba.arthas.deps.org.slf4j.Logger;
+import com.alibaba.arthas.deps.org.slf4j.LoggerFactory;
 import com.google.common.base.Joiner;
 import com.taobao.arthas.core.command.Constants;
 import com.taobao.arthas.core.command.express.Express;
@@ -13,15 +15,13 @@
 import com.taobao.arthas.core.shell.command.AnnotatedCommand;
 import com.taobao.arthas.core.shell.command.Command;
 import com.taobao.arthas.core.shell.command.CommandProcess;
-import com.taobao.arthas.core.util.LogUtil;
 import com.taobao.arthas.core.util.StringUtils;
 import com.taobao.arthas.core.view.ObjectView;
 import com.taobao.middleware.cli.annotations.Argument;
 import com.taobao.middleware.cli.annotations.Description;
 import com.taobao.middleware.cli.annotations.Name;
 import com.taobao.middleware.cli.annotations.Option;
 import com.taobao.middleware.cli.annotations.Summary;
-import com.taobao.middleware.logger.Logger;
 
 /**
  *
@@ -41,7 +41,7 @@
 )
 public class MvelCommand extends AnnotatedCommand {
 
-    private static final Logger logger = LogUtil.getArthasLogger();
+    private static final Logger logger = LoggerFactory.getLogger(MvelCommand.class);
 
     private String express;
 

diff --git a/core/src/main/java/com/taobao/arthas/core/util/ArthasBanner.java b/core/src/main/java/com/taobao/arthas/core/util/ArthasBanner.java
@@ -1,22 +1,14 @@
 package com.taobao.arthas.core.util;
 
-import com.alibaba.arthas.deps.org.slf4j.Logger;
-import com.alibaba.arthas.deps.org.slf4j.LoggerFactory;
-import com.taobao.arthas.common.PidUtils;
-import com.taobao.arthas.core.shell.ShellServerOptions;
-import com.taobao.text.Color;
-import com.taobao.text.Decoration;
-import com.taobao.text.ui.TableElement;
-import com.taobao.text.util.RenderUtil;
-
 import java.io.InputStream;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.alibaba.arthas.deps.org.slf4j.Logger;
+import com.alibaba.arthas.deps.org.slf4j.LoggerFactory;
 import com.taobao.arthas.common.PidUtils;
 import com.taobao.arthas.core.shell.ShellServerOptions;
-import com.taobao.middleware.logger.Logger;
 import com.taobao.text.ui.TableElement;
 import com.taobao.text.util.RenderUtil;