|
|
|
|
@ -53,8 +53,7 @@
|
|
|
|
|
<jackson.version>2.9.4</jackson.version>
|
|
|
|
|
<druid.version>1.0.9</druid.version>
|
|
|
|
|
<httpclient.version>4.3.5</httpclient.version>
|
|
|
|
|
<servlet-api.version>2.5</servlet-api.version>
|
|
|
|
|
<javax-servlet-api.version>3.1.0</javax-servlet-api.version>
|
|
|
|
|
<javax-servlet-api.version>4.0.1</javax-servlet-api.version>
|
|
|
|
|
<jsp-api.version>2.0</jsp-api.version>
|
|
|
|
|
<commons-lang3.version>3.3.2</commons-lang3.version>
|
|
|
|
|
<commons-io.version>1.3.2</commons-io.version>
|
|
|
|
|
@ -265,6 +264,7 @@
|
|
|
|
|
<groupId>jstl</groupId>
|
|
|
|
|
<artifactId>jstl</artifactId>
|
|
|
|
|
<version>${jstl.version}</version>
|
|
|
|
|
<scope>provided</scope>
|
|
|
|
|
</dependency>
|
|
|
|
|
<!-- <dependency>
|
|
|
|
|
<groupId>javax.servlet</groupId>
|
|
|
|
|
@ -276,11 +276,13 @@
|
|
|
|
|
<groupId>javax.servlet</groupId>
|
|
|
|
|
<artifactId>javax.servlet-api</artifactId>
|
|
|
|
|
<version>${javax-servlet-api.version}</version>
|
|
|
|
|
<scope>provided</scope>
|
|
|
|
|
</dependency>
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>javax.servlet</groupId>
|
|
|
|
|
<artifactId>jsp-api</artifactId>
|
|
|
|
|
<version>${jsp-api.version}</version>
|
|
|
|
|
<scope>provided</scope>
|
|
|
|
|
</dependency>
|
|
|
|
|
<!-- 文件上传组件 -->
|
|
|
|
|
<dependency>
|
|
|
|
|
@ -555,6 +557,24 @@
|
|
|
|
|
<encoding>UTF-8</encoding><!-- 字符集编码 -->
|
|
|
|
|
</configuration>
|
|
|
|
|
</plugin>
|
|
|
|
|
<plugin>
|
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
|
|
|
<version>2.5</version>
|
|
|
|
|
<configuration>
|
|
|
|
|
<!-- 跳过单元测试 -->
|
|
|
|
|
<skip>true</skip>
|
|
|
|
|
</configuration>
|
|
|
|
|
</plugin>
|
|
|
|
|
<plugin>
|
|
|
|
|
<groupId>org.apache.tomcat.maven</groupId>
|
|
|
|
|
<artifactId>tomcat7-maven-plugin</artifactId>
|
|
|
|
|
<version>2.2</version>
|
|
|
|
|
<configuration>
|
|
|
|
|
<path>/emr_record</path>
|
|
|
|
|
<port>8083</port>
|
|
|
|
|
</configuration>
|
|
|
|
|
</plugin>
|
|
|
|
|
</plugins>
|
|
|
|
|
</build>
|
|
|
|
|
|
|
|
|
|
|