Skip to content

Commit

Permalink
Merge pull request #693 from koo-taejin/#692
Browse files Browse the repository at this point in the history 
1.1.0 release #692
  • Loading branch information
@koo-taejin
koo-taejin committed Jul 8, 2015
2 parents f49d866 + 42603d6 commit f41c3cf
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion agent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0</version>
</parent>

<artifactId>pinpoint-agent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bootstrap-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0</version>
</parent>

<artifactId>pinpoint-bootstrap-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0</version>
</parent>

<artifactId>pinpoint-bootstrap</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion collector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0</version>
</parent>

<artifactId>pinpoint-collector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion commons-hbase/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0</version>
</parent>

<artifactId>pinpoint-commons-hbase</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion commons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0</version>
</parent>

<artifactId>pinpoint-commons</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion commons/src/main/java/com/navercorp/pinpoint/common/Version.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.navercorp.pinpoint.common;
public final class Version {
public static final String VERSION = "1.1.0-SNAPSHOT";
public static final String VERSION = "1.1.0";
}
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</organization>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0</version>
<name>pinpoint</name>
<packaging>pom</packaging>

Expand Down
2 changes: 1 addition & 1 deletion profiler-optional/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0</version>
</parent>

<artifactId>pinpoint-profiler-optional</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion profiler/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0</version>
</parent>

<artifactId>pinpoint-profiler</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion quickstart/conf/quickstart.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# quickstart properties
quickstart.version=1.1.0-SNAPSHOT
quickstart.version=1.1.0

# quickstart-web properties
quickstart.web.context.path=/
Expand Down
2 changes: 1 addition & 1 deletion rpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0</version>
</parent>

<artifactId>pinpoint-rpc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion thrift/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0</version>
</parent>

<artifactId>pinpoint-thrift</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions thrift/src/main/java/com/navercorp/pinpoint/thrift/io/TCommandTypeVersion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ public enum TCommandTypeVersion {
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),


UNKNOWN("UNKNOWN");

Expand Down
2 changes: 1 addition & 1 deletion web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0</version>
</parent>

<artifactId>pinpoint-web</artifactId>
Expand Down

0 comments on commit f41c3cf

Please # to comment.