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

5.x grpcbug (#1603) 

* update 5.x grpc version form 1.10 to 1.14 and  Solve the resulting guava and log4j version conflicts

* Specify guava version 20.0

* update parrent pom guava version
This commit is contained in:
dylan 2018-08-30 14:21:01 +08:00 committed by Wu Sheng
parent 1a5cf2b536
commit 69933eb614
9 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml
View File

@ -28,9 +28,17 @@
<artifactId>agent-grpc-provider</artifactId>
<properties>
<grpc.version>1.10.0</grpc.version>
<grpc.version>1.14.0</grpc.version>
<guava.version>20.0</guava.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.skywalking</groupId>

12
apm-collector/apm-collector-component/server-component/pom.xml
View File

@ -28,7 +28,17 @@
<artifactId>server-component</artifactId>
<packaging>jar</packaging>
<properties>
<guava.version>20.0</guava.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.skywalking</groupId>

2
apm-collector/pom.xml
View File

@ -52,7 +52,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<slf4j.version>1.7.25</slf4j.version>
<log4j.version>2.9.0</log4j.version>
<guava.version>19.0</guava.version>
<guava.version>20.0</guava.version>
<caffeine.version>2.6.2</caffeine.version>
<snakeyaml.version>1.18</snakeyaml.version>
<byte-buddy.version>1.7.8</byte-buddy.version>

4
apm-protocol/apm-network/pom.xml
View File

@ -30,8 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compiler.version>1.6</compiler.version>
<grpc.version>1.10.0</grpc.version>
<netty.version>4.1.17.Final</netty.version>
<grpc.version>1.14.0</grpc.version>
<netty.version>4.1.27.Final</netty.version>
<netty-tcnative-boringssl-static.version>2.0.7.Final</netty-tcnative-boringssl-static.version>
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
<protobuf-maven-plugin.version>0.5.0</protobuf-maven-plugin.version>

16
apm-sniffer/apm-agent-core/pom.xml
View File

@ -34,13 +34,13 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty.version>9.4.2.v20170220</jetty.version>
<grpc.version>1.10.0</grpc.version>
<grpc.version>1.14.0</grpc.version>
<guava.version>20.0</guava.version>
<bytebuddy.version>1.7.9</bytebuddy.version>
<disruptor.version>3.3.6</disruptor.version>
<apache-httpclient.version>4.5.3</apache-httpclient.version>
<wiremock.version>2.6.0</wiremock.version>
<os-maven-plugin.version>1.4.1.Final</os-maven-plugin.version>
<shade.package>org.apache.skywalking.apm.dependencies</shade.package>
<shade.com.lmax.disruptor.source>com.lmax.disruptor</shade.com.lmax.disruptor.source>
<shade.com.lmax.disruptor.target>${shade.package}.${shade.com.lmax.disruptor.source}
@ -64,6 +64,7 @@
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-network</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
@ -108,6 +109,7 @@
<artifactId>wiremock</artifactId>
<version>${wiremock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@ -127,7 +129,17 @@
<version>${project.version}</version>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<extensions>
<extension>
<groupId>kr.motd.maven</groupId>

8
apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml
View File

@ -34,7 +34,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<apache-httpclient.version>4.3</apache-httpclient.version>
<log4j-core.version>2.4.1</log4j-core.version>
<junit.version>4.12</junit.version>
</properties>
@ -46,12 +45,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j-core.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>

7
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml
View File

@ -32,7 +32,6 @@
<url>http://maven.apache.org</url>
<properties>
<jedis.version>2.9.0</jedis.version>
<log4j-core.version>2.4.1</log4j-core.version>
</properties>
<dependencies>
@ -43,11 +42,5 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j-core.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

8
apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml
View File

@ -32,7 +32,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spymemcached.version>2.11.1</spymemcached.version>
<log4j-core.version>2.4.1</log4j-core.version>
</properties>
<dependencies>
@ -42,11 +41,6 @@
<version>${spymemcached.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j-core.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

7
apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml
View File

@ -32,7 +32,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<xmemcached.version>2.0.0</xmemcached.version>
<log4j-core.version>2.4.1</log4j-core.version>
</properties>
<dependencies>
@ -42,11 +41,5 @@
<version>${xmemcached.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j-core.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>