Author: olamy
Date: Wed Oct 1 23:43:11 2014
New Revision: 1628864
URL: http://svn.apache.org/r1628864
Log:
use last tomcat8 version
Modified:
tomcat/maven-plugin/branches/tc8.x/pom.xml
tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
Modified: tomcat/maven-plugin/branches/tc8.x/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/pom.xml?rev=1628864&r1=1628863&r2=1628864&view=diff
==============================================================================
--- tomcat/maven-plugin/branches/tc8.x/pom.xml (original)
+++ tomcat/maven-plugin/branches/tc8.x/pom.xml Wed Oct 1 23:43:11 2014
@@ -74,7 +74,7 @@
<!-- server port for it tests -->
<its.server.port>2008</its.server.port>
<tomcat7Version>7.0.54</tomcat7Version>
- <tomcat8Version>8.0.12</tomcat8Version>
+ <tomcat8Version>8.0.14</tomcat8Version>
<!-- to prevent isssues with last apache parent pom -->
<arguments />
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java?rev=1628864&r1=1628863&r2=1628864&view=diff
==============================================================================
---
tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
(original)
+++
tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
Wed Oct 1 23:43:11 2014
@@ -195,8 +195,10 @@ public abstract class AbstractWarProject
throws IOException
{
HttpGet httpGet = new HttpGet( getWebappUrl() );
- httpGet.setConfig(
- RequestConfig.custom().setSocketTimeout( getTimeout()
).setConnectTimeout( getTimeout() ).build() );
+ httpGet.setConfig( RequestConfig.custom() //
+ .setSocketTimeout( getTimeout() ) //
+ .setConnectTimeout( getTimeout() ) //
+ .build() );
ResponseHandler<String> responseHandler = new BasicResponseHandler();
return httpClient.execute( httpGet, responseHandler );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
