Skip to content

Commit 3acb1d4

Browse files
terrymanuterrymanu
committed
upgrade to 1.2.0
1 parent 444ba43 commit 3acb1d4

File tree

18 files changed

+28
-32
lines changed

18 files changed

+28
-32
lines changed

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>com.dangdang</groupId>
44
<artifactId>sharding-jdbc</artifactId>
5-
<version>1.1.1-SNAPSHOT</version>
5+
<version>1.2.0</version>
66
<packaging>pom</packaging>
77
<name>${project.artifactId}</name>
88

‎sharding-jdbc-config-parent/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.dangdang</groupId>
88
<artifactId>sharding-jdbc</artifactId>
9-
<version>1.1.1-SNAPSHOT</version>
9+
<version>1.2.0</version>
1010
</parent>
1111
<artifactId>sharding-jdbc-config-parent</artifactId>
1212
<packaging>pom</packaging>

‎sharding-jdbc-config-parent/sharding-jdbc-config-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>sharding-jdbc-config-parent</artifactId>
88
<groupId>com.dangdang</groupId>
9-
<version>1.1.1-SNAPSHOT</version>
9+
<version>1.2.0</version>
1010
</parent>
1111
<artifactId>sharding-jdbc-config-common</artifactId>
1212
<dependencies>

‎sharding-jdbc-config-parent/sharding-jdbc-config-spring/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sharding-jdbc-config-parent</artifactId>
55
<groupId>com.dangdang</groupId>
6-
<version>1.1.1-SNAPSHOT</version>
6+
<version>1.2.0</version>
77
</parent>
88
<artifactId>sharding-jdbc-config-spring</artifactId>
99
<dependencies>

‎sharding-jdbc-config-parent/sharding-jdbc-config-yaml/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>sharding-jdbc-config-parent</artifactId>
88
<groupId>com.dangdang</groupId>
9-
<version>1.1.1-SNAPSHOT</version>
9+
<version>1.2.0</version>
1010
</parent>
1111
<artifactId>sharding-jdbc-config-yaml</artifactId>
1212
<dependencies>

‎sharding-jdbc-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.dangdang</groupId>
66
<artifactId>sharding-jdbc</artifactId>
7-
<version>1.1.1-SNAPSHOT</version>
7+
<version>1.2.0</version>
88
</parent>
99
<artifactId>sharding-jdbc-core</artifactId>
1010
<name>${project.artifactId}</name>

‎sharding-jdbc-example/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>com.dangdang</groupId>
44
<artifactId>sharding-jdbc-example</artifactId>
5-
<version>1.1.1-SNAPSHOT</version>
5+
<version>1.2.0</version>
66
<packaging>pom</packaging>
77

88
<modules>
@@ -20,7 +20,7 @@
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<project.build.locale>zh_CN</project.build.locale>
2222

23-
<sharding-jdbc.version>1.1.1-SNAPSHOT</sharding-jdbc.version>
23+
<sharding-jdbc.version>1.2.0</sharding-jdbc.version>
2424

2525
<commons-dbcp.version>1.4</commons-dbcp.version>
2626
<mysql-connector-java.version>5.1.30</mysql-connector-java.version>

‎sharding-jdbc-example/sharding-jdbc-example-config-spring/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.dangdang</groupId>
88
<artifactId>sharding-jdbc-example</artifactId>
9-
<version>1.1.1-SNAPSHOT</version>
9+
<version>1.2.0</version>
1010
</parent>
1111
<artifactId>sharding-jdbc-example-config-spring</artifactId>
1212
</project>

‎sharding-jdbc-example/sharding-jdbc-example-config-yaml/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.dangdang</groupId>
88
<artifactId>sharding-jdbc-example</artifactId>
9-
<version>1.1.1-SNAPSHOT</version>
9+
<version>1.2.0</version>
1010
</parent>
1111
<artifactId>sharding-jdbc-example-config-yaml</artifactId>
1212
</project>

‎sharding-jdbc-example/sharding-jdbc-example-jdbc-transaction/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.dangdang</groupId>
55
<artifactId>sharding-jdbc-example</artifactId>
6-
<version>1.1.1-SNAPSHOT</version>
6+
<version>1.2.0</version>
77
</parent>
88
<artifactId>sharding-jdbc-example-jdbc-transaction</artifactId>
99
</project>

‎sharding-jdbc-example/sharding-jdbc-example-jdbc/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.dangdang</groupId>
55
<artifactId>sharding-jdbc-example</artifactId>
6-
<version>1.1.1-SNAPSHOT</version>
6+
<version>1.2.0</version>
77
</parent>
88
<artifactId>sharding-jdbc-example-jdbc</artifactId>
99
</project>

‎sharding-jdbc-example/sharding-jdbc-example-jpa/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.dangdang</groupId>
55
<artifactId>sharding-jdbc-example</artifactId>
6-
<version>1.1.1-SNAPSHOT</version>
6+
<version>1.2.0</version>
77
</parent>
88
<artifactId>sharding-jdbc-example-jpa</artifactId>
99

‎sharding-jdbc-example/sharding-jdbc-example-mybatis/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.dangdang</groupId>
55
<artifactId>sharding-jdbc-example</artifactId>
6-
<version>1.1.1-SNAPSHOT</version>
6+
<version>1.2.0</version>
77
</parent>
88
<artifactId>sharding-jdbc-example-mybatis</artifactId>
99

‎sharding-jdbc-transaction-parent/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.dangdang</groupId>
88
<artifactId>sharding-jdbc</artifactId>
9-
<version>1.1.1-SNAPSHOT</version>
9+
<version>1.2.0</version>
1010
</parent>
1111
<artifactId>sharding-jdbc-transaction-parent</artifactId>
1212
<packaging>pom</packaging>

‎sharding-jdbc-transaction-parent/sharding-jdbc-transaction-async-job/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.dangdang</groupId>
55
<artifactId>sharding-jdbc-transaction-parent</artifactId>
6-
<version>1.1.1-SNAPSHOT</version>
6+
<version>1.2.0</version>
77
</parent>
88
<artifactId>sharding-jdbc-transaction-async-job</artifactId>
99
<name>${project.artifactId}</name>

‎sharding-jdbc-transaction-parent/sharding-jdbc-transaction-async-job/src/main/resources/bin/stop.sh

+10-14
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,28 @@ BIN_DIR=`pwd`
44
cd ..
55
DEPLOY_DIR=`pwd`
66

7-
SERVER_NAME=dd-frame-container
7+
SERVER_NAME=sharding-jdbc-transaction-async-job
88

9-
PIDS=`ps -ef | grep java | grep "$DEPLOY_DIR" |awk '{print $2}'`
10-
if [ -z "$PIDS" ]; then
9+
PID=`ps -ef | grep java | grep "$DEPLOY_DIR" |awk '{print $2}'`
10+
if [ -z "$PID" ]; then
1111
echo "ERROR: The $SERVER_NAME does not started!"
1212
exit 1
1313
fi
1414

1515
echo -e "Stopping the $SERVER_NAME ...\c"
16-
for PID in $PIDS ; do
17-
kill $PID > /dev/null 2>&1
18-
done
16+
kill $PID > /dev/null 2>&1
1917

2018
COUNT=0
2119
while [ $COUNT -lt 1 ]; do
2220
echo -e ".\c"
2321
sleep 1
2422
COUNT=1
25-
for PID in $PIDS ; do
26-
PID_EXIST=`ps -f -p $PID | grep java`
27-
if [ -n "$PID_EXIST" ]; then
28-
COUNT=0
29-
break
30-
fi
31-
done
23+
PID_EXIST=`ps -f -p $PID | grep java`
24+
if [ -n "$PID_EXIST" ]; then
25+
COUNT=0
26+
break
27+
fi
3228
done
3329

3430
echo "OK!"
35-
echo "PID: $PIDS"
31+
echo "PID: $PID"

‎sharding-jdbc-transaction-parent/sharding-jdbc-transaction-storage/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.dangdang</groupId>
55
<artifactId>sharding-jdbc-transaction-parent</artifactId>
6-
<version>1.1.1-SNAPSHOT</version>
6+
<version>1.2.0</version>
77
</parent>
88
<artifactId>sharding-jdbc-transaction-storage</artifactId>
99
<name>${project.artifactId}</name>

‎sharding-jdbc-transaction-parent/sharding-jdbc-transaction/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.dangdang</groupId>
55
<artifactId>sharding-jdbc-transaction-parent</artifactId>
6-
<version>1.1.1-SNAPSHOT</version>
6+
<version>1.2.0</version>
77
</parent>
88
<artifactId>sharding-jdbc-transaction</artifactId>
99
<name>${project.artifactId}</name>

0 commit comments

Comments
 (0)