Commit aa8e1c62 authored by frank.xa.zhang's avatar frank.xa.zhang

Merge branch 'dev_frank' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_frank

parents e50a0ca6 e8d18112
...@@ -321,17 +321,17 @@ ...@@ -321,17 +321,17 @@
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.18.0</version> <version>1.18.0</version>
</dependency> </dependency>
<dependency> <!--<dependency>-->
<groupId>org.eclipse.jetty.aggregate</groupId> <!--<groupId>org.eclipse.jetty.aggregate</groupId>-->
<artifactId>jetty-all</artifactId> <!--<artifactId>jetty-all</artifactId>-->
<version>9.4.10.v20180503</version> <!--<version>9.4.10.v20180503</version>-->
<type>pom</type> <!--<type>pom</type>-->
</dependency> <!--</dependency>-->
<dependency> <!--<dependency>-->
<groupId>org.eclipse.jetty</groupId> <!--<groupId>org.eclipse.jetty</groupId>-->
<artifactId>apache-jsp</artifactId> <!--<artifactId>apache-jsp</artifactId>-->
<version>9.4.10.v20180503</version> <!--<version>9.4.10.v20180503</version>-->
</dependency> <!--</dependency>-->
</dependencies> </dependencies>
<profiles> <profiles>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment