Author: olamy
Date: Tue Aug 16 01:07:34 2016
New Revision: 1756461
URL: http://svn.apache.org/viewvc?rev=1756461&view=rev
Log:
upgrade surefire, use default log file name
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1756461&r1=1756460&r2=1756461&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Tue Aug 16 01:07:34 2016
@@ -48,7 +48,7 @@
<mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
<!-- Test settings -->
<maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile>
- <surefire.version>2.18</surefire.version>
+ <surefire.version>2.18.1</surefire.version>
<failsafe.version>${surefire.version}</failsafe.version>
<junit.version>4.10</junit.version>
@@ -73,11 +73,7 @@
<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 -->
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java?rev=1756461&r1=1756460&r2=1756461&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
Tue Aug 16 01:07:34 2016
@@ -134,8 +134,6 @@ public abstract class AbstractWarProject
verifier.setCliOptions( getCliOptions() );
- verifier.setLogFileName( "foo.log" );
-
verifier.executeGoal( getGoal() );
verifier.displayStreamBuffers();
Modified:
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java?rev=1756461&r1=1756460&r2=1756461&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
Tue Aug 16 01:07:34 2016
@@ -22,6 +22,7 @@ import org.apache.catalina.Context;
import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.WebResourceSet;
+import org.apache.catalina.loader.WebappClassLoaderBase;
import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.webresources.EmptyResource;
import org.apache.catalina.webresources.FileResource;
@@ -344,8 +345,6 @@ public class RunMojo
final ClassRealm pluginRealm = getTomcatClassLoader();
- final WebResourceRoot previous = context.getResources();
-
context.setResources(
new MyDirContext( new File(
project.getBuild().getOutputDirectory() ).getAbsolutePath(), //
getPath(), //
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
