Unverified Commit 544e8d83 authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Merge branch 'master' into GA-release

parents 1268c945 33f5cc19

apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <parent>

        <artifactId>apm-application-toolkit</artifactId>

        <groupId>org.apache.skywalking</groupId>

        <version>6.0.0-GA-SNAPSHOT</version>

        <version>6.1.0-SNAPSHOT</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <parent>

        <artifactId>apm-application-toolkit</artifactId>

        <groupId>org.apache.skywalking</groupId>

        <version>6.0.0-GA-SNAPSHOT</version>

        <version>6.1.0-SNAPSHOT</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <parent>

        <artifactId>apm-application-toolkit</artifactId>

        <groupId>org.apache.skywalking</groupId>

        <version>6.0.0-GA-SNAPSHOT</version>

        <version>6.1.0-SNAPSHOT</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

apm-application-toolkit/apm-toolkit-opentracing/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <parent>

        <artifactId>apm-application-toolkit</artifactId>

        <groupId>org.apache.skywalking</groupId>

        <version>6.0.0-GA-SNAPSHOT</version>

        <version>6.1.0-SNAPSHOT</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

apm-application-toolkit/apm-toolkit-trace/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    <parent>

        <artifactId>apm-application-toolkit</artifactId>

        <groupId>org.apache.skywalking</groupId>

        <version>6.0.0-GA-SNAPSHOT</version>

        <version>6.1.0-SNAPSHOT</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>