merge from release_v4.0.2

examcloud-api-commons/pom.xml

@@ -3,13 +3,13 @@
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-api-commons</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>jar</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>
 
     <dependencies>

examcloud-commons/pom.xml

@@ -3,13 +3,13 @@
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-commons</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>jar</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>
 
     <dependencies>

examcloud-config-center-starter/pom.xml

@@ -3,13 +3,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-config-center-starter</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>jar</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>
 
     <dependencies>

examcloud-java-sdk/pom.xml

@@ -3,13 +3,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.com.qmth.sdk</groupId>
     <artifactId>examcloud-java-sdk</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>jar</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>
 
     <properties>

examcloud-jenkins-build/pom.xml

@@ -3,13 +3,13 @@
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-jenkins-build</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>jar</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>
 
 </project>

examcloud-parent/pom.xml

@@ -1,409 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>cn.com.qmth.examcloud</groupId>
-    <artifactId>examcloud-parent</artifactId>
-    <version>v4.0.1-RELEASE</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <!-- 云平台版本 -->
-        <examcloud.version>v4.0.1-RELEASE</examcloud.version>
-        <spring-boot.version>2.1.16.RELEASE</spring-boot.version>
-        <spring-cloud.version>Greenwich.SR6</spring-cloud.version>
-        <druid.version>1.1.23</druid.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-
-            <!-- 常用Jars start -->
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>29.0-jre</version>
-            </dependency>
-            <dependency>
-                <groupId>com.squareup.okhttp3</groupId>
-                <artifactId>okhttp</artifactId>
-                <version>3.14.9</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>4.5.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpmime</artifactId>
-                <version>4.5.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>3.11</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-beanutils</groupId>
-                <artifactId>commons-beanutils</artifactId>
-                <version>1.9.4</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.7</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>1.14</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>3.2.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-collections4</artifactId>
-                <version>4.4</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-net</groupId>
-                <artifactId>commons-net</artifactId>
-                <version>3.6</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>1.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-compress</artifactId>
-                <version>1.20</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-text</artifactId>
-                <version>1.9</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.2</version>
-            </dependency>
-            <!-- 常用Jars end -->
-
-
-            <!-- Excel Jars start -->
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi</artifactId>
-                <version>3.17</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-ooxml</artifactId>
-                <version>3.17</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-ooxml-schemas</artifactId>
-                <version>3.17</version>
-            </dependency>
-            <!-- Excel Jars end -->
-
-
-            <!-- Json Jars start -->
-            <dependency>
-                <groupId>com.google.code.gson</groupId>
-                <artifactId>gson</artifactId>
-                <version>2.8.6</version>
-            </dependency>
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>1.2.73</version>
-            </dependency>
-            <dependency>
-                <groupId>org.json</groupId>
-                <artifactId>json</artifactId>
-                <version>20200518</version>
-            </dependency>
-            <dependency>
-                <groupId>com.jayway.jsonpath</groupId>
-                <artifactId>json-path</artifactId>
-                <version>2.4.0</version>
-            </dependency>
-            <dependency>
-                <groupId>net.minidev</groupId>
-                <artifactId>json-smart</artifactId>
-                <version>2.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.jettison</groupId>
-                <artifactId>jettison</artifactId>
-                <version>1.4.1</version>
-            </dependency>
-            <dependency>
-                <groupId>net.sf.json-lib</groupId>
-                <artifactId>json-lib</artifactId>
-                <version>2.4</version>
-                <classifier>jdk15</classifier>
-            </dependency>
-            <!-- Json Jars end -->
-
-
-            <!-- Swagger Jars start -->
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger2</artifactId>
-                <version>2.9.2</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.xiaoymin</groupId>
-                <artifactId>swagger-bootstrap-ui</artifactId>
-                <version>1.9.6</version>
-            </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>1.5.24</version>
-            </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-models</artifactId>
-                <version>1.5.24</version>
-            </dependency>
-            <!-- Swagger Jars end -->
-
-
-            <!-- Sdk Jars start -->
-            <dependency>
-                <groupId>com.aliyun</groupId>
-                <artifactId>aliyun-java-sdk-core</artifactId>
-                <version>4.5.7</version>
-            </dependency>
-            <dependency>
-                <groupId>com.aliyun.oss</groupId>
-                <artifactId>aliyun-sdk-oss</artifactId>
-                <version>3.11.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.aliyun</groupId>
-                <artifactId>aliyun-java-sdk-cdn</artifactId>
-                <version>3.4.3</version>
-            </dependency>
-            <dependency>
-                <groupId>com.baidu.aip</groupId>
-                <artifactId>java-sdk</artifactId>
-                <version>4.12.0</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-simple</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>com.upyun</groupId>
-                <artifactId>java-sdk</artifactId>
-                <version>3.20</version>
-            </dependency>
-            <dependency>
-                <groupId>com.aliyun.openservices</groupId>
-                <artifactId>ons-client</artifactId>
-                <version>1.8.7.1.Final</version>
-            </dependency>
-            <!-- Sdk Jars end -->
-
-
-            <!-- Other Jars start -->
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-validator</artifactId>
-                <version>5.3.6.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.docx4j</groupId>
-                <artifactId>docx4j-ImportXHTML</artifactId>
-                <version>6.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jsoup</groupId>
-                <artifactId>jsoup</artifactId>
-                <version>1.13.1</version>
-            </dependency>
-            <dependency>
-                <groupId>com.mchange</groupId>
-                <artifactId>c3p0</artifactId>
-                <version>0.9.5.5</version>
-            </dependency>
-            <dependency>
-                <groupId>com.thoughtworks.xstream</groupId>
-                <artifactId>xstream</artifactId>
-                <version>1.4.12</version>
-            </dependency>
-            <dependency>
-                <groupId>com.googlecode.aviator</groupId>
-                <artifactId>aviator</artifactId>
-                <version>4.2.10</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.code.findbugs</groupId>
-                <artifactId>jsr305</artifactId>
-                <version>3.0.2</version>
-            </dependency>
-            <dependency>
-                <groupId>com.mchange</groupId>
-                <artifactId>mchange-commons-java</artifactId>
-                <version>0.2.20</version>
-            </dependency>
-            <dependency>
-                <groupId>com.esotericsoftware</groupId>
-                <artifactId>reflectasm</artifactId>
-                <version>1.11.9</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jline</groupId>
-                <artifactId>jline</artifactId>
-                <version>3.16.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.penggle</groupId>
-                <artifactId>kaptcha</artifactId>
-                <version>2.3.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.scala-lang</groupId>
-                <artifactId>scala-library</artifactId>
-                <version>2.13.3</version>
-            </dependency>
-            <dependency>
-                <groupId>net.sourceforge.jeuclid</groupId>
-                <artifactId>jeuclid-core</artifactId>
-                <version>3.1.9</version>
-            </dependency>
-            <dependency>
-                <groupId>net.sf.saxon</groupId>
-                <artifactId>Saxon-HE</artifactId>
-                <version>10.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ansj</groupId>
-                <artifactId>ansj_seg</artifactId>
-                <version>5.1.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.antlr</groupId>
-                <artifactId>antlr-runtime</artifactId>
-                <version>3.5.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.javassist</groupId>
-                <artifactId>javassist</artifactId>
-                <version>3.27.0-GA</version>
-            </dependency>
-            <!-- Other Jars end -->
-
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <testFailureIgnore>true</testFailureIgnore>
-                    <skipTests>true</skipTests>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <compilerArgument>-proc:none</compilerArgument>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <configuration>
-                    <attach>true</attach>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!--<repositories>
-        <repository>
-            <id>nexus</id>
-            <name>nexus</name>
-            <url>http://nexus-host:8081/repository/maven-public/</url>
-        </repository>
-    </repositories>-->
-
-    <!--<pluginRepositories>
-        <pluginRepository>
-            <id>nexus</id>
-            <name>nexus</name>
-            <url>http://nexus-host:8081/repository/maven-public/</url>
-        </pluginRepository>
-    </pluginRepositories>-->
-
-    <!--<distributionManagement>
-        <repository>
-            <id>releases</id>
-            <url>http://nexus-host:8081/repository/maven-releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>snapshots</id>
-            <url>http://nexus-host:8081/repository/maven-snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>-->
-
-</project>

examcloud-question-commons/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.com.qmth.examcloud.question</groupId>
     <artifactId>examcloud-question-commons</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>jar</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>
 
     <dependencies>

examcloud-reports-commons/pom.xml

@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.com.qmth.examcloud.reports</groupId>
     <artifactId>examcloud-reports-commons</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>jar</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>
 
     <dependencies>

examcloud-starters/examcloud-geetest-starter/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.com.qmth.examcloud.starters</groupId>
     <artifactId>examcloud-geetest-starter</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>jar</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>
 
     <dependencies>

examcloud-starters/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.com.qmth.examcloud.starters</groupId>
     <artifactId>examcloud-starters</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>pom</packaging>
 
     <modules>

examcloud-support/pom.xml

@@ -3,13 +3,13 @@
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-support</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>jar</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>
 
     <dependencies>

examcloud-web/pom.xml

@@ -3,13 +3,13 @@
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-web</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>jar</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>
 
     <dependencies>

examcloud-ws-starter/pom.xml

@@ -3,13 +3,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-ws-starter</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>jar</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>
 
     <dependencies>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.com.qmth.examcloud</groupId>
     <artifactId>examcloud-components</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -13,7 +13,6 @@
     </properties>
 
     <modules>
-        <module>examcloud-parent</module>
         <module>examcloud-jenkins-build</module>
         <module>examcloud-api-commons</module>
         <module>examcloud-commons</module>