Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson
2015-02-17 10:01:39 +00:00
3 changed files with 9 additions and 9 deletions

View File

@@ -19,7 +19,7 @@
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
<tomcat.version>7.0.57</tomcat.version>
<tomcat.version>7.0.59</tomcat.version>
<java.version>1.7</java.version>
</properties>
<dependencies>