Fix #104

wu-sheng · wu-sheng · commit 0fda3154d2fb · 2017-03-13T17:57:17.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.a.eye</groupId>
     <artifactId>skywalking</artifactId>
-    <version>2.2-2017</version>
+    <version>2.3-2017</version>
 
     <licenses>
         <license>
diff --git a/skywalking-alarm/pom.xml b/skywalking-alarm/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>skywalking</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
 
 	<artifactId>skywalking-alarm</artifactId>
@@ -73,7 +73,7 @@
 		<dependency>
 			<groupId>com.a.eye</groupId>
 			<artifactId>skywalking-util</artifactId>
-			<version>2.2-2017</version>
+			<version>2.3-2017</version>
 		</dependency>
 	</dependencies>
 	<build>
@@ -115,7 +115,7 @@
 					<dockerDirectory>${project.basedir}/docker</dockerDirectory>
 					<imageName>skywalking/skywalking-alarm</imageName>
 					<imageTags>
-						<imageTag>2.2-2017</imageTag>
+						<imageTag>2.3-2017</imageTag>
 					</imageTags>
 					<resources>
 						<resource>
diff --git a/skywalking-application-toolkit/pom.xml b/skywalking-application-toolkit/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>skywalking</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>skywalking-application-toolkit</artifactId>
diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>skywalking-application-toolkit</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>skywalking-application-toolkit</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>skywalking-application-toolkit</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/skywalking-application-toolkit/skywalking-toolkit-opentracing/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-opentracing/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>skywalking-application-toolkit</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>skywalking-application-toolkit</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/skywalking-commons/pom.xml b/skywalking-commons/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>skywalking</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/skywalking-commons/skywalking-health-report/pom.xml b/skywalking-commons/skywalking-health-report/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>skywalking-commons</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/skywalking-commons/skywalking-logging/pom.xml b/skywalking-commons/skywalking-logging/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>skywalking-commons</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/pom.xml b/skywalking-commons/skywalking-logging/skywalking-logging-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>skywalking-logging</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>skywalking-logging</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/skywalking-commons/skywalking-registry/pom.xml b/skywalking-commons/skywalking-registry/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>skywalking-commons</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.a.eye</groupId>
             <artifactId>skywalking-logging-api</artifactId>
-            <version>2.2-2017</version>
+            <version>2.3-2017</version>
         </dependency>
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
diff --git a/skywalking-commons/skywalking-util/pom.xml b/skywalking-commons/skywalking-util/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>skywalking-commons</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.a.eye</groupId>
             <artifactId>skywalking-network</artifactId>
-            <version>2.2-2017</version>
+            <version>2.3-2017</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/skywalking-network/pom.xml b/skywalking-network/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <groupId>com.a.eye</groupId>
-    <version>2.2-2017</version>
+    <version>2.3-2017</version>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>skywalking-network</artifactId>
diff --git a/skywalking-sniffer/pom.xml b/skywalking-sniffer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>skywalking</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.a.eye</groupId>
             <artifactId>skywalking-util</artifactId>
-            <version>2.2-2017</version>
+            <version>2.3-2017</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml b/skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>skywalking-sniffer</artifactId>
     <groupId>com.a.eye</groupId>
-    <version>2.2-2017</version>
+    <version>2.3-2017</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>skywalking-agent</artifactId>
diff --git a/skywalking-sniffer/skywalking-agent/pom.xml b/skywalking-sniffer/skywalking-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.a.eye</groupId>
         <artifactId>skywalking-sniffer</artifactId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
 
     <artifactId>skywalking-agent</artifactId>
diff --git a/skywalking-sniffer/skywalking-api/pom.xml b/skywalking-sniffer/skywalking-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.a.eye</groupId>
         <artifactId>skywalking-sniffer</artifactId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
 
 
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.a.eye</groupId>
             <artifactId>skywalking-network</artifactId>
-            <version>2.2-2017</version>
+            <version>2.3-2017</version>
         </dependency>
         <dependency>
             <groupId>com.lmax</groupId>
diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>skywalking-sdk-plugin</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.a.eye</groupId>
             <artifactId>skywalking-api</artifactId>
-            <version>2.2-2017</version>
+            <version>2.3-2017</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.a.eye</groupId>
 		<artifactId>skywalking-sdk-plugin</artifactId>
-		<version>2.2-2017</version>
+		<version>2.3-2017</version>
 	</parent>
 	
 	<artifactId>skywalking-httpClient-4.x-plugin</artifactId>
@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>com.a.eye</groupId>
 			<artifactId>skywalking-api</artifactId>
-			<version>2.2-2017</version>
+			<version>2.3-2017</version>
 		</dependency>
 		
 
diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>skywalking-sdk-plugin</artifactId>
 		<groupId>com.a.eye</groupId>
-		<version>2.2-2017</version>
+		<version>2.3-2017</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>com.a.eye</groupId>
 			<artifactId>skywalking-api</artifactId>
-			<version>2.2-2017</version>
+			<version>2.3-2017</version>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.a.eye</groupId>
 		<artifactId>skywalking-sdk-plugin</artifactId>
-		<version>2.2-2017</version>
+		<version>2.3-2017</version>
 	</parent>
 
 	<artifactId>skywalking-jedis-2.x-plugin</artifactId>
diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>skywalking-sdk-plugin</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/skywalking-sniffer/skywalking-sdk-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.a.eye</groupId>
 		<artifactId>skywalking-sniffer</artifactId>
-		<version>2.2-2017</version>
+		<version>2.3-2017</version>
 	</parent>
 
 	<artifactId>skywalking-sdk-plugin</artifactId>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>com.a.eye</groupId>
 			<artifactId>skywalking-api</artifactId>
-			<version>2.2-2017</version>
+			<version>2.3-2017</version>
 		</dependency>
 	</dependencies>
 
diff --git a/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/rmi-oracle-1.8-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>skywalking-sdk-plugin</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>skywalking-sdk-plugin</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>skywalking-sniffer</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.a.eye</groupId>
             <artifactId>skywalking-api</artifactId>
-            <version>2.2-2017</version>
+            <version>2.3-2017</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>skywalking-toolkit-activation</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>skywalking-toolkit-activation</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>skywalking-toolkit-activation</artifactId>
         <groupId>com.a.eye</groupId>
-        <version>2.2-2017</version>
+        <version>2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java
@@ -47,7 +47,7 @@ public ElementMatcher<MethodDescription> getMethodsMatcher() {
 
             @Override
             public String getMethodsInterceptor() {
-                return "com.a.eye.skywalking.toolkit.log.logback.v1.x.PrintTraceIdInterceptor";
+                return "com.a.eye.skywalking.toolkit.activation.log.logback.v1.x.PrintTraceIdInterceptor";
             }
         }};
     }
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/pom.xml
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
diff --git a/skywalking-storage-center/pom.xml b/skywalking-storage-center/pom.xml
diff --git a/skywalking-storage-center/skywalking-routing/pom.xml b/skywalking-storage-center/skywalking-routing/pom.xml
diff --git a/skywalking-storage-center/skywalking-storage/pom.xml b/skywalking-storage-center/skywalking-storage/pom.xml
diff --git a/skywalking-webui/pom.xml b/skywalking-webui/pom.xml
