Commit 059568db authored by dylan's avatar dylan Committed by 吴晟
Browse files

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
parent af03e926

apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml

+12 −3
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
  ~

  -->



<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <parent>

        <artifactId>agent-grpc</artifactId>

        <groupId>org.apache.skywalking</groupId>
@@ -27,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>

apm-collector/apm-collector-component/server-component/pom.xml

+13 −2
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
  ~

  -->



<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <parent>

        <artifactId>apm-collector-component</artifactId>

        <groupId>org.apache.skywalking</groupId>
@@ -27,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>

apm-collector/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,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>

apm-protocol/apm-network/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

apm-sniffer/apm-agent-core/pom.xml

+14 −2
Original line number Diff line number Diff line
@@ -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>