home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-09 04:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity

#2321 Update library

Browse Source 
- hbase-client : 1.2.0-cdh5.7.3 -> hbase-shaded-client : 1.2.0-cdh5.7.5
This commit is contained in:
emeroad
2016-12-12 19:07:11 +09:00
committed by Woonduk Kang
parent 45bf5592fe
commit 6d42e5ebae
10 changed files with 62 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agent/pom.xml
+29 -10
View File
@@ -102,16 +102,6 @@
<classifier>jdk15</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
@@ -210,6 +200,35 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
collector/pom.xml
+6 -1
View File
@@ -46,7 +46,12 @@
<artifactId>pinpoint-plugins</artifactId>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
<!-- for test -->
<dependency>
<groupId>com.navercorp.pinpoint</groupId>
collector/src/main/resources/applicationContext-collector.xml
+1 -1
View File
@@ -260,7 +260,7 @@
<constructor-arg index="5" ref="udpStatWorkerOption"/>
</bean>
<bean id="jsonObjectMapper" class="org.codehaus.jackson.map.ObjectMapper">
<bean id="jsonObjectMapper" class="com.fasterxml.jackson.databind.ObjectMapper">
</bean>
<bean id="hTable" class="com.navercorp.pinpoint.common.hbase.HBaseTables">
commons-hbase/pom.xml
+2 -125
View File
@@ -35,114 +35,9 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</exclusion>
<exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
<exclusion>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
</exclusion>
<exclusion>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</exclusion>
<exclusion>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jdt</groupId>
<artifactId>core</artifactId>
</exclusion>
<exclusion>
<artifactId>hsqldb</artifactId>
<groupId>hsqldb</groupId>
</exclusion>
<exclusion>
<artifactId>commons-beanutils-core</artifactId>
<groupId>commons-beanutils</groupId>
</exclusion>
</exclusions>
<artifactId>hbase-shaded-client</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -168,24 +63,6 @@
<artifactId>spring-tx</artifactId>
</dependency>
<!--jackson jsonMapper. hbase need that for now -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
</dependency>
<!-- Logging dependencies -->
<dependency>
commons-server/pom.xml
+4
View File
@@ -33,6 +33,10 @@
<artifactId>pinpoint-commons-hbase</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
pom.xml
+9 -24
View File
@@ -75,7 +75,6 @@
<slf4j.version>1.7.21</slf4j.version>
<metrics.version>3.1.2</metrics.version>
<jetty.version>8.1.12.v20130726</jetty.version>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
<fastxml.jackson.version>2.6.6</fastxml.jackson.version>
<httpcomponents.version>4.3</httpcomponents.version>
<jedis.version>2.4.2</jedis.version>
@@ -315,31 +314,11 @@
<artifactId>jackson-core</artifactId>
<version>${fastxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>${codehaus.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${fastxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>${codehaus.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
<version>${codehaus.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>${codehaus.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
@@ -348,8 +327,8 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>1.2.0-cdh5.7.3</version>
<artifactId>hbase-shaded-client</artifactId>
<version>1.2.0-cdh5.7.5</version>
</dependency>
<dependency>
@@ -644,7 +623,13 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.4.5-cdh5.7.3</version>
<version>3.4.5-cdh5.7.5</version>
<exclusions>
<exclusion>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- for zookeeper test -->
web/pom.xml
+5 -22
View File
@@ -56,6 +56,11 @@
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -204,28 +209,6 @@
<artifactId>ehcache-core</artifactId>
</dependency>
<!--jackson jsonMapper. hbase need it for now. used 1.9.x version -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
web/src/main/java/com/navercorp/pinpoint/web/view/JacksonPinpointModule.java
+3 -3
View File
@@ -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) {
web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapTest.java
+1 -1
View File
@@ -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;
web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApplicationTimeHistogramTest.java
+2 -2
View File
@@ -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;