upgrade surefire, use default log file name

git-svn-id: https://svn.apache.org/repos/asf/tomcat/maven-plugin/branches/tc8.x@1655215 13f79535-47bb-0310-9956-ffa450edef68

Author: olamy

pom.xml

@@ -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>

tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java

@@ -134,8 +134,6 @@ public void run()
 
         verifier.setCliOptions( getCliOptions() );
 
-        verifier.setLogFileName( "foo.log" );
-
         verifier.executeGoal( getGoal() );
 
         verifier.displayStreamBuffers();

tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java

@@ -22,6 +22,7 @@
 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 @@ protected void enhanceContext( final Context context )
 
             final ClassRealm pluginRealm = getTomcatClassLoader();
 
-            final WebResourceRoot previous = context.getResources();
-
             context.setResources(
                 new MyDirContext( new File( project.getBuild().getOutputDirectory() ).getAbsolutePath(), //
                                   getPath(), //