|
@@ -54,22 +54,22 @@
|
|
|
<dependency>
|
|
|
<groupId>javax.servlet</groupId>
|
|
|
<artifactId>servlet-api</artifactId>
|
|
|
- <scope>provided</scope>
|
|
|
+ <scope>compile</scope>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>javax.servlet</groupId>
|
|
|
<artifactId>jstl</artifactId>
|
|
|
- <scope>provided</scope>
|
|
|
+ <scope>compile</scope>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>taglibs</groupId>
|
|
|
<artifactId>standard</artifactId>
|
|
|
- <scope>provided</scope>
|
|
|
+ <scope>compile</scope>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>javax.servlet.jsp</groupId>
|
|
|
<artifactId>jsp-api</artifactId>
|
|
|
- <scope>provided</scope>
|
|
|
+ <scope>compile</scope>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
@@ -152,19 +152,19 @@
|
|
|
<artifactId>poi</artifactId>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
- <groupId>com.fasterxml.uuid</groupId>
|
|
|
- <artifactId>java-uuid-generator</artifactId>
|
|
|
- <version>3.1.3</version>
|
|
|
+ <groupId>com.fasterxml.uuid</groupId>
|
|
|
+ <artifactId>java-uuid-generator</artifactId>
|
|
|
+ <version>3.1.3</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
- <groupId>commons-fileupload</groupId>
|
|
|
- <artifactId>commons-fileupload</artifactId>
|
|
|
- <version>1.2.2</version>
|
|
|
+ <groupId>commons-fileupload</groupId>
|
|
|
+ <artifactId>commons-fileupload</artifactId>
|
|
|
+ <version>1.2.2</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
- <groupId>commons-io</groupId>
|
|
|
- <artifactId>commons-io</artifactId>
|
|
|
- <version>2.0.1</version>
|
|
|
+ <groupId>commons-io</groupId>
|
|
|
+ <artifactId>commons-io</artifactId>
|
|
|
+ <version>2.0.1</version>
|
|
|
</dependency>
|
|
|
</dependencies>
|
|
|
<build>
|
|
@@ -280,6 +280,27 @@
|
|
|
<overwrite>true</overwrite>
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
+ <plugin>
|
|
|
+ <groupId>org.mortbay.jetty</groupId>
|
|
|
+ <artifactId>jetty-maven-plugin</artifactId>
|
|
|
+ <version>8.1.8.v20121106</version>
|
|
|
+ <configuration>
|
|
|
+ <webAppConfig>
|
|
|
+ <contextPath>/${project.build.finalName}</contextPath>
|
|
|
+ </webAppConfig>
|
|
|
+ <connectors>
|
|
|
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
|
|
|
+ <port>8080</port>
|
|
|
+ </connector>
|
|
|
+ <connector implementation="org.eclipse.jetty.server.ssl.SslSocketConnector">
|
|
|
+ <port>8443</port>
|
|
|
+ <keystore>${project.basedir}/gkaq.keystore</keystore>
|
|
|
+ <password>gkaq.123</password>
|
|
|
+ <keyPassword>gkaq.123</keyPassword>
|
|
|
+ </connector>
|
|
|
+ </connectors>
|
|
|
+ </configuration>
|
|
|
+ </plugin>
|
|
|
</plugins>
|
|
|
</build>
|
|
|
<dependencyManagement>
|