diff --git a/agent/pom.xml b/agent/pom.xml
index d4b517cdf..6c4125067 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -102,16 +102,6 @@
jdk15
test
-
- com.fasterxml.jackson.core
- jackson-databind
- test
-
-
- org.codehaus.jackson
- jackson-mapper-asl
- test
-
com.google.http-client
google-http-client
@@ -210,6 +200,35 @@
test
+
+ org.codehaus.jackson
+ jackson-core-asl
+ 1.9.13
+ test
+
+
+ org.codehaus.jackson
+ jackson-mapper-asl
+ 1.9.13
+ test
+
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ test
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ test
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ test
+
+
diff --git a/collector/pom.xml b/collector/pom.xml
index fe40c0879..7a57a2e88 100644
--- a/collector/pom.xml
+++ b/collector/pom.xml
@@ -46,7 +46,12 @@
pinpoint-plugins
pom
-
+
+ org.apache.zookeeper
+ zookeeper
+
+
+
com.navercorp.pinpoint
diff --git a/collector/src/main/resources/applicationContext-collector.xml b/collector/src/main/resources/applicationContext-collector.xml
index 204361113..bb19b9d69 100644
--- a/collector/src/main/resources/applicationContext-collector.xml
+++ b/collector/src/main/resources/applicationContext-collector.xml
@@ -260,7 +260,7 @@
-
+
diff --git a/commons-hbase/pom.xml b/commons-hbase/pom.xml
index a148d0187..06b1cccc3 100644
--- a/commons-hbase/pom.xml
+++ b/commons-hbase/pom.xml
@@ -35,114 +35,9 @@
org.apache.hbase
- hbase-client
-
-
- org.mortbay.jetty
- jetty
-
-
- org.mortbay.jetty
- jetty-util
-
-
- com.sun.jersey
- jersey-core
-
-
- com.sun.jersey
- jersey-json
-
-
- commons-logging
- commons-logging
-
-
- log4j
- log4j
-
-
- org.slf4j
- slf4j-log4j12
-
-
- org.apache.avro
- avro
-
-
- jdk.tools
- jdk.tools
-
-
- net.java.dev.jets3t
- jets3t
-
-
- commons-httpclient
- commons-httpclient
-
-
- org.apache.hadoop
- hadoop-annotations
-
-
- com.jcraft
- jsch
-
-
- org.apache.commons
- commons-math3
-
-
- org.apache.curator
- curator-client
-
-
- org.apache.curator
- curator-framework
-
-
- org.apache.curator
- curator-recipes
-
-
- com.google.code.gson
- gson
-
-
- org.apache.commons
- commons-compress
-
-
- javax.servlet.jsp
- jsp-api
-
-
- javax.servlet
- servlet-api
-
-
- tomcat
- jasper-runtime
-
-
- tomcat
- jasper-compiler
-
-
- org.eclipse.jdt
- core
-
-
- hsqldb
- hsqldb
-
-
- commons-beanutils-core
- commons-beanutils
-
-
+ hbase-shaded-client
+
com.google.guava
guava
@@ -168,24 +63,6 @@
spring-tx
-
-
- org.codehaus.jackson
- jackson-core-asl
-
-
- org.codehaus.jackson
- jackson-mapper-asl
-
-
- org.codehaus.jackson
- jackson-xc
-
-
- org.codehaus.jackson
- jackson-jaxrs
-
-
diff --git a/commons-server/pom.xml b/commons-server/pom.xml
index 20dcf265d..2c3c4180a 100644
--- a/commons-server/pom.xml
+++ b/commons-server/pom.xml
@@ -33,6 +33,10 @@
pinpoint-commons-hbase
compile
+
+ commons-collections
+ commons-collections
+
org.springframework
spring-core
diff --git a/pom.xml b/pom.xml
index 12b35f533..734b56dd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,6 @@
1.7.21
3.1.2
8.1.12.v20130726
- 1.9.13
2.6.6
4.3
2.4.2
@@ -315,31 +314,11 @@
jackson-core
${fastxml.jackson.version}
-
- org.codehaus.jackson
- jackson-core-asl
- ${codehaus.jackson.version}
-
com.fasterxml.jackson.core
jackson-annotations
${fastxml.jackson.version}
-
- org.codehaus.jackson
- jackson-mapper-asl
- ${codehaus.jackson.version}
-
-
- org.codehaus.jackson
- jackson-xc
- ${codehaus.jackson.version}
-
-
- org.codehaus.jackson
- jackson-jaxrs
- ${codehaus.jackson.version}
-
com.fasterxml.jackson.core
jackson-databind
@@ -348,8 +327,8 @@
org.apache.hbase
- hbase-client
- 1.2.0-cdh5.7.3
+ hbase-shaded-client
+ 1.2.0-cdh5.7.5
@@ -644,7 +623,13 @@
org.apache.zookeeper
zookeeper
- 3.4.5-cdh5.7.3
+ 3.4.5-cdh5.7.5
+
+
+ org.jboss.netty
+ netty
+
+
diff --git a/web/pom.xml b/web/pom.xml
index e04445478..0eba48d20 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -56,6 +56,11 @@
io.netty
netty
+
+ org.apache.zookeeper
+ zookeeper
+
+
commons-lang
@@ -204,28 +209,6 @@
ehcache-core
-
-
- org.codehaus.jackson
- jackson-core-asl
- runtime
-
-
- org.codehaus.jackson
- jackson-mapper-asl
- runtime
-
-
- org.codehaus.jackson
- jackson-xc
- runtime
-
-
- org.codehaus.jackson
- jackson-jaxrs
- runtime
-
-
com.fasterxml.jackson.core
jackson-core
diff --git a/web/src/main/java/com/navercorp/pinpoint/web/view/JacksonPinpointModule.java b/web/src/main/java/com/navercorp/pinpoint/web/view/JacksonPinpointModule.java
index 25c9bae7e..aea94727c 100644
--- a/web/src/main/java/com/navercorp/pinpoint/web/view/JacksonPinpointModule.java
+++ b/web/src/main/java/com/navercorp/pinpoint/web/view/JacksonPinpointModule.java
@@ -27,7 +27,7 @@ import com.navercorp.pinpoint.common.trace.ServiceType;
public class JacksonPinpointModule extends Module {
/* (non-Javadoc)
- * @see org.codehaus.jackson.map.Module#getModuleName()
+ * @see com.fasterxml.jackson.databind.Module#getModuleName()
*/
@Override
public String getModuleName() {
@@ -35,7 +35,7 @@ public class JacksonPinpointModule extends Module {
}
/* (non-Javadoc)
- * @see org.codehaus.jackson.map.Module#version()
+ * @see com.fasterxml.jackson.databind.Module#version()
*/
@SuppressWarnings("deprecation")
@Override
@@ -44,7 +44,7 @@ public class JacksonPinpointModule extends Module {
}
/* (non-Javadoc)
- * @see org.codehaus.jackson.map.Module#setupModule(org.codehaus.jackson.map.Module.SetupContext)
+ * @see com.fasterxml.jackson.databind.Module#setupModule(org.codehaus.jackson.map.Module.SetupContext)
*/
@Override
public void setupModule(SetupContext context) {
diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapTest.java
index 7f5ad2c73..d3bf31ea1 100644
--- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapTest.java
+++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapTest.java
@@ -17,7 +17,7 @@
package com.navercorp.pinpoint.web.applicationmap;
import com.navercorp.pinpoint.web.vo.Range;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApplicationTimeHistogramTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApplicationTimeHistogramTest.java
index 824fdb6cd..8c56a3107 100644
--- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApplicationTimeHistogramTest.java
+++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApplicationTimeHistogramTest.java
@@ -24,8 +24,8 @@ import com.navercorp.pinpoint.web.vo.Application;
import com.navercorp.pinpoint.web.vo.Range;
import com.navercorp.pinpoint.web.vo.ResponseTime;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.ObjectWriter;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;