|
@@ -22,66 +22,110 @@
|
|
|
|
|
|
<dependencies>
|
|
<dependencies>
|
|
<dependency>
|
|
<dependency>
|
|
- <groupId>cn.com.qmth.examcloud.rpc</groupId>
|
|
|
|
- <artifactId>examcloud-global-api</artifactId>
|
|
|
|
- <version>${examcloud.version}</version>
|
|
|
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
|
+ <artifactId>spring-boot-starter-freemarker</artifactId>
|
|
<exclusions>
|
|
<exclusions>
|
|
<exclusion>
|
|
<exclusion>
|
|
- <groupId>*</groupId>
|
|
|
|
- <artifactId>*</artifactId>
|
|
|
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
|
+ <artifactId>spring-boot-starter-logging</artifactId>
|
|
</exclusion>
|
|
</exclusion>
|
|
</exclusions>
|
|
</exclusions>
|
|
</dependency>
|
|
</dependency>
|
|
|
|
+ <dependency>
|
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
|
+ <artifactId>spring-boot-starter-test</artifactId>
|
|
|
|
+ <scope>test</scope>
|
|
|
|
+ <exclusions>
|
|
|
|
+ <exclusion>
|
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
|
+ <artifactId>spring-boot-starter-logging</artifactId>
|
|
|
|
+ </exclusion>
|
|
|
|
+ </exclusions>
|
|
|
|
+ </dependency>
|
|
|
|
+
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>cn.com.qmth.examcloud</groupId>
|
|
<groupId>cn.com.qmth.examcloud</groupId>
|
|
- <artifactId>examcloud-web</artifactId>
|
|
|
|
|
|
+ <artifactId>examcloud-support</artifactId>
|
|
<version>${examcloud.version}</version>
|
|
<version>${examcloud.version}</version>
|
|
<exclusions>
|
|
<exclusions>
|
|
|
|
+ <!-- fix conflicted jars start -->
|
|
<exclusion>
|
|
<exclusion>
|
|
- <groupId>com.google.code.findbugs</groupId>
|
|
|
|
- <artifactId>jsr305</artifactId>
|
|
|
|
|
|
+ <groupId>io.springfox</groupId>
|
|
|
|
+ <artifactId>springfox-swagger2</artifactId>
|
|
</exclusion>
|
|
</exclusion>
|
|
<exclusion>
|
|
<exclusion>
|
|
- <groupId>commons-codec</groupId>
|
|
|
|
- <artifactId>commons-codec</artifactId>
|
|
|
|
|
|
+ <groupId>io.springfox</groupId>
|
|
|
|
+ <artifactId>springfox-swagger-ui</artifactId>
|
|
</exclusion>
|
|
</exclusion>
|
|
<exclusion>
|
|
<exclusion>
|
|
- <groupId>commons-io</groupId>
|
|
|
|
- <artifactId>commons-io</artifactId>
|
|
|
|
|
|
+ <groupId>org.apache.poi</groupId>
|
|
|
|
+ <artifactId>poi</artifactId>
|
|
|
|
+ </exclusion>
|
|
|
|
+ <exclusion>
|
|
|
|
+ <groupId>org.apache.poi</groupId>
|
|
|
|
+ <artifactId>poi-ooxml</artifactId>
|
|
|
|
+ </exclusion>
|
|
|
|
+ <exclusion>
|
|
|
|
+ <groupId>commons-beanutils</groupId>
|
|
|
|
+ <artifactId>commons-beanutils</artifactId>
|
|
|
|
+ </exclusion>
|
|
|
|
+ <exclusion>
|
|
|
|
+ <groupId>commons-logging</groupId>
|
|
|
|
+ <artifactId>commons-logging</artifactId>
|
|
|
|
+ </exclusion>
|
|
|
|
+ <exclusion>
|
|
|
|
+ <groupId>com.mchange</groupId>
|
|
|
|
+ <artifactId>mchange-commons-java</artifactId>
|
|
|
|
+ </exclusion>
|
|
|
|
+ <exclusion>
|
|
|
|
+ <groupId>commons-collections</groupId>
|
|
|
|
+ <artifactId>commons-collections</artifactId>
|
|
</exclusion>
|
|
</exclusion>
|
|
<exclusion>
|
|
<exclusion>
|
|
- <groupId>org.apache.commons</groupId>
|
|
|
|
- <artifactId>commons-lang3</artifactId>
|
|
|
|
|
|
+ <groupId>com.google.code.findbugs</groupId>
|
|
|
|
+ <artifactId>jsr305</artifactId>
|
|
</exclusion>
|
|
</exclusion>
|
|
<exclusion>
|
|
<exclusion>
|
|
- <groupId>org.ow2.asm</groupId>
|
|
|
|
- <artifactId>asm</artifactId>
|
|
|
|
|
|
+ <groupId>commons-lang</groupId>
|
|
|
|
+ <artifactId>commons-lang</artifactId>
|
|
</exclusion>
|
|
</exclusion>
|
|
<exclusion>
|
|
<exclusion>
|
|
- <groupId>com.squareup.okhttp3</groupId>
|
|
|
|
- <artifactId>okhttp</artifactId>
|
|
|
|
|
|
+ <groupId>commons-io</groupId>
|
|
|
|
+ <artifactId>commons-io</artifactId>
|
|
</exclusion>
|
|
</exclusion>
|
|
|
|
+ <exclusion>
|
|
|
|
+ <groupId>mysql</groupId>
|
|
|
|
+ <artifactId>mysql-connector-java</artifactId>
|
|
|
|
+ </exclusion>
|
|
|
|
+ <!-- fix conflicted jars end -->
|
|
</exclusions>
|
|
</exclusions>
|
|
</dependency>
|
|
</dependency>
|
|
<dependency>
|
|
<dependency>
|
|
- <groupId>org.ow2.asm</groupId>
|
|
|
|
- <artifactId>asm</artifactId>
|
|
|
|
- <version>5.0.3</version>
|
|
|
|
|
|
+ <groupId>cn.com.qmth.examcloud.rpc</groupId>
|
|
|
|
+ <artifactId>examcloud-global-api</artifactId>
|
|
|
|
+ <version>${examcloud.version}</version>
|
|
|
|
+ <exclusions>
|
|
|
|
+ <exclusion>
|
|
|
|
+ <groupId>*</groupId>
|
|
|
|
+ <artifactId>*</artifactId>
|
|
|
|
+ </exclusion>
|
|
|
|
+ </exclusions>
|
|
</dependency>
|
|
</dependency>
|
|
|
|
+
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>mysql</groupId>
|
|
<groupId>mysql</groupId>
|
|
<artifactId>mysql-connector-java</artifactId>
|
|
<artifactId>mysql-connector-java</artifactId>
|
|
- <version>5.1.46</version>
|
|
|
|
|
|
+ <version>6.0.6</version>
|
|
</dependency>
|
|
</dependency>
|
|
<dependency>
|
|
<dependency>
|
|
- <groupId>com.google.guava</groupId>
|
|
|
|
- <artifactId>guava</artifactId>
|
|
|
|
- <version>23.0</version>
|
|
|
|
|
|
+ <groupId>commons-lang</groupId>
|
|
|
|
+ <artifactId>commons-lang</artifactId>
|
|
|
|
+ <version>2.6</version>
|
|
</dependency>
|
|
</dependency>
|
|
<dependency>
|
|
<dependency>
|
|
- <groupId>org.apache.commons</groupId>
|
|
|
|
- <artifactId>commons-lang3</artifactId>
|
|
|
|
- <version>3.8.1</version>
|
|
|
|
|
|
+ <groupId>commons-beanutils</groupId>
|
|
|
|
+ <artifactId>commons-beanutils</artifactId>
|
|
|
|
+ <version>1.9.3</version>
|
|
</dependency>
|
|
</dependency>
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>commons-io</groupId>
|
|
<groupId>commons-io</groupId>
|
|
@@ -89,9 +133,9 @@
|
|
<version>2.6</version>
|
|
<version>2.6</version>
|
|
</dependency>
|
|
</dependency>
|
|
<dependency>
|
|
<dependency>
|
|
- <groupId>commons-codec</groupId>
|
|
|
|
- <artifactId>commons-codec</artifactId>
|
|
|
|
- <version>1.11</version>
|
|
|
|
|
|
+ <groupId>commons-collections</groupId>
|
|
|
|
+ <artifactId>commons-collections</artifactId>
|
|
|
|
+ <version>3.2.2</version>
|
|
</dependency>
|
|
</dependency>
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>org.jsoup</groupId>
|
|
<groupId>org.jsoup</groupId>
|
|
@@ -99,14 +143,9 @@
|
|
<version>1.11.3</version>
|
|
<version>1.11.3</version>
|
|
</dependency>
|
|
</dependency>
|
|
<dependency>
|
|
<dependency>
|
|
- <groupId>com.alibaba</groupId>
|
|
|
|
- <artifactId>fastjson</artifactId>
|
|
|
|
- <version>1.2.24</version>
|
|
|
|
- </dependency>
|
|
|
|
- <dependency>
|
|
|
|
- <groupId>com.squareup.okhttp3</groupId>
|
|
|
|
- <artifactId>okhttp</artifactId>
|
|
|
|
- <version>3.8.1</version>
|
|
|
|
|
|
+ <groupId>com.google.code.findbugs</groupId>
|
|
|
|
+ <artifactId>jsr305</artifactId>
|
|
|
|
+ <version>3.0.2</version>
|
|
</dependency>
|
|
</dependency>
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>io.springfox</groupId>
|
|
<groupId>io.springfox</groupId>
|
|
@@ -114,40 +153,20 @@
|
|
<version>2.9.2</version>
|
|
<version>2.9.2</version>
|
|
<exclusions>
|
|
<exclusions>
|
|
<exclusion>
|
|
<exclusion>
|
|
- <groupId>com.google.guava</groupId>
|
|
|
|
- <artifactId>guava</artifactId>
|
|
|
|
- </exclusion>
|
|
|
|
- <exclusion>
|
|
|
|
- <groupId>com.squareup.okhttp3</groupId>
|
|
|
|
- <artifactId>okhttp</artifactId>
|
|
|
|
|
|
+ <groupId>com.google.code.findbugs</groupId>
|
|
|
|
+ <artifactId>jsr305</artifactId>
|
|
</exclusion>
|
|
</exclusion>
|
|
</exclusions>
|
|
</exclusions>
|
|
</dependency>
|
|
</dependency>
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>com.github.xiaoymin</groupId>
|
|
<groupId>com.github.xiaoymin</groupId>
|
|
<artifactId>swagger-bootstrap-ui</artifactId>
|
|
<artifactId>swagger-bootstrap-ui</artifactId>
|
|
- <version>1.8.9</version>
|
|
|
|
- </dependency>
|
|
|
|
- <dependency>
|
|
|
|
- <groupId>org.springframework.boot</groupId>
|
|
|
|
- <artifactId>spring-boot-starter-freemarker</artifactId>
|
|
|
|
- <exclusions>
|
|
|
|
- <exclusion>
|
|
|
|
- <groupId>org.springframework.boot</groupId>
|
|
|
|
- <artifactId>spring-boot-starter-logging</artifactId>
|
|
|
|
- </exclusion>
|
|
|
|
- </exclusions>
|
|
|
|
|
|
+ <version>1.9.3</version>
|
|
</dependency>
|
|
</dependency>
|
|
<dependency>
|
|
<dependency>
|
|
- <groupId>org.springframework.boot</groupId>
|
|
|
|
- <artifactId>spring-boot-starter-test</artifactId>
|
|
|
|
- <scope>test</scope>
|
|
|
|
- <exclusions>
|
|
|
|
- <exclusion>
|
|
|
|
- <groupId>org.springframework.boot</groupId>
|
|
|
|
- <artifactId>spring-boot-starter-logging</artifactId>
|
|
|
|
- </exclusion>
|
|
|
|
- </exclusions>
|
|
|
|
|
|
+ <groupId>com.mchange</groupId>
|
|
|
|
+ <artifactId>mchange-commons-java</artifactId>
|
|
|
|
+ <version>0.2.15</version>
|
|
</dependency>
|
|
</dependency>
|
|
</dependencies>
|
|
</dependencies>
|
|
|
|
|
|
@@ -166,22 +185,6 @@
|
|
<skipTests>true</skipTests>
|
|
<skipTests>true</skipTests>
|
|
</configuration>
|
|
</configuration>
|
|
</plugin>
|
|
</plugin>
|
|
- <plugin>
|
|
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
|
- <artifactId>maven-source-plugin</artifactId>
|
|
|
|
- <configuration>
|
|
|
|
- <attach>true</attach>
|
|
|
|
- </configuration>
|
|
|
|
- <executions>
|
|
|
|
- <execution>
|
|
|
|
- <id>attach-sources</id>
|
|
|
|
- <phase>install</phase>
|
|
|
|
- <goals>
|
|
|
|
- <goal>jar-no-fork</goal>
|
|
|
|
- </goals>
|
|
|
|
- </execution>
|
|
|
|
- </executions>
|
|
|
|
- </plugin>
|
|
|
|
<plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-deploy-plugin</artifactId>
|
|
<artifactId>maven-deploy-plugin</artifactId>
|