Merge pull request pinpoint-apm#941 from koo-taejin/1.1.x

koo-taejin · koo-taejin · commit 9dca6d9e7e44 · 2015-09-08T15:51:08.000+09:00
1.1.1 release pinpoint-apm#937
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.1-SNAPSHOT</version>
+        <version>1.1.1</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.1-SNAPSHOT</version>
+        <version>1.1.1</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.1-SNAPSHOT</version>
+        <version>1.1.1</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.1-SNAPSHOT</version>
+        <version>1.1.1</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.1-SNAPSHOT</version>
+        <version>1.1.1</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.1-SNAPSHOT</version>
+        <version>1.1.1</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.1-SNAPSHOT";
+    public static final String VERSION = "1.1.1";
 }
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     </organization>
     <groupId>com.navercorp.pinpoint</groupId>
     <artifactId>pom</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</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.1-SNAPSHOT</version>
+        <version>1.1.1</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.1-SNAPSHOT</version>
+        <version>1.1.1</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.1-SNAPSHOT
+quickstart.version=1.1.1
 
 # 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.1-SNAPSHOT</version>
+        <version>1.1.1</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.1-SNAPSHOT</version>
+        <version>1.1.1</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
@@ -38,7 +38,9 @@ public enum TCommandTypeVersion {
     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),
+
+
     UNKNOWN("UNKNOWN");
 
     private final String versionName;
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.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
 
     <artifactId>pinpoint-web</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`package com.navercorp.pinpoint.common;`
`2`	`2`	`public final class Version {`
`3`		`- public static final String VERSION = "1.1.1-SNAPSHOT";`
	`3`	`+ public static final String VERSION = "1.1.1";`
`4`	`4`	`}`