kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/3.0' into feature/3.0

This commit is contained in:
吴晟 Wu Sheng 2017-02-25 21:41:56 +08:00 committed by GitHub
parent eacc014eec b66c14d02b
commit 438359d833
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
skywalking-commons/skywalking-trace/pom.xml
View File

@ -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>

2
skywalking-sniffer/skywalking-api/pom.xml
View File

@ -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>

2
skywalking-sniffer/skywalking-toolkit-activation/pom.xml
View File

@ -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>