Commit 994d11c5 authored by 吴晟's avatar 吴晟
Browse files

Update gRPC version. And shade google opencensus in agent.

parent baf40004

apm-network/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


    <properties>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

        <grpc.version>1.7.0</grpc.version>

        <grpc.version>1.8.0</grpc.version>

        <compiler.version>1.6</compiler.version>

    </properties>

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

+7 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
    <properties>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

        <jetty.version>9.4.2.v20170220</jetty.version>

        <grpc.version>1.7.0</grpc.version>

        <grpc.version>1.8.0</grpc.version>

        <bytebuddy.version>1.7.6</bytebuddy.version>



        <shade.package>org.skywalking.apm.dependencies</shade.package>
@@ -50,6 +50,8 @@ 
        <shade.io.grpc.target>${shade.package}.${shade.io.grpc.source}</shade.io.grpc.target>

        <shade.io.netty.source>io.netty</shade.io.netty.source>

        <shade.io.netty.target>${shade.package}.${shade.io.netty.source}</shade.io.netty.target>

        <shade.io.opencensus.source>io.opencensus</shade.io.opencensus.source>

        <shade.io.opencensus.target>${shade.package}.${shade.io.opencensus.source}</shade.io.opencensus.target>

    </properties>



    <dependencies>
@@ -176,6 +178,10 @@ 
                                    <pattern>${shade.io.netty.source}</pattern>

                                    <shadedPattern>${shade.io.netty.target}</shadedPattern>

                                </relocation>

                                <relocation>

                                    <pattern>${shade.io.opencensus.source}</pattern>

                                    <shadedPattern>${shade.io.opencensus.target}</shadedPattern>

                                </relocation>

                            </relocations>

                            <filters>

                                <filter>