diff --git a/.gitignore b/.gitignore index c4dc77336..71585b897 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ site/src/site/sphinx/_build site/src/site/sphinx/en/_build **/__pycache__ + +**/dependency-reduced-pom.xml \ No newline at end of file diff --git a/agent/pom.xml b/agent/pom.xml index 819ada395..10374c45e 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -33,18 +33,10 @@ arthas-bytekit ${project.version} - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-core - - - ch.qos.logback - logback-classic + com.alibaba.arthas + arthas-repackage-logger + ${project.version} @@ -79,34 +71,6 @@ - - - org.slf4j - ${arthas.deps.package}.org.slf4j - - - ch.qos.logback - ${arthas.deps.package}.ch.qos.logback - - - logback.configurationFile - arthas.logback.configurationFile - - - - org.objectweb.asm - ${arthas.deps.package}.org.objectweb.asm - - - - - * - - META-INF/services/javax.servlet.ServletContainerInitializer - - - - diff --git a/bytekit/pom.xml b/bytekit/pom.xml index 919e32d10..91e3a23fe 100644 --- a/bytekit/pom.xml +++ b/bytekit/pom.xml @@ -21,6 +21,11 @@ + + com.alibaba.arthas + arthas-repackage-asm + ${project.version} + org.ow2.asm asm diff --git a/pom.xml b/pom.xml index 686448b42..2f86cdf31 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,8 @@ https://github.com/alibaba/arthas + repackage-deps/arthas-repackage-asm + repackage-deps/arthas-repackage-logger spy common bytekit @@ -74,6 +76,7 @@ UTF-8 1.6 1.6 + com.alibaba.arthas.deps @@ -203,6 +206,11 @@ maven-assembly-plugin 3.1.0 + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + diff --git a/repackage-deps/arthas-repackage-asm/pom.xml b/repackage-deps/arthas-repackage-asm/pom.xml new file mode 100644 index 000000000..da22a31a4 --- /dev/null +++ b/repackage-deps/arthas-repackage-asm/pom.xml @@ -0,0 +1,74 @@ + + + 4.0.0 + + com.taobao.arthas + arthas-all + 4.0.0-SNAPSHOT + ../../pom.xml + + com.alibaba.arthas + arthas-repackage-asm + arthas-repackage-asm + + + + org.ow2.asm + asm + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-util + + + org.ow2.asm + asm-analysis + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + UTF-8 + true + + + + + maven-shade-plugin + + + package + + shade + + + true + true + + + + + org.objectweb.asm + ${arthas.deps.package}.org.objectweb.asm + + + + + + + + + + diff --git a/repackage-deps/arthas-repackage-logger/pom.xml b/repackage-deps/arthas-repackage-logger/pom.xml new file mode 100644 index 000000000..7a75831b8 --- /dev/null +++ b/repackage-deps/arthas-repackage-logger/pom.xml @@ -0,0 +1,84 @@ + + + 4.0.0 + + com.taobao.arthas + arthas-all + 4.0.0-SNAPSHOT + ../../pom.xml + + com.alibaba.arthas + arthas-repackage-logger + arthas-repackage-logger + + + + ch.qos.logback + logback-classic + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + UTF-8 + true + + + + + maven-shade-plugin + + + package + + shade + + + true + true + + + + + org.slf4j + ${arthas.deps.package}.org.slf4j + + + ch.qos.logback + ${arthas.deps.package}.ch.qos.logback + + + logback.configurationFile + arthas.logback.configurationFile + + + + org.objectweb.asm + ${arthas.deps.package}.org.objectweb.asm + + + + + * + + META-INF/services/javax.servlet.ServletContainerInitializer + + + + + + + + + + + +