Merge branch 'feature/3.0' into feature/3.0

skywalking-commons/skywalking-trace/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>3.0.0</version>
+            <version>3.1.0</version>
         </dependency>
     </dependencies>
 
@@ -64,10 +64,10 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.5.0</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.0.0:exe:${os.detected.classifier}
+                    <protocArtifact>com.google.protobuf:protoc:3.1.0:exe:${os.detected.classifier}
                     </protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.2:exe:${os.detected.classifier}
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.1.2:exe:${os.detected.classifier}
                     </pluginArtifact>
                 </configuration>
                 <executions>

skywalking-sniffer/skywalking-api/pom.xml

@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.a.eye</groupId>
             <artifactId>skywalking-trace</artifactId>
-            <version>3.0-2017</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.lmax</groupId>

skywalking-sniffer/skywalking-toolkit-activation/pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.a.eye</groupId>
             <artifactId>skywalking-api</artifactId>
-            <version>3.0-2017</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>