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
Showing
想要评论请 注册 或 登录