diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java
index 5375fa0816849616372052da6e1b1d8d0ef0e833..0a8a6ab21f69329e4c1875a8b11c89698e0a8172 100644
--- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java
+++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java
@@ -88,22 +88,16 @@ public class TraceSegmentRef{
@Override
public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
- TraceSegmentRef ref = (TraceSegmentRef)o;
+ TraceSegmentRef that = (TraceSegmentRef) o;
- if (spanId != ref.spanId)
- return false;
- return traceSegmentId != null ? traceSegmentId.equals(ref.traceSegmentId) : ref.traceSegmentId == null;
+ return traceSegmentId != null ? traceSegmentId.equals(that.traceSegmentId) : that.traceSegmentId == null;
}
@Override
public int hashCode() {
- int result = traceSegmentId != null ? traceSegmentId.hashCode() : 0;
- result = 31 * result + spanId;
- return result;
+ return traceSegmentId != null ? traceSegmentId.hashCode() : 0;
}
}
diff --git a/skywalking-sniffer/skywalking-agent/pom.xml b/skywalking-sniffer/skywalking-agent/pom.xml
index d807e4a1f0bded5432f7f5a50059ca61759eed4b..fcc5b7fe88a14a1ff16035b659566b3c94785dfe 100644
--- a/skywalking-sniffer/skywalking-agent/pom.xml
+++ b/skywalking-sniffer/skywalking-agent/pom.xml
@@ -21,13 +21,6 @@
com.a.eye.skywalking.dependencies
net.bytebuddy
${shade.package}.${shade.net.bytebuddy.source}
- com.lmax.disruptor
- ${shade.package}.${shade.com.lmax.disruptor.source}
-
- com.google
- ${shade.package}.${shade.com.google.source}
- org.apache
- ${shade.package}.${shade.org.apache.source}
@@ -123,23 +116,20 @@
+
+
+ com.lmax:*
+ org.apache.httpcomponents:*
+ commons-logging:*
+ commons-codec:*
+ *:gson
+
+
${shade.net.bytebuddy.source}
${shade.net.bytebuddy.target}
-
- ${shade.com.lmax.disruptor.source}
- ${shade.com.lmax.disruptor.target}
-
-
- ${shade.com.google.source}
- ${shade.com.google.target}
-
-
- ${shade.org.apache.source}
- ${shade.org.apache.target}
-
diff --git a/skywalking-sniffer/skywalking-api/pom.xml b/skywalking-sniffer/skywalking-api/pom.xml
index f578807695ba5ea8a7d20198f071eca8a71c93d0..eab817765ef3e60bb3f56c7a42f04166ce77da95 100644
--- a/skywalking-sniffer/skywalking-api/pom.xml
+++ b/skywalking-sniffer/skywalking-api/pom.xml
@@ -17,6 +17,15 @@
UTF-8
9.4.2.v20170220
+
+ com.a.eye.skywalking.dependencies
+ com.lmax.disruptor
+ ${shade.package}.${shade.com.lmax.disruptor.source}
+
+ com.google
+ ${shade.package}.${shade.com.google.source}
+ org.apache
+ ${shade.package}.${shade.org.apache.source}
@@ -74,6 +83,40 @@
${project.build.sourceEncoding}
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 2.4.1
+
+
+ package
+
+ shade
+
+
+
+
+ net.bytebuddy:byte-buddy:jar:
+
+
+
+
+ ${shade.com.lmax.disruptor.source}
+ ${shade.com.lmax.disruptor.target}
+
+
+ ${shade.com.google.source}
+ ${shade.com.google.target}
+
+
+ ${shade.org.apache.source}
+ ${shade.org.apache.target}
+
+
+
+
+
+
diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml
index 1fa1a6eaf98f817fccf66b5dd7dde3ff95d79fbc..bd8525c123e0b7fb7b9643a8964cac43e4dfd63f 100644
--- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml
+++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml
@@ -18,11 +18,6 @@
-
- com.a.eye
- skywalking-api
- 3.0-2017
-
org.springframework
spring-context
diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml
index 4d13cff6b98443d85fc8fa55e339c422b5ee3f66..03708288b979582576eab6606089779b4c37abd6 100644
--- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml
+++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml
@@ -20,13 +20,6 @@
-
- com.a.eye
- skywalking-api
- ${project.version}
-
-
-
org.apache.httpcomponents
httpclient
diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml
index db239652d3dd2082a8f0f908aa26088c31eeea92..ebddf6e30372eaa02e61835b714f416a7fee1a83 100755
--- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml
+++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml
@@ -18,11 +18,6 @@
-
- com.a.eye
- skywalking-api
- 3.0-2017
-
mysql
mysql-connector-java
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/pom.xml
index d159c4e6b577a66a159c43b3c11d5b5365050ee5..cf91ccd65a4b5f19d24e7471f60e6af159c57614 100644
--- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/pom.xml
+++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/pom.xml
@@ -12,11 +12,6 @@
skywalking-toolkit-opentracing-activation
-
- com.a.eye
- skywalking-api
- ${project.version}
-
com.a.eye
skywalking-toolkit-opentracing
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
index c78fd37717e62a8a80e5d388a214ab18e0fc2110..fff2540daf34e6c5d067efe73da5783b0a947b6d 100644
--- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
+++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
@@ -12,11 +12,4 @@
jar
skywalking-toolkit-trace-context-activation
-
-
- com.a.eye
- skywalking-api
- 3.0-2017
-
-