|
|
@ -20,6 +20,11 @@ |
|
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
|
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
|
|
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> |
|
|
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> |
|
|
|
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> |
|
|
|
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> |
|
|
|
|
|
|
|
<maven.compiler.source>1.7</maven.compiler.source> |
|
|
|
|
|
|
|
<maven.compiler.target>1.7</maven.compiler.target> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<maven.test.skip>true</maven.test.skip> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<javax.servlet-api.version>3.1.0</javax.servlet-api.version> |
|
|
|
<javax.servlet-api.version>3.1.0</javax.servlet-api.version> |
|
|
|
<javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version> |
|
|
|
<javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version> |
|
|
@ -53,40 +58,6 @@ |
|
|
|
|
|
|
|
|
|
|
|
<build> |
|
|
|
<build> |
|
|
|
<plugins> |
|
|
|
<plugins> |
|
|
|
<plugin> |
|
|
|
|
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
|
|
|
|
<artifactId>maven-compiler-plugin</artifactId> |
|
|
|
|
|
|
|
<version>3.1</version> |
|
|
|
|
|
|
|
<configuration> |
|
|
|
|
|
|
|
<source>1.7</source> |
|
|
|
|
|
|
|
<target>1.7</target> |
|
|
|
|
|
|
|
<encoding>UTF8</encoding> |
|
|
|
|
|
|
|
</configuration> |
|
|
|
|
|
|
|
</plugin> |
|
|
|
|
|
|
|
<plugin> |
|
|
|
|
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
|
|
|
|
<artifactId>maven-resources-plugin</artifactId> |
|
|
|
|
|
|
|
<version>2.6</version> |
|
|
|
|
|
|
|
<configuration> |
|
|
|
|
|
|
|
<encoding>UTF-8</encoding> |
|
|
|
|
|
|
|
</configuration> |
|
|
|
|
|
|
|
</plugin> |
|
|
|
|
|
|
|
<plugin> |
|
|
|
|
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
|
|
|
|
<artifactId>maven-war-plugin</artifactId> |
|
|
|
|
|
|
|
<version>2.5</version> |
|
|
|
|
|
|
|
<configuration> |
|
|
|
|
|
|
|
<archiveClasses>false</archiveClasses> |
|
|
|
|
|
|
|
</configuration> |
|
|
|
|
|
|
|
</plugin> |
|
|
|
|
|
|
|
<plugin> |
|
|
|
|
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
|
|
|
|
<artifactId>maven-surefire-plugin</artifactId> |
|
|
|
|
|
|
|
<version>2.19.1</version> |
|
|
|
|
|
|
|
<configuration> |
|
|
|
|
|
|
|
<skip>true</skip> |
|
|
|
|
|
|
|
</configuration> |
|
|
|
|
|
|
|
</plugin> |
|
|
|
|
|
|
|
</plugins> |
|
|
|
</plugins> |
|
|
|
</build> |
|
|
|
</build> |
|
|
|
|
|
|
|
|
|
|
@ -123,7 +94,7 @@ |
|
|
|
<plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-source-plugin</artifactId> |
|
|
|
<artifactId>maven-source-plugin</artifactId> |
|
|
|
<version>2.2.1</version> |
|
|
|
<version>3.0.1</version> |
|
|
|
<executions> |
|
|
|
<executions> |
|
|
|
<execution> |
|
|
|
<execution> |
|
|
|
<phase>package</phase> |
|
|
|
<phase>package</phase> |
|
|
@ -137,7 +108,7 @@ |
|
|
|
<plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-javadoc-plugin</artifactId> |
|
|
|
<artifactId>maven-javadoc-plugin</artifactId> |
|
|
|
<version>2.10.3</version> |
|
|
|
<version>3.0.0</version> |
|
|
|
<executions> |
|
|
|
<executions> |
|
|
|
<execution> |
|
|
|
<execution> |
|
|
|
<phase>package</phase> |
|
|
|
<phase>package</phase> |
|
|
|