Merge pull request #1252 from koo-taejin/#1250

1.1.2 release #1250
pinpoint-apm · Nov 24, 2015 · f812022 · f812022
2 parents c6cbebb + d740eec
commit f812022
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 14 deletions.
diff --git a/agent/pom.xml b/agent/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.navercorp.pinpoint</groupId>
         <artifactId>pom</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.2</version>
     </parent>
 
     <artifactId>pinpoint-agent</artifactId>

diff --git a/bootstrap-core/pom.xml b/bootstrap-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.navercorp.pinpoint</groupId>
         <artifactId>pom</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.2</version>
     </parent>
 
     <artifactId>pinpoint-bootstrap-core</artifactId>

diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.navercorp.pinpoint</groupId>
         <artifactId>pom</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.2</version>
     </parent>
 
     <artifactId>pinpoint-bootstrap</artifactId>

diff --git a/collector/pom.xml b/collector/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.navercorp.pinpoint</groupId>
         <artifactId>pom</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.2</version>
     </parent>
 
     <artifactId>pinpoint-collector</artifactId>

diff --git a/commons-hbase/pom.xml b/commons-hbase/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.navercorp.pinpoint</groupId>
         <artifactId>pom</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.2</version>
     </parent>
 
     <artifactId>pinpoint-commons-hbase</artifactId>

diff --git a/commons/pom.xml b/commons/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.navercorp.pinpoint</groupId>
         <artifactId>pom</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.2</version>
     </parent>
 
     <artifactId>pinpoint-commons</artifactId>

diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/Version.java b/commons/src/main/java/com/navercorp/pinpoint/common/Version.java
@@ -1,4 +1,4 @@
 package com.navercorp.pinpoint.common;
 public final class Version {
-    public static final String VERSION = "1.1.2-SNAPSHOT";
+    public static final String VERSION = "1.1.2";
 }
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     </organization>
     <groupId>com.navercorp.pinpoint</groupId>
     <artifactId>pom</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <name>pinpoint</name>
     <packaging>pom</packaging>
 

diff --git a/profiler-optional/pom.xml b/profiler-optional/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.navercorp.pinpoint</groupId>
         <artifactId>pom</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.2</version>
     </parent>
 
     <artifactId>pinpoint-profiler-optional</artifactId>

diff --git a/profiler/pom.xml b/profiler/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.navercorp.pinpoint</groupId>
         <artifactId>pom</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.2</version>
     </parent>
 
     <artifactId>pinpoint-profiler</artifactId>

diff --git a/quickstart/conf/quickstart.properties b/quickstart/conf/quickstart.properties
@@ -1,6 +1,6 @@
 
 # quickstart properties
-quickstart.version=1.1.2-SNAPSHOT
+quickstart.version=1.1.2
 
 # quickstart-web properties
 quickstart.web.context.path=/

diff --git a/rpc/pom.xml b/rpc/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.navercorp.pinpoint</groupId>
         <artifactId>pom</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.2</version>
     </parent>
 
     <artifactId>pinpoint-rpc</artifactId>

diff --git a/thrift/pom.xml b/thrift/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.navercorp.pinpoint</groupId>
         <artifactId>pom</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.2</version>
     </parent>
 
     <artifactId>pinpoint-thrift</artifactId>

diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/TCommandTypeVersion.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/TCommandTypeVersion.java
@@ -29,17 +29,27 @@ public enum TCommandTypeVersion {
     // Match with agent version
     V_1_0_2_SNAPSHOT("1.0.2-SNAPSHOT", TCommandType.RESULT, TCommandType.THREAD_DUMP),
     V_1_0_2("1.0.2", V_1_0_2_SNAPSHOT),
+
     V_1_0_3_SNAPSHOT("1.0.3-SNAPSHOT", V_1_0_2, TCommandType.ECHO, TCommandType.TRANSFER, TCommandType.THREAD_DUMP_RESPONSE),
     V_1_0_3("1.0.3", V_1_0_3_SNAPSHOT),
+
     V_1_0_4_SNAPSHOT("1.0.4-SNAPSHOT", V_1_0_3),
     V_1_0_4("1.0.4", V_1_0_4_SNAPSHOT),
+
     V_1_0_5_SNAPSHOT("1.0.5-SNAPSHOT", V_1_0_4),
     V_1_0_5("1.0.5", V_1_0_5_SNAPSHOT),
+
+
     V_1_1_0_SNAPSHOT("1.1.0-SNAPSHOT", V_1_0_5),
     V_1_1_0("1.1.0", V_1_1_0_SNAPSHOT),
+
     V_1_1_1_SNAPSHOT("1.1.1-SNAPSHOT", V_1_1_0),
     V_1_1_1("1.1.1", V_1_1_1_SNAPSHOT),
+
     V_1_1_2_SNAPSHOT("1.1.2-SNAPSHOT", V_1_1_1),
+    V_1_1_2("1.1.2", V_1_1_2_SNAPSHOT),
+
+    V_1_1_3_SNAPSHOT("1.1.3-SNAPSHOT", V_1_1_2),
 
     UNKNOWN("UNKNOWN");
 

diff --git a/web/pom.xml b/web/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.navercorp.pinpoint</groupId>
         <artifactId>pom</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.2</version>
     </parent>
 
     <artifactId>pinpoint-web</artifactId>