commit f761fc8c01a28fbbab13008ab226f1664b45b97f
author Olivier Lamy <olamy@apache.org> Tue Aug 16 01:07:08 2016 +0000
committer Olivier Lamy <olamy@apache.org> Tue Aug 16 01:07:08 2016 +0000
tree e357312a8ac2084c402216ad12d8c18b5021d0ce
parent 519932989ce95264b466ae309742480d068897dd

use last tomcat8 version

git-svn-id: https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk@1756457 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index 0424bee..32347ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,11 @@
     <its.ajp.port>2001</its.ajp.port>
     <!-- server port for it tests -->
     <its.server.port>2008</its.server.port>
+<<<<<<< 401716e461ee04de5d0dd9c584a1f5074d66d455
     <tomcat7Version>7.0.59</tomcat7Version>
+=======
+    <tomcat7Version>7.0.54</tomcat7Version>
+>>>>>>> use last tomcat8 version
     <tomcat8Version>8.0.14</tomcat8Version>
 
     <!-- to prevent isssues with last apache parent pom -->