merge from release_v4.0.2

examcloud-core-basic-api-provider/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>cn.com.qmth.examcloud.core.basic</groupId>
         <artifactId>examcloud-core-basic</artifactId>
-        <version>v4.0.1-RELEASE</version>
+        <version>v4.0.2-RELEASE</version>
     </parent>
 
     <dependencies>

examcloud-core-basic-base/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>cn.com.qmth.examcloud.core.basic</groupId>
         <artifactId>examcloud-core-basic</artifactId>
-        <version>v4.0.1-RELEASE</version>
+        <version>v4.0.2-RELEASE</version>
     </parent>
 
     <dependencies>

examcloud-core-basic-dao/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.core.basic</groupId>
 		<artifactId>examcloud-core-basic</artifactId>
-		<version>v4.0.1-RELEASE</version>
+		<version>v4.0.2-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-basic-dao</artifactId>
 

examcloud-core-basic-service/pom.xml

@@ -1,33 +1,40 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>cn.com.qmth.examcloud.core.basic</groupId>
-		<artifactId>examcloud-core-basic</artifactId>
-		<version>v4.0.1-RELEASE</version>
-	</parent>
-	<artifactId>examcloud-core-basic-service</artifactId>
-	<packaging>jar</packaging>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.com.qmth.examcloud.core.basic</groupId>
+        <artifactId>examcloud-core-basic</artifactId>
+        <version>v4.0.2-RELEASE</version>
+    </parent>
+    <artifactId>examcloud-core-basic-service</artifactId>
+    <packaging>jar</packaging>
 
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.core.basic</groupId>
-			<artifactId>examcloud-core-basic-dao</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud.core.basic</groupId>
+            <artifactId>examcloud-core-basic-dao</artifactId>
+            <version>${examcloud.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.rpc</groupId>
-			<artifactId>examcloud-exchange-inner-api-client</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud.rpc</groupId>
+            <artifactId>examcloud-exchange-inner-api-client</artifactId>
+            <version>${examcloud.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.rpc</groupId>
-			<artifactId>examcloud-task-api-client</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud.rpc</groupId>
+            <artifactId>examcloud-task-api-client</artifactId>
+            <version>${examcloud.version}</version>
+        </dependency>
 
-	</dependencies>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud.rpc</groupId>
+            <artifactId>examcloud-core-examwork-api-client</artifactId>
+            <version>${examcloud.version}</version>
+        </dependency>
 
-</project>
+    </dependencies>
+
+</project>

examcloud-core-basic-starter/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.core.basic</groupId>
 		<artifactId>examcloud-core-basic</artifactId>
-		<version>v4.0.1-RELEASE</version>
+		<version>v4.0.2-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-basic-starter</artifactId>
 	<packaging>jar</packaging>

examcloud-core-basic-starter/shell/start.sh

@@ -2,7 +2,7 @@
 
 FILE_PATH=$(cd `dirname $0`; pwd)
 
-APP_MAIN_JAR="examcloud-core-basic-starter-v4.0.1-RELEASE.jar"
+APP_MAIN_JAR="examcloud-core-basic-starter-v4.0.2-RELEASE.jar"
 
 JAVA_OPTS=`cat $FILE_PATH/start.vmoptions`
 APP_ARGS=`cat $FILE_PATH/start.args`

examcloud-core-basic-starter/shell/stop.sh

@@ -2,7 +2,7 @@
 
 FILE_PATH=$(cd `dirname $0`; pwd)
 
-APP_MAIN_JAR="examcloud-core-basic-starter-v4.0.1-RELEASE.jar"
+APP_MAIN_JAR="examcloud-core-basic-starter-v4.0.2-RELEASE.jar"
 
 PID_LIST=`ps -ef|grep $APP_MAIN_JAR|grep java|awk '{print $2}'`
 

pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.com.qmth.examcloud.core.basic</groupId>
     <artifactId>examcloud-core-basic</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-parent</artifactId>
-        <version>v4.0.1-RELEASE</version>
+        <version>v4.0.2-RELEASE</version>
     </parent>
 
     <modules>