upgrade to 1.2.0

renbangjie · May 5, 2016 · 3acb1d4 · 3acb1d4
1 parent 444ba43
commit 3acb1d4
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 32 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dangdang</groupId>
     <artifactId>sharding-jdbc</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 

diff --git a/sharding-jdbc-config-parent/pom.xml b/sharding-jdbc-config-parent/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.dangdang</groupId>
         <artifactId>sharding-jdbc</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-config-parent</artifactId>
     <packaging>pom</packaging>

diff --git a/sharding-jdbc-config-parent/sharding-jdbc-config-common/pom.xml b/sharding-jdbc-config-parent/sharding-jdbc-config-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>sharding-jdbc-config-parent</artifactId>
         <groupId>com.dangdang</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-config-common</artifactId>
     <dependencies>

diff --git a/sharding-jdbc-config-parent/sharding-jdbc-config-spring/pom.xml b/sharding-jdbc-config-parent/sharding-jdbc-config-spring/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sharding-jdbc-config-parent</artifactId>
         <groupId>com.dangdang</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-config-spring</artifactId>
     <dependencies>

diff --git a/sharding-jdbc-config-parent/sharding-jdbc-config-yaml/pom.xml b/sharding-jdbc-config-parent/sharding-jdbc-config-yaml/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>sharding-jdbc-config-parent</artifactId>
         <groupId>com.dangdang</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-config-yaml</artifactId>
     <dependencies>

diff --git a/sharding-jdbc-core/pom.xml b/sharding-jdbc-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.dangdang</groupId>
         <artifactId>sharding-jdbc</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-core</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-jdbc-example/pom.xml b/sharding-jdbc-example/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dangdang</groupId>
     <artifactId>sharding-jdbc-example</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -20,7 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.locale>zh_CN</project.build.locale>
 
-        <sharding-jdbc.version>1.1.1-SNAPSHOT</sharding-jdbc.version>
+        <sharding-jdbc.version>1.2.0</sharding-jdbc.version>
 
         <commons-dbcp.version>1.4</commons-dbcp.version>
         <mysql-connector-java.version>5.1.30</mysql-connector-java.version>

diff --git a/sharding-jdbc-example/sharding-jdbc-example-config-spring/pom.xml b/sharding-jdbc-example/sharding-jdbc-example-config-spring/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.dangdang</groupId>
         <artifactId>sharding-jdbc-example</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-example-config-spring</artifactId>
 </project>
diff --git a/sharding-jdbc-example/sharding-jdbc-example-config-yaml/pom.xml b/sharding-jdbc-example/sharding-jdbc-example-config-yaml/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.dangdang</groupId>
         <artifactId>sharding-jdbc-example</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-example-config-yaml</artifactId>
 </project>
diff --git a/sharding-jdbc-example/sharding-jdbc-example-jdbc-transaction/pom.xml b/sharding-jdbc-example/sharding-jdbc-example-jdbc-transaction/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.dangdang</groupId>
         <artifactId>sharding-jdbc-example</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-example-jdbc-transaction</artifactId>
 </project>
diff --git a/sharding-jdbc-example/sharding-jdbc-example-jdbc/pom.xml b/sharding-jdbc-example/sharding-jdbc-example-jdbc/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.dangdang</groupId>
         <artifactId>sharding-jdbc-example</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-example-jdbc</artifactId>
 </project>
diff --git a/sharding-jdbc-example/sharding-jdbc-example-jpa/pom.xml b/sharding-jdbc-example/sharding-jdbc-example-jpa/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.dangdang</groupId>
         <artifactId>sharding-jdbc-example</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-example-jpa</artifactId>
 

diff --git a/sharding-jdbc-example/sharding-jdbc-example-mybatis/pom.xml b/sharding-jdbc-example/sharding-jdbc-example-mybatis/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.dangdang</groupId>
         <artifactId>sharding-jdbc-example</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-example-mybatis</artifactId>
 

diff --git a/sharding-jdbc-transaction-parent/pom.xml b/sharding-jdbc-transaction-parent/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.dangdang</groupId>
         <artifactId>sharding-jdbc</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-transaction-parent</artifactId>
     <packaging>pom</packaging>

diff --git a/sharding-jdbc-transaction-parent/sharding-jdbc-transaction-async-job/pom.xml b/sharding-jdbc-transaction-parent/sharding-jdbc-transaction-async-job/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.dangdang</groupId>
         <artifactId>sharding-jdbc-transaction-parent</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-transaction-async-job</artifactId>
     <name>${project.artifactId}</name>

diff --git a/...dbc-transaction-parent/sharding-jdbc-transaction-async-job/src/main/resources/bin/stop.sh b/...dbc-transaction-parent/sharding-jdbc-transaction-async-job/src/main/resources/bin/stop.sh
@@ -4,32 +4,28 @@ BIN_DIR=`pwd`
 cd ..
 DEPLOY_DIR=`pwd`
 
-SERVER_NAME=dd-frame-container
+SERVER_NAME=sharding-jdbc-transaction-async-job
 
-PIDS=`ps -ef | grep java | grep "$DEPLOY_DIR" |awk '{print $2}'`
-if [ -z "$PIDS" ]; then
+PID=`ps -ef | grep java | grep "$DEPLOY_DIR" |awk '{print $2}'`
+if [ -z "$PID" ]; then
     echo "ERROR: The $SERVER_NAME does not started!"
     exit 1
 fi
 
 echo -e "Stopping the $SERVER_NAME ...\c"
-for PID in $PIDS ; do
-    kill $PID > /dev/null 2>&1
-done
+kill $PID > /dev/null 2>&1
 
 COUNT=0
 while [ $COUNT -lt 1 ]; do
     echo -e ".\c"
     sleep 1
     COUNT=1
-    for PID in $PIDS ; do
-        PID_EXIST=`ps -f -p $PID | grep java`
-        if [ -n "$PID_EXIST" ]; then
-            COUNT=0
-            break
-        fi
-    done
+    PID_EXIST=`ps -f -p $PID | grep java`
+    if [ -n "$PID_EXIST" ]; then
+        COUNT=0
+        break
+    fi
 done
 
 echo "OK!"
-echo "PID: $PIDS"
+echo "PID: $PID"
diff --git a/sharding-jdbc-transaction-parent/sharding-jdbc-transaction-storage/pom.xml b/sharding-jdbc-transaction-parent/sharding-jdbc-transaction-storage/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.dangdang</groupId>
         <artifactId>sharding-jdbc-transaction-parent</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-transaction-storage</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/pom.xml b/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.dangdang</groupId>
         <artifactId>sharding-jdbc-transaction-parent</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>sharding-jdbc-transaction</artifactId>
     <name>${project.artifactId}</name>