Commit f26e64ad authored by pengys5's avatar pengys5
Browse files

Merge remote-tracking branch 'origin/master' into feature/collector 

# Conflicts:
#	skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/Context.java
#	skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/applicationref/ApplicationRefMain.java
parents baf542a7 6a833baf

README.md

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ SkyWalking: Large-Scale Distributed Systems Tracing Infrastructure, also known D 
[![codebeat badge](https://codebeat.co/badges/579e4dce-1dc7-4f32-a163-c164eafa1335)](https://codebeat.co/projects/github-com-wu-sheng-sky-walking)

[![Join the chat at https://gitter.im/sky-walking/Lobby](https://badges.gitter.im/sky-walking/Lobby.svg)](https://gitter.im/sky-walking/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

[![OpenTracing-1.0 Badge](https://img.shields.io/badge/OpenTracing--1.0-enabled-blue.svg)](http://opentracing.io)

[![Release Version](https://img.shields.io/badge/stable-2.1--2017-brightgreen.svg)](https://github.com/wu-sheng/sky-walking/releases)

[![Release Version](https://img.shields.io/badge/stable-2.3--2017-brightgreen.svg)](https://github.com/wu-sheng/sky-walking/releases)



# News

* sky-walking v3.0 iteration begins... The top 2 important features are: [`Update the trace-structure`](https://github.com/wu-sheng/sky-walking/issues/83) and [`Analyze trace, and bring metric/analytic/cause up`](https://github.com/wu-sheng/sky-walking/issues/84)

docs/donate.jpg

0 → 100644
+171 KiB
Loading image diff...

pom.xml

+24 −1
Original line number Diff line number Diff line
@@ -53,7 +53,30 @@ 
		<scala.compiler.version>2.11.7</scala.compiler.version>

		<powermock.version>1.6.4</powermock.version>

		<docker.plugin.version>0.4.13</docker.plugin.version>

		<skywalking.version>2.1-2017</skywalking.version>



        <shade.package>com.a.eye.skywalking.dependencies</shade.package>

        <shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>

        <shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>

        <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}</shade.com.lmax.disruptor.target>

        <shade.akka.source>akka</shade.akka.source>

        <shade.akka.target>${shade.package}.${shade.akka.source}</shade.akka.target>

        <shade.scala.source>scala</shade.scala.source>

        <shade.scala.target>${shade.package}.${shade.scala.source}</shade.scala.target>

        <shade.org.agrona.source>org.agrona</shade.org.agrona.source>

        <shade.org.agrona.target>${shade.package}.${shade.org.agrona.source}</shade.org.agrona.target>

        <shade.org.jboss.netty.source>org.jboss.netty</shade.org.jboss.netty.source>

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

        <shade.org.reactivestreams.source>org.reactivestreams</shade.org.reactivestreams.source>

        <shade.org.reactivestreams.target>${shade.package}.${shade.org.reactivestreams.source}</shade.org.reactivestreams.target>

        <shade.org.uncommons.maths.source>org.uncommons.maths</shade.org.uncommons.maths.source>

        <shade.org.uncommons.maths.target>${shade.package}.${shade.org.uncommons.maths.source}</shade.org.uncommons.maths.target>

        <shade.com.google.source>com.google</shade.com.google.source>

        <shade.com.google.target>${shade.package}.${shade.com.google.source}</shade.com.google.target>

        <shade.io.aeron.source>io.aeron</shade.io.aeron.source>

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

        <shade.com.typesafe.source>com.typesafe</shade.com.typesafe.source>

        <shade.com.typesafe.target>${shade.package}.${shade.com.typesafe.source}</shade.com.typesafe.target>

	</properties>



    <dependencies>

skywalking-collector/pom.xml

+3 −24
Original line number Diff line number Diff line
@@ -26,24 +26,9 @@ 
            <version>${akka.version}</version>

        </dependency>

        <dependency>

            <groupId>com.typesafe.akka</groupId>

            <artifactId>akka-cluster-metrics_2.11</artifactId>

            <version>${akka.version}</version>

        </dependency>

        <dependency>

            <groupId>com.typesafe.akka</groupId>

            <artifactId>akka-cluster-tools_2.11</artifactId>

            <version>${akka.version}</version>

        </dependency>

        <dependency>

            <groupId>org.apache.logging.log4j</groupId>

            <artifactId>log4j-core</artifactId>

            <version>2.8</version>

        </dependency>

        <dependency>

            <groupId>org.apache.logging.log4j</groupId>

            <artifactId>log4j-api</artifactId>

            <version>2.8</version>

            <groupId>com.a.eye</groupId>

            <artifactId>skywalking-logging-api</artifactId>

            <version>${project.version}</version>

        </dependency>

        <dependency>

            <groupId>com.typesafe.akka</groupId>
@@ -51,11 +36,5 @@ 
            <version>${akka.version}</version>

            <scope>test</scope>

        </dependency>

        <dependency>

            <groupId>com.a.eye</groupId>

            <artifactId>skywalking-sniffer-mock</artifactId>

            <version>${project.version}</version>

            <scope>test</scope>

        </dependency>

    </dependencies>

</project>

skywalking-collector/skywalking-collector-cluster/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        </dependency>

        <dependency>

            <groupId>com.a.eye</groupId>

            <artifactId>skywalking-api</artifactId>

            <artifactId>skywalking-util</artifactId>

            <version>${project.version}</version>

        </dependency>

    </dependencies>