diff --git a/pom.xml b/pom.xml
index f0810c314fdf206a468a5a7bcf24aaec489452e9..3898e5d5a5f9d828cd28243b216cbdab071d8be4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,32 +56,113 @@
2.1-2017
-
-
- junit
- junit
- 4.12
- test
-
-
- org.mockito
- mockito-all
- 1.10.19
- test
-
-
- org.powermock
- powermock-module-junit4
- ${powermock.version}
- test
-
-
- org.powermock
- powermock-api-mockito
- ${powermock.version}
- test
-
-
+
+
+ junit
+ junit
+ 4.12
+ test
+
+
+ org.mockito
+ mockito-all
+ 1.10.19
+ test
+
+
+ org.powermock
+ powermock-module-junit4
+ ${powermock.version}
+ test
+
+
+ org.powermock
+ powermock-api-mockito
+ ${powermock.version}
+ test
+
+
+
+
+
+
+ maven-compiler-plugin
+
+ ${compiler.version}
+ ${compiler.version}
+ ${project.build.sourceEncoding}
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 2.4.3
+
+ ${project.build.sourceEncoding}
+
+
+
+ com.spotify
+ docker-maven-plugin
+ ${docker.plugin.version}
+
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+
+ attach-sources
+
+ jar
+
+
+
+ 2.4
+
+
+ org.codehaus.mojo
+ versions-maven-plugin
+ 2.3
+
+
+ org.eluder.coveralls
+ coveralls-maven-plugin
+ 4.1.0
+
+ GGTAeHsfVql3x1BmTFaJvxC27f5sfcZNg
+
+ ${project.build.sourceDirectory}
+
+
+
+
+
+ org.codehaus.mojo
+ cobertura-maven-plugin
+ 2.7
+
+ true
+ UTF-8
+ true
+
+ xml
+ html
+
+
+
+ com/a/eye/skywalking/trace/proto/*.class
+
+
+
+
+
+
+>>>>>>> feature/3.0
diff --git a/skywalking-commons/skywalking-trace/pom.xml b/skywalking-commons/skywalking-trace/pom.xml
index 59ed8e442bd9c4718f086e8878bd1b9ef0cc86a3..b0a8b6e6e26fada51078f4f9dd3c2daf58b16e90 100644
--- a/skywalking-commons/skywalking-trace/pom.xml
+++ b/skywalking-commons/skywalking-trace/pom.xml
@@ -39,35 +39,15 @@
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 3.0.0
-
-
- add-source
- generate-sources
-
- add-source
-
-
-
- ${basedir}/target/generated-sources/protobuf/java
-
-
-
-
-
-
org.xolstice.maven.plugins
protobuf-maven-plugin
0.5.0
- com.google.protobuf:protoc:3.1.0:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:3.0.0:exe:${os.detected.classifier}
grpc-java
- io.grpc:protoc-gen-grpc-java:1.1.2:exe:${os.detected.classifier}
+ io.grpc:protoc-gen-grpc-java:1.0.2:exe:${os.detected.classifier}
@@ -79,8 +59,6 @@
-
-
diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java
index 24e6a42ef68ac6d382afab8308df37357b98469e..da6c2c3b5fa3f6d5caa35742cf582ef014fed3f3 100644
--- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java
+++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java
@@ -2,8 +2,8 @@ package com.a.eye.skywalking.trace;
import com.a.eye.skywalking.api.util.StringUtil;
import com.a.eye.skywalking.messages.ISerializable;
-import com.a.eye.skywalking.trace.messages.proto.KeyValue;
-import com.a.eye.skywalking.trace.messages.proto.LogDataMessage;
+import com.a.eye.skywalking.trace.proto.KeyValue;
+import com.a.eye.skywalking.trace.proto.LogDataMessage;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -14,7 +14,7 @@ import java.util.Map;
*
* Created by wusheng on 2017/2/17.
*/
-public class LogData implements ISerializable{
+public class LogData implements ISerializable {
private long time;
private Map fields;
diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java
index 51f28adcee4de15395f029b78dcd45061c02502a..6e201749740f93ceaa5890731d455ba17288375e 100644
--- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java
+++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java
@@ -2,9 +2,9 @@ package com.a.eye.skywalking.trace;
import com.a.eye.skywalking.api.util.StringUtil;
import com.a.eye.skywalking.messages.ISerializable;
-import com.a.eye.skywalking.trace.messages.proto.KeyValue;
-import com.a.eye.skywalking.trace.messages.proto.LogDataMessage;
-import com.a.eye.skywalking.trace.messages.proto.SpanMessage;
+import com.a.eye.skywalking.trace.proto.KeyValue;
+import com.a.eye.skywalking.trace.proto.LogDataMessage;
+import com.a.eye.skywalking.trace.proto.SpanMessage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegment.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegment.java
index fde9e445f57bd7f2c6164019e36a6c3323e9bc62..c2453fa6ede61997e6be9366566012366b28bbc9 100644
--- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegment.java
+++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegment.java
@@ -1,9 +1,9 @@
package com.a.eye.skywalking.trace;
import com.a.eye.skywalking.messages.ISerializable;
-import com.a.eye.skywalking.trace.messages.proto.SegmentMessage;
-import com.a.eye.skywalking.trace.messages.proto.SegmentRefMessage;
-import com.a.eye.skywalking.trace.messages.proto.SpanMessage;
+import com.a.eye.skywalking.trace.proto.SegmentMessage;
+import com.a.eye.skywalking.trace.proto.SegmentRefMessage;
+import com.a.eye.skywalking.trace.proto.SpanMessage;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
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 098b54787dba269c19d1783c115bfdb3db9d9408..9cdcb2d0766c5602fc72b3813cf56af386c96fab 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
@@ -1,7 +1,7 @@
package com.a.eye.skywalking.trace;
import com.a.eye.skywalking.messages.ISerializable;
-import com.a.eye.skywalking.trace.messages.proto.SegmentRefMessage;
+import com.a.eye.skywalking.trace.proto.SegmentRefMessage;
import com.a.eye.skywalking.trace.tag.Tags;
/**
diff --git a/skywalking-commons/skywalking-trace/src/main/proto/trace.proto b/skywalking-commons/skywalking-trace/src/main/proto/trace.proto
index df53a6c2b2c8534da8d3642c0d6c31da302c2f9f..acf7ed6e18fc985b435fc9ce42e0eecdff468eec 100644
--- a/skywalking-commons/skywalking-trace/src/main/proto/trace.proto
+++ b/skywalking-commons/skywalking-trace/src/main/proto/trace.proto
@@ -1,7 +1,7 @@
syntax = "proto3";
option java_multiple_files = true;
-option java_package = "com.a.eye.skywalking.trace.messages.proto";
+option java_package = "com.a.eye.skywalking.trace.proto";
message SegmentMessage {
string traceSegmentId = 1;