Author: olamy
Date: Tue Aug 16 01:07:08 2016
New Revision: 1756457
URL: http://svn.apache.org/viewvc?rev=1756457&view=rev
Log:
use last tomcat8 version
Modified:
tomcat/maven-plugin/trunk/pom.xml
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1756457&r1=1756456&r2=1756457&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Tue Aug 16 01:07:08 2016
@@ -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 -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
