Author: olamy Date: Wed Jan 28 03:46:57 2015 New Revision: 1655215 URL: http://svn.apache.org/r1655215 Log: upgrade surefire, use default log file name
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 tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.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=1655215&r1=1655214&r2=1655215&view=diff ============================================================================== --- tomcat/maven-plugin/branches/tc8.x/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/pom.xml Wed Jan 28 03:46:57 2015 @@ -48,7 +48,7 @@ <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion> <!-- Test settings --> <maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile> - <surefire.version>2.17</surefire.version> + <surefire.version>2.18.1</surefire.version> <failsafe.version>${surefire.version}</failsafe.version> <junit.version>4.10</junit.version> 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=1655215&r1=1655214&r2=1655215&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 Jan 28 03:46:57 2015 @@ -134,8 +134,6 @@ public abstract class AbstractWarProject verifier.setCliOptions( getCliOptions() ); - verifier.setLogFileName( "foo.log" ); - verifier.executeGoal( getGoal() ); verifier.displayStreamBuffers(); Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java?rev=1655215&r1=1655214&r2=1655215&view=diff ============================================================================== --- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java Wed Jan 28 03:46:57 2015 @@ -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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org