提交 acbf0116 编写于 作者: P pengys5

Merge branch 'feature/3.0.x' into fix/203

# Conflicts:
#	pom.xml
#	skywalking-application-toolkit/pom.xml
#	skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml
#	skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/pom.xml
#	skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml
#	skywalking-application-toolkit/skywalking-toolkit-opentracing/pom.xml
#	skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml
#	skywalking-collector/pom.xml
#	skywalking-collector/skywalking-collector-cluster/pom.xml
#	skywalking-collector/skywalking-collector-commons/pom.xml
#	skywalking-collector/skywalking-collector-worker/pom.xml
#	skywalking-commons/pom.xml
#	skywalking-commons/skywalking-logging-api/pom.xml
#	skywalking-commons/skywalking-logging-log4j2/pom.xml
#	skywalking-commons/skywalking-trace/pom.xml
#	skywalking-commons/skywalking-util/pom.xml
#	skywalking-sniffer/pom.xml
#	skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml
#	skywalking-sniffer/skywalking-agent/pom.xml
#	skywalking-sniffer/skywalking-api/pom.xml
#	skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml
#	skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml
#	skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml
#	skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml
#	skywalking-sniffer/skywalking-sdk-plugin/mongodb-3.x-plugin/pom.xml
#	skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/pom.xml
#	skywalking-sniffer/skywalking-sdk-plugin/pom.xml
#	skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml
#	skywalking-sniffer/skywalking-sniffer-mock/pom.xml
#	skywalking-sniffer/skywalking-toolkit-activation/pom.xml
#	skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/pom.xml
#	skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/pom.xml
#	skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/pom.xml
#	skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/pom.xml
#	skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
version: '2.1' version: '2.1'
services: services:
skywalking-webui: skywalking-webui:
image: sky-walking-ui:3.0.1-2017 image: sky-walking-ui:3.0.2-2017
expose: expose:
- "8080" - "8080"
ports: ports:
...@@ -9,10 +9,10 @@ services: ...@@ -9,10 +9,10 @@ services:
links: links:
- skywalking-collector - skywalking-collector
environment: environment:
- COLLECTOR_SERVERS=skywalking-collector:7001 - COLLECTOR_SERVERS=skywalking-collector:12800
skywalking-collector: skywalking-collector:
image: skywalking-collector:3.0.1-2017 image: skywalking-collector:3.0.2-2017
expose: expose:
- "12800" - "12800"
- "1000" - "1000"
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
<groupId>com.a.eye</groupId> <groupId>com.a.eye</groupId>
<artifactId>skywalking</artifactId> <artifactId>skywalking</artifactId>
<version>3.0.3-2017</version> <version>3.0.3-2017</version>
<licenses> <licenses>
<license> <license>
<name>GNU GENERAL PUBLIC LICENSE V3</name> <name>GNU GENERAL PUBLIC LICENSE V3</name>
......
...@@ -44,4 +44,4 @@ ...@@ -44,4 +44,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册