开始开发3.0.6版本

zhouheming · Dec 17, 2013 · 894d13f · 894d13f
1 parent bdfb5d4
commit 894d13f
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 18 deletions.
diff --git a/develop.sh b/develop.sh
@@ -9,4 +9,4 @@ export JAVA_HOME=/opt/taobao/java
 export PATH=/opt/taobao/mvn/bin:$JAVA_HOME/bin:$PATH
 mvn -Dmaven.test.skip=true clean package install assembly:assembly -U
 
-ln -s target/alibaba-rocketmq-3.0.5.dir/alibaba-rocketmq devenv
+ln -s target/alibaba-rocketmq-3.0.6-SNAPSHOT.dir/alibaba-rocketmq devenv
diff --git a/install.sh b/install.sh
@@ -9,4 +9,4 @@ export JAVA_HOME=/opt/taobao/java
 export PATH=/opt/taobao/mvn/bin:$JAVA_HOME/bin:$PATH
 mvn -Dmaven.test.skip=true clean package install assembly:assembly -U
 
-ln -s target/alibaba-rocketmq-3.0.5.dir/alibaba-rocketmq devenv
+ln -s target/alibaba-rocketmq-3.0.6-SNAPSHOT.dir/alibaba-rocketmq devenv
diff --git a/pom.xml b/pom.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-<!--
+ 
 	<parent>
 		<groupId>com.taobao</groupId>
 		<artifactId>parent</artifactId>
 		<version>1.0.2</version>
 	</parent>
--->
+	<!--
+
 	<parent>
 		<groupId>org.sonatype.oss</groupId>
 		<artifactId>oss-parent</artifactId>
 		<version>7</version>
 	</parent>
-
+-->
 
 	<modelVersion>4.0.0</modelVersion>
 	<inceptionYear>2012</inceptionYear>
 	<groupId>com.alibaba.rocketmq</groupId>
 	<artifactId>rocketmq-all</artifactId>
-	<version>3.0.5-open</version>
+	<version>3.0.6-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>rocketmq-all ${project.version}</name>
 	<url>https://github.com/alibaba/rocketmq</url>

diff --git a/rocketmq-broker/pom.xml b/rocketmq-broker/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>com.alibaba.rocketmq</groupId>
 		<artifactId>rocketmq-all</artifactId>
-		<version>3.0.5-open</version>
+		<version>3.0.6-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/rocketmq-client/pom.xml b/rocketmq-client/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>com.alibaba.rocketmq</groupId>
 		<artifactId>rocketmq-all</artifactId>
-		<version>3.0.5-open</version>
+		<version>3.0.6-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/rocketmq-common/pom.xml b/rocketmq-common/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>com.alibaba.rocketmq</groupId>
 		<artifactId>rocketmq-all</artifactId>
-		<version>3.0.5-open</version>
+		<version>3.0.6-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/MQVersion.java b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/MQVersion.java
@@ -22,7 +22,7 @@
  */
 public class MQVersion {
     // TODO 每次发布版本都要修改此处版本号
-    public static final int CurrentVersion = Version.V3_0_5.ordinal();
+    public static final int CurrentVersion = Version.V3_0_6_SNAPSHOT.ordinal();
 
 
     public static String getVersionDesc(int value) {

diff --git a/rocketmq-example/pom.xml b/rocketmq-example/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>com.alibaba.rocketmq</groupId>
 		<artifactId>rocketmq-all</artifactId>
-		<version>3.0.5-open</version>
+		<version>3.0.6-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/ordermessage/Producer.java b/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/ordermessage/Producer.java
@@ -44,7 +44,7 @@ public static void main(String[] args) {
                 // 订单ID相同的消息要有序
                 int orderId = i % 10;
                 Message msg =
-                        new Message("TopicTest", tags[i % tags.length], "KEY" + i,
+                        new Message("TopicTestjjj", tags[i % tags.length], "KEY" + i,
                             ("Hello RocketMQ " + i).getBytes());
 
                 SendResult sendResult = producer.send(msg, new MessageQueueSelector() {

diff --git a/rocketmq-namesrv/pom.xml b/rocketmq-namesrv/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>com.alibaba.rocketmq</groupId>
 		<artifactId>rocketmq-all</artifactId>
-		<version>3.0.5-open</version>
+		<version>3.0.6-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/rocketmq-qatest/pom.xml b/rocketmq-qatest/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.rocketmq</groupId>
 		<artifactId>rocketmq-all</artifactId>
-		<version>3.0.5-open</version>
+		<version>3.0.6-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>rocketmq-qatest</artifactId>

diff --git a/rocketmq-remoting/pom.xml b/rocketmq-remoting/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>com.alibaba.rocketmq</groupId>
 		<artifactId>rocketmq-all</artifactId>
-		<version>3.0.5-open</version>
+		<version>3.0.6-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/rocketmq-research/pom.xml b/rocketmq-research/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>com.alibaba.rocketmq</groupId>
 		<artifactId>rocketmq-all</artifactId>
-		<version>3.0.5-open</version>
+		<version>3.0.6-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/rocketmq-research/src/main/java/com/alibaba/rocketmq/research/Test.java b/rocketmq-research/src/main/java/com/alibaba/rocketmq/research/Test.java
@@ -7,6 +7,7 @@
  * @author shijia.wxr<[email protected]>
  */
 public class Test {
+
     public static long computNextMorningTimeMillis() {
         Calendar cal = Calendar.getInstance();
         cal.set(Calendar.YEAR, 2013);

diff --git a/rocketmq-store/pom.xml b/rocketmq-store/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>com.alibaba.rocketmq</groupId>
 		<artifactId>rocketmq-all</artifactId>
-		<version>3.0.5-open</version>
+		<version>3.0.6-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/rocketmq-tools/pom.xml b/rocketmq-tools/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>com.alibaba.rocketmq</groupId>
 		<artifactId>rocketmq-all</artifactId>
-		<version>3.0.5-open</version>
+		<version>3.0.6-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>