maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tibordig...@apache.org
Subject [2/4] maven-surefire git commit: [SUREFIRE-1363] Java 1.6 features @Override and Charset
Date Sat, 15 Apr 2017 00:57:05 GMT
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/UrlUtils.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/UrlUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/UrlUtils.java
index 3a33b7f..dd96f28 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/UrlUtils.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/UrlUtils.java
@@ -20,11 +20,12 @@ package org.apache.maven.surefire.util.internal;
  */
 
 import java.io.File;
-import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.BitSet;
 
+import static org.apache.maven.surefire.util.internal.StringUtils.UTF_8;
+
 /**
  * Utility for dealing with URLs in pre-JDK 1.4.
  */
@@ -41,22 +42,12 @@ public final class UrlUtils
         throw new IllegalStateException( "no instantiable constructor" );
     }
 
-    private static final String ENCODING = "UTF-8";
-
     static
     {
-        try
-        {
-            byte[] bytes =
-                "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.!~*'():/".getBytes( ENCODING );
-            for ( byte aByte : bytes )
-            {
-                UNRESERVED.set( aByte );
-            }
-        }
-        catch ( UnsupportedEncodingException e )
+        byte[] bytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.!~*'():/".getBytes( UTF_8 );
+        for ( byte aByte : bytes )
         {
-            // can't happen as UTF-8 must be present
+            UNRESERVED.set( aByte );
         }
     }
 
@@ -68,29 +59,21 @@ public final class UrlUtils
         URL url = file.toURL();
         // encode any characters that do not comply with RFC 2396
         // this is primarily to handle Windows where the user's home directory contains spaces
-        try
+        byte[] bytes = url.toString().getBytes( UTF_8 );
+        StringBuilder buf = new StringBuilder( bytes.length );
+        for ( byte b : bytes )
         {
-            byte[] bytes = url.toString().getBytes( ENCODING );
-            StringBuilder buf = new StringBuilder( bytes.length );
-            for ( byte b : bytes )
+            if ( b > 0 && UNRESERVED.get( b ) )
             {
-                if ( b > 0 && UNRESERVED.get( b ) )
-                {
-                    buf.append( (char) b );
-                }
-                else
-                {
-                    buf.append( '%' );
-                    buf.append( Character.forDigit( b >>> 4 & MASK, RADIX ) );
-                    buf.append( Character.forDigit( b & MASK, RADIX ) );
-                }
+                buf.append( (char) b );
+            }
+            else
+            {
+                buf.append( '%' );
+                buf.append( Character.forDigit( b >>> 4 & MASK, RADIX ) );
+                buf.append( Character.forDigit( b & MASK, RADIX ) );
             }
-            return new URL( buf.toString() );
-        }
-        catch ( UnsupportedEncodingException e )
-        {
-            // should not happen as UTF-8 must be present
-            throw new RuntimeException( e );
         }
+        return new URL( buf.toString() );
     }
 }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-api/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
index 84a445d..8394e00 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
@@ -29,10 +29,12 @@ public class SurefireReflectorTest
     public void testShouldCreateFactoryWithoutException()
     {
         ReporterFactory factory = new ReporterFactory() {
+            @Override
             public RunListener createReporter() {
                 return null;
             }
 
+            @Override
             public RunResult close() {
                 return null;
             }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-api/src/test/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriterTest.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriterTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriterTest.java
index eb81871..d81e816 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriterTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriterTest.java
@@ -136,6 +136,7 @@ public class LegacyPojoStackTraceWriterTest
             this.stackTrace = stackTrace;
         }
 
+        @Override
         public void printStackTrace( PrintWriter s )
         {
             s.write( stackTrace );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java
index 964fa10..d5ecc46 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java
@@ -35,6 +35,7 @@ public class UrlUtilsTest
 {
     private String homeDir;
 
+    @Override
     public void setUp()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-api/src/test/java/org/apache/maven/surefire/util/internal/ConcurrencyUtilsTest.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/util/internal/ConcurrencyUtilsTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/util/internal/ConcurrencyUtilsTest.java
index 516f885..7e76fbf 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/util/internal/ConcurrencyUtilsTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/util/internal/ConcurrencyUtilsTest.java
@@ -81,6 +81,7 @@ public class ConcurrencyUtilsTest
 
         FutureTask<Boolean> task = new FutureTask<Boolean>( new Callable<Boolean>()
         {
+            @Override
             public Boolean call()
                 throws Exception
             {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
index e7d97c8..346e075 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
@@ -139,6 +139,7 @@ public class Classpath implements Iterable<String>
         System.setProperty( propertyName, sb.toString() );
     }
 
+    @Override
     public boolean equals( Object o )
     {
         if ( this == o )
@@ -179,6 +180,7 @@ public class Classpath implements Iterable<String>
         }
     }
 
+    @Override
     public int hashCode()
     {
         return unmodifiableElements.hashCode();
@@ -223,6 +225,7 @@ public class Classpath implements Iterable<String>
         return result.toString();
     }
 
+    @Override
     public Iterator<String> iterator()
     {
         return unmodifiableElements.iterator();

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
index 3c18578..d5bba1f 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
@@ -217,6 +217,7 @@ public final class ForkedBooter
     {
         return new CommandListener()
         {
+            @Override
             public void update( Command command )
             {
                 pingDone.set( true );
@@ -228,6 +229,7 @@ public final class ForkedBooter
     {
         return new CommandListener()
         {
+            @Override
             public void update( Command command )
             {
                 Shutdown shutdown = command.toShutdownData();
@@ -248,6 +250,7 @@ public final class ForkedBooter
     {
         return new Runnable()
         {
+            @Override
             public void run()
             {
                 boolean hasPing = pingDone.getAndSet( false );
@@ -361,6 +364,7 @@ public final class ForkedBooter
     {
         getJvmTerminator().schedule( new Runnable()
                                         {
+                                            @Override
                                             public void run()
                                             {
                                                 Runtime.getRuntime().halt( returnCode );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
index 31db087..a4d7d09 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
@@ -53,6 +53,7 @@ public class IsolatedClassLoader
      * @deprecated this method will use {@link java.io.File} instead of {@link URL} in the next
      * major version.
      */
+    @Override
     @Deprecated
     public void addURL( URL url )
     {
@@ -65,6 +66,7 @@ public class IsolatedClassLoader
         }
     }
 
+    @Override
     public synchronized Class loadClass( String name )
         throws ClassNotFoundException
     {
@@ -99,6 +101,7 @@ public class IsolatedClassLoader
         }
     }
 
+    @Override
     public String toString()
     {
         return "IsolatedClassLoader{roleName='" + roleName + "'}";

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/LazyTestsToRun.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/LazyTestsToRun.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/LazyTestsToRun.java
index 29a59b6..3237d07 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/LazyTestsToRun.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/LazyTestsToRun.java
@@ -63,16 +63,19 @@ final class LazyTestsToRun
     {
         private final Iterator<String> it = getReader().getIterableClasses( originalOutStream ).iterator();
 
+        @Override
         public boolean hasNext()
         {
             return it.hasNext();
         }
 
+        @Override
         public Class<?> next()
         {
             return findClass( it.next() );
         }
 
+        @Override
         public void remove()
         {
             throw new UnsupportedOperationException();
@@ -93,6 +96,7 @@ final class LazyTestsToRun
      * {@inheritDoc}
      * @see org.apache.maven.surefire.util.TestsToRun#iterator()
      * */
+    @Override
     public Iterator<Class<?>> iterator()
     {
         return new BlockingIterator();
@@ -102,6 +106,7 @@ final class LazyTestsToRun
      * {@inheritDoc}
       * @see org.apache.maven.surefire.util.TestsToRun#toString()
       */
+    @Override
     public String toString()
     {
         return "LazyTestsToRun";
@@ -111,6 +116,7 @@ final class LazyTestsToRun
      * {@inheritDoc}
      * @see org.apache.maven.surefire.util.TestsToRun#allowEagerReading()
      */
+    @Override
     public boolean allowEagerReading()
     {
         return false;
@@ -153,6 +159,7 @@ final class LazyTestsToRun
             {
             }
 
+            @Override
             public void remove()
             {
                 throw new UnsupportedOperationException( "unsupported remove" );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
index 5a19e26..41b4850 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
@@ -167,6 +167,7 @@ public class PropertiesWrapper
         }
     }
 
+    @Override
     public void copyTo( Map<Object, Object> target )
     {
         target.putAll( properties );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
index 36f823b..ae4e08e 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
@@ -134,6 +134,7 @@ public class ProviderFactory
             this.testsClassLoader = testsClassLoader;
         }
 
+        @Override
         @SuppressWarnings( "unchecked" )
         public Iterable<Class<?>> getSuites()
         {
@@ -148,6 +149,7 @@ public class ProviderFactory
             }
         }
 
+        @Override
         public RunResult invoke( Object forkTestSet )
             throws TestSetFailedException, InvocationTargetException
         {
@@ -175,6 +177,7 @@ public class ProviderFactory
             return current;
         }
 
+        @Override
         public void cancel()
         {
             Class<?> providerType = providerInOtherClassLoader.getClass();

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
index bbd0f70..b5ad18f 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
@@ -21,9 +21,11 @@ package org.apache.maven.surefire.booter;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.IOException;
 import java.util.Properties;
 
 import static org.apache.maven.surefire.util.ReflectionUtils.loadClass;
+import static org.apache.maven.surefire.util.internal.StringUtils.ISO_8859_1;
 
 /**
  * @author Kristian Rosenvold
@@ -79,13 +81,12 @@ public class TypeEncodedValue
         else if ( type.equals( Properties.class.getName() ) )
         {
             Properties result = new Properties();
-            // todo: use jdk7 Closable
             try
             {
-                result.load( new ByteArrayInputStream( value.getBytes( "8859_1" ) ) );
+                result.load( new ByteArrayInputStream( value.getBytes( ISO_8859_1 ) ) );
                 return result;
             }
-            catch ( Exception e )
+            catch ( IOException e )
             {
                 throw new IllegalStateException( "bug in property conversion", e );
             }
@@ -96,6 +97,7 @@ public class TypeEncodedValue
         }
     }
 
+    @Override
     public boolean equals( Object o )
     {
         if ( this == o )
@@ -113,6 +115,7 @@ public class TypeEncodedValue
 
     }
 
+    @Override
     public int hashCode()
     {
         int result = type != null ? type.hashCode() : 0;

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/CommandReaderTest.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/CommandReaderTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/CommandReaderTest.java
index b731dc0..ccc33d5 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/CommandReaderTest.java
+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/CommandReaderTest.java
@@ -40,7 +40,7 @@ import java.util.concurrent.FutureTask;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import static org.apache.maven.surefire.util.internal.StringUtils.FORK_STREAM_CHARSET_NAME;
+import static org.apache.maven.surefire.util.internal.StringUtils.ISO_8859_1;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -160,6 +160,7 @@ public class CommandReaderTest
     {
         Runnable runnable = new Runnable()
         {
+            @Override
             public void run()
             {
                 Iterator<String> it = reader.getIterableClasses( nul() ).iterator();
@@ -187,6 +188,7 @@ public class CommandReaderTest
         final CountDownLatch counter = new CountDownLatch( 1 );
         Runnable runnable = new Runnable()
         {
+            @Override
             public void run()
             {
                 Iterator<String> it = reader.getIterableClasses( nul() ).iterator();
@@ -240,7 +242,7 @@ public class CommandReaderTest
     private void addTestToPipeline( String cls )
         throws UnsupportedEncodingException
     {
-        byte[] clazz = cls.getBytes( FORK_STREAM_CHARSET_NAME );
+        byte[] clazz = cls.getBytes( ISO_8859_1 );
         ByteBuffer buffer = ByteBuffer.allocate( 8 + clazz.length )
             .putInt( MasterProcessCommand.RUN_CLASS.getId() )
             .putInt( clazz.length )

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/Foo.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/Foo.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/Foo.java
index 99b8564..911c969 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/Foo.java
+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/Foo.java
@@ -52,6 +52,7 @@ public class Foo
 
     boolean called = false;
 
+    @Override
     public void setDirectoryScannerParameters( DirectoryScannerParameters directoryScanner )
     {
         this.directoryScannerParameters = directoryScanner;
@@ -68,18 +69,21 @@ public class Foo
         return called;
     }
 
+    @Override
     public void setProviderProperties( Map<String, String> providerProperties )
     {
         this.providerProperties = providerProperties;
         this.called = true;
     }
 
+    @Override
     public void setReporterConfiguration( ReporterConfiguration reporterConfiguration )
     {
         this.reporterConfiguration = reporterConfiguration;
         this.called = true;
     }
 
+    @Override
     public void setClassLoaders( ClassLoader testClassLoader )
     {
         this.testClassLoader = testClassLoader;
@@ -87,18 +91,21 @@ public class Foo
         this.called = true;
     }
 
+    @Override
     public void setTestRequest( TestRequest testRequest1 )
     {
         this.testRequest = testRequest1;
         this.called = true;
     }
 
+    @Override
     public void setTestArtifactInfo( TestArtifactInfo testArtifactInfo )
     {
         this.testArtifactInfo = testArtifactInfo;
         this.called = true;
     }
 
+    @Override
     public void setRunOrderParameters( RunOrderParameters runOrderParameters )
     {
         this.runOrderParameters = runOrderParameters;

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java
index 1ffc894..e9adb22 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java
@@ -45,6 +45,7 @@ public class AndGroupMatcher
         }
     }
 
+    @Override
     public boolean enabled( Class<?>... cats )
     {
         for ( GroupMatcher matcher : getMatchers() )
@@ -59,6 +60,7 @@ public class AndGroupMatcher
         return true;
     }
 
+    @Override
     public boolean enabled( String... cats )
     {
         for ( GroupMatcher matcher : getMatchers() )

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java
index 0ab1d43..2028b1b 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java
@@ -35,11 +35,13 @@ public class InverseGroupMatcher
         this.matcher = matcher;
     }
 
+    @Override
     public boolean enabled( Class<?>... cats )
     {
         return cats == null || !matcher.enabled( cats );
     }
 
+    @Override
     public boolean enabled( String... cats )
     {
         return cats == null || !matcher.enabled( cats );
@@ -87,6 +89,7 @@ public class InverseGroupMatcher
         return true;
     }
 
+    @Override
     public void loadGroupClasses( ClassLoader cloader )
     {
         matcher.loadGroupClasses( cloader );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/JoinGroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/JoinGroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/JoinGroupMatcher.java
index ec8ac76..f130ee4 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/JoinGroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/JoinGroupMatcher.java
@@ -42,6 +42,7 @@ public abstract class JoinGroupMatcher
         return matchers;
     }
 
+    @Override
     public void loadGroupClasses( ClassLoader cloader )
     {
         for ( GroupMatcher matcher : matchers )

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java
index 65122c7..631086e 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java
@@ -45,6 +45,7 @@ public class OrGroupMatcher
         }
     }
 
+    @Override
     public boolean enabled( Class<?>... cats )
     {
         for ( GroupMatcher matcher : getMatchers() )
@@ -59,6 +60,7 @@ public class OrGroupMatcher
         return false;
     }
 
+    @Override
     public boolean enabled( String... cats )
     {
         for ( GroupMatcher matcher : getMatchers() )

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
index 99dde99..72fc801 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
@@ -83,6 +83,7 @@ public class SingleGroupMatcher
         return "*" + enabled;
     }
 
+    @Override
     public boolean enabled( Class<?>... cats )
     {
         if ( cats != null )
@@ -105,6 +106,7 @@ public class SingleGroupMatcher
         return false;
     }
 
+    @Override
     public boolean enabled( String... cats )
     {
         for ( String cat : cats )
@@ -128,6 +130,7 @@ public class SingleGroupMatcher
         return false;
     }
 
+    @Override
     public void loadGroupClasses( ClassLoader classLoader )
     {
         try

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java
index 05ba2f9..5ba0577 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java
@@ -27,6 +27,7 @@ package org.apache.maven.surefire.its;
 public class ForkModeTestNGIT
     extends ForkModeIT
 {
+    @Override
     protected String getProject()
     {
         return "fork-mode-testng";

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
index fcfcc9f..b96cf9b 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
@@ -29,6 +29,7 @@ public class FailsafeOutputValidator
         super( source.verifier );
     }
 
+    @Override
     public OutputValidator verifyErrorFree( int total )
     {
         try

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
index afd6493..a76f86f 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
@@ -191,7 +191,7 @@ public class OutputValidator
     public TestFile getSurefireReportsXmlFile( String fileName )
     {
         File targetDir = getSurefireReportsDirectory();
-        return new TestFile( new File( targetDir, fileName ), Charset.forName("UTF-8"), this );
+        return new TestFile( new File( targetDir, fileName ), Charset.forName( "UTF-8" ), this );
     }
 
     public File getSurefireReportsDirectory()

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
index c50d4e4..a39f870 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
@@ -105,6 +105,7 @@ public class Surefire1082ParallelJUnitParameterizedIT
             this.expectedRegex = expectedRegex;
         }
 
+        @Override
         public boolean matches( Object o )
         {
             if ( o != null && o instanceof Set )
@@ -127,6 +128,7 @@ public class Surefire1082ParallelJUnitParameterizedIT
             }
         }
 
+        @Override
         public void describeTo( Description description )
         {
             description.appendValue( expectedRegex );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLoggerDecorator.java
----------------------------------------------------------------------
diff --git a/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLoggerDecorator.java b/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLoggerDecorator.java
index e565353..0e20105 100644
--- a/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLoggerDecorator.java
+++ b/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLoggerDecorator.java
@@ -1 +1 @@
-package org.apache.maven.plugin.surefire.log.api;

/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied.  See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

/**
 * Decorator around {@link ConsoleLogger}.
 * This class is loaded in the isolated ClassLoader and the child logger in the in-plugi
 n ClassLoader.
 *
 * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
 * @since 2.20
 */
public final class ConsoleLoggerDecorator
        implements ConsoleLogger
{
    private final Object logger;

    public ConsoleLoggerDecorator( Object logger )
    {
        if ( logger == null )
        {
            throw new NullPointerException( "logger argument is null in " + ConsoleLoggerDecorator.class );
        }
        this.logger = logger;
    }

    public void debug( String message )
    {
        try
        {
            logger.getClass()
                    .getMethod( "debug", String.class )
                    .invoke( logger, message );
        }
        catch ( Exception e )
        {
            throw new IllegalStateException( e.getLocalizedMessage(), e );
        }
    }

    public void info( String message )
    {
        try
        {
            logger.getClass()
                    .getMethod( "info", String.class )
                    .in
 voke( logger, message );
        }
        catch ( Exception e )
        {
            throw new IllegalStateException( e.getLocalizedMessage(), e );
        }
    }

    public void warning( String message )
    {
        try
        {
            logger.getClass()
                    .getMethod( "warning", String.class )
                    .invoke( logger, message );
        }
        catch ( Exception e )
        {
            throw new IllegalStateException( e.getLocalizedMessage(), e );
        }
    }

    public void error( String message )
    {
        try
        {
            logger.getClass()
                    .getMethod( "error", String.class )
                    .invoke( logger, message );
        }
        catch ( Exception e )
        {
            throw new IllegalStateException( e.getLocalizedMessage(), e );
        }
    }

    public void error( String message, Throwable t )
    {
        try
        {
            logger.getClass()
                    .getMet
 hod( "error", String.class, Throwable.class )
                    .invoke( logger, message, t );
        }
        catch ( Exception e )
        {
            throw new IllegalStateException( e.getLocalizedMessage(), e );
        }
    }

    public void error( Throwable t )
    {
        try
        {
            logger.getClass()
                    .getMethod( "error", Throwable.class )
                    .invoke( logger, t );
        }
        catch ( Exception e )
        {
            throw new IllegalStateException( e.getLocalizedMessage(), e );
        }
    }
}
\ No newline at end of file
+package org.apache.maven.plugin.surefire.log.api;

/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied.  See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

/**
 * Decorator around {@link ConsoleLogger}.
 * This class is loaded in the isolated ClassLoader and the child logger in the in-plugi
 n ClassLoader.
 *
 * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
 * @since 2.20
 */
public final class ConsoleLoggerDecorator
        implements ConsoleLogger
{
    private final Object logger;

    public ConsoleLoggerDecorator( Object logger )
    {
        if ( logger == null )
        {
            throw new NullPointerException( "logger argument is null in " + ConsoleLoggerDecorator.class );
        }
        this.logger = logger;
    }

    @Override
    public void debug( String message )
    {
        try
        {
            logger.getClass()
                    .getMethod( "debug", String.class )
                    .invoke( logger, message );
        }
        catch ( Exception e )
        {
            throw new IllegalStateException( e.getLocalizedMessage(), e );
        }
    }

    @Override
    public void info( String message )
    {
        try
        {
            logger.getClass()
                    .getMethod( "info", String.cla
 ss )
                    .invoke( logger, message );
        }
        catch ( Exception e )
        {
            throw new IllegalStateException( e.getLocalizedMessage(), e );
        }
    }

    @Override
    public void warning( String message )
    {
        try
        {
            logger.getClass()
                    .getMethod( "warning", String.class )
                    .invoke( logger, message );
        }
        catch ( Exception e )
        {
            throw new IllegalStateException( e.getLocalizedMessage(), e );
        }
    }

    @Override
    public void error( String message )
    {
        try
        {
            logger.getClass()
                    .getMethod( "error", String.class )
                    .invoke( logger, message );
        }
        catch ( Exception e )
        {
            throw new IllegalStateException( e.getLocalizedMessage(), e );
        }
    }

    @Override
    public void error( String message, Throwable t )
    {
        t
 ry
        {
            logger.getClass()
                    .getMethod( "error", String.class, Throwable.class )
                    .invoke( logger, message, t );
        }
        catch ( Exception e )
        {
            throw new IllegalStateException( e.getLocalizedMessage(), e );
        }
    }

    @Override
    public void error( Throwable t )
    {
        try
        {
            logger.getClass()
                    .getMethod( "error", Throwable.class )
                    .invoke( logger, t );
        }
        catch ( Exception e )
        {
            throw new IllegalStateException( e.getLocalizedMessage(), e );
        }
    }
}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/NullConsoleLogger.java
----------------------------------------------------------------------
diff --git a/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/NullConsoleLogger.java b/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/NullConsoleLogger.java
index fa09d83..4094fe4 100644
--- a/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/NullConsoleLogger.java
+++ b/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/NullConsoleLogger.java
@@ -27,26 +27,32 @@ package org.apache.maven.plugin.surefire.log.api;
  */
 public final class NullConsoleLogger implements ConsoleLogger
 {
+    @Override
     public void debug( String message )
     {
     }
 
+    @Override
     public void info( String message )
     {
     }
 
+    @Override
     public void warning( String message )
     {
     }
 
+    @Override
     public void error( String message )
     {
     }
 
+    @Override
     public void error( String message, Throwable t )
     {
     }
 
+    @Override
     public void error( Throwable t )
     {
     }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/PrintStreamLogger.java
----------------------------------------------------------------------
diff --git a/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/PrintStreamLogger.java b/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/PrintStreamLogger.java
index 0eac176..6b0d4ea 100644
--- a/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/PrintStreamLogger.java
+++ b/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/PrintStreamLogger.java
@@ -1 +1 @@
-package org.apache.maven.plugin.surefire.log.api;

/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied.  See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

import java.io.PrintStream;

/**
 * For testing purposes.
 */
public class PrintStreamLogger
    implements ConsoleLogger
{
    private
  final PrintStream stream;

    public PrintStreamLogger( PrintStream stream )
    {
        this.stream = stream;
    }

    public void debug( String message )
    {
        stream.println( message );
    }

    public void info( String message )
    {
        stream.println( message );
    }

    public void warning( String message )
    {
        stream.println( message );
    }

    public void error( String message )
    {
        stream.println( message );
    }

    public void error( String message, Throwable t )
    {
        error( ConsoleLoggerUtils.toString( message, t ) );
    }

    public void error( Throwable t )
    {
        error( null, t );
    }
}
\ No newline at end of file
+package org.apache.maven.plugin.surefire.log.api;

/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied.  See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

import java.io.PrintStream;

/**
 * For testing purposes.
 */
public class PrintStreamLogger
    implements ConsoleLogger
{
    private
  final PrintStream stream;

    public PrintStreamLogger( PrintStream stream )
    {
        this.stream = stream;
    }

    @Override
    public void debug( String message )
    {
        stream.println( message );
    }

    @Override
    public void info( String message )
    {
        stream.println( message );
    }

    @Override
    public void warning( String message )
    {
        stream.println( message );
    }

    @Override
    public void error( String message )
    {
        stream.println( message );
    }

    @Override
    public void error( String message, Throwable t )
    {
        error( ConsoleLoggerUtils.toString( message, t ) );
    }

    @Override
    public void error( Throwable t )
    {
        error( null, t );
    }
}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/ClassNameStackTraceFilter.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/ClassNameStackTraceFilter.java b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/ClassNameStackTraceFilter.java
index 6767430..bfc5b77 100644
--- a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/ClassNameStackTraceFilter.java
+++ b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/ClassNameStackTraceFilter.java
@@ -32,6 +32,7 @@ final class ClassNameStackTraceFilter
         this.className = className;
     }
 
+    @Override
     public boolean matches( StackTraceElement element )
     {
         return className.equals( element.getClassName() );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/NullStackTraceFilter.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/NullStackTraceFilter.java b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/NullStackTraceFilter.java
index cced1d4..3172320 100644
--- a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/NullStackTraceFilter.java
+++ b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/NullStackTraceFilter.java
@@ -25,6 +25,7 @@ package org.apache.maven.surefire.report;
 final class NullStackTraceFilter
     implements StackTraceFilter
 {
+    @Override
     public boolean matches( StackTraceElement element )
     {
         return true;

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
index fdbc1be..99aca60 100644
--- a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
+++ b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
@@ -46,6 +46,7 @@ public class PojoStackTraceWriter
         this.t = t;
     }
 
+    @Override
     public String writeTraceToString()
     {
         if ( t != null )
@@ -76,16 +77,19 @@ public class PojoStackTraceWriter
         return "";
     }
 
+    @Override
     public String smartTrimmedStackTrace()
     {
         return t == null ? "" : new SmartStackTraceParser( testClass, t, testMethod ).getString();
     }
 
+    @Override
     public String writeTrimmedTraceToString()
     {
         return t == null ? "" : SmartStackTraceParser.stackTraceWithFocusOnClassAsString( t, testClass );
     }
 
+    @Override
     public SafeThrowable getThrowable()
     {
         return t == null ? null : new SafeThrowable( t );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/RunnableTestClass1.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/RunnableTestClass1.java b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/RunnableTestClass1.java
index 8414903..ef007b2 100644
--- a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/RunnableTestClass1.java
+++ b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/RunnableTestClass1.java
@@ -27,6 +27,7 @@ import java.util.concurrent.FutureTask;
 class RunnableTestClass1
     implements Callable<Object>
 {
+    @Override
     public Object call()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/RunnableTestClass2.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/RunnableTestClass2.java b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/RunnableTestClass2.java
index 8a13b0e..b782df8 100644
--- a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/RunnableTestClass2.java
+++ b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/RunnableTestClass2.java
@@ -25,6 +25,7 @@ class RunnableTestClass2
 
 {
 
+    @Override
     public Object call()
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3TestChecker.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3TestChecker.java b/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3TestChecker.java
index f683714..d727946 100644
--- a/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3TestChecker.java
+++ b/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3TestChecker.java
@@ -49,6 +49,7 @@ public class JUnit3TestChecker
         junitClass = ReflectionUtils.tryLoadClass( testClassLoader, "junit.framework.Test" );
     }
 
+    @Override
     public boolean accept( Class testClass )
     {
         return nonAbstractClassFilter.accept( testClass ) && isValidJUnit3Test( testClass );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java b/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java
index 7d4b751..e0ae2e7 100644
--- a/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java
+++ b/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java
@@ -106,11 +106,13 @@ public class JUnit3TestCheckerTest
     public static class MySuite2
         implements junit.framework.Test
     {
+        @Override
         public int countTestCases()
         {
             return 0;
         }
 
+        @Override
         public void run( TestResult testResult )
         {
         }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java
index 026e35d..2d651c4 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java
@@ -124,11 +124,13 @@ public final class JUnit4Reflector
             this( "" );
         }
 
+        @Override
         public String value()
         {
             return value;
         }
 
+        @Override
         public Class<? extends Annotation> annotationType()
         {
             return Ignore.class;

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
index 1d365cf..06f0fca 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
@@ -68,6 +68,7 @@ public class JUnit4RunListener
      *
      * @see org.junit.runner.notification.RunListener#testIgnored(org.junit.runner.Description)
      */
+    @Override
     public void testIgnored( Description description )
         throws Exception
     {
@@ -80,6 +81,7 @@ public class JUnit4RunListener
      *
      * @see org.junit.runner.notification.RunListener#testStarted(org.junit.runner.Description)
      */
+    @Override
     public void testStarted( Description description )
         throws Exception
     {
@@ -92,6 +94,7 @@ public class JUnit4RunListener
      *
      * @see org.junit.runner.notification.RunListener#testFailure(org.junit.runner.notification.Failure)
      */
+    @Override
     @SuppressWarnings( { "ThrowableResultOfMethodCallIgnored" } )
     public void testFailure( Failure failure )
         throws Exception
@@ -131,6 +134,7 @@ public class JUnit4RunListener
      *
      * @see org.junit.runner.notification.RunListener#testFinished(org.junit.runner.Description)
      */
+    @Override
     public void testFinished( Description description )
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java
index 33f499e..78cefb6 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java
@@ -55,6 +55,7 @@ public class JUnit4StackTraceWriter
       *
       * @see org.apache.maven.surefire.report.StackTraceWriter#writeTraceToString()
       */
+    @Override
     public String writeTraceToString()
     {
         Throwable t = junitFailure.getException();
@@ -87,6 +88,7 @@ public class JUnit4StackTraceWriter
         return extractMethodName( junitFailure.getDescription().getDisplayName() );
     }
 
+    @Override
     @SuppressWarnings( "ThrowableResultOfMethodCallIgnored" )
     public String smartTrimmedStackTrace()
     {
@@ -101,6 +103,7 @@ public class JUnit4StackTraceWriter
      *
      * @see org.apache.maven.surefire.report.StackTraceWriter#writeTrimmedTraceToString()
      */
+    @Override
     public String writeTrimmedTraceToString()
     {
         String testClass = getTestClassName();
@@ -120,6 +123,7 @@ public class JUnit4StackTraceWriter
      *
      * @see org.apache.maven.surefire.report.StackTraceWriter#getThrowable()
      */
+    @Override
     public SafeThrowable getThrowable()
     {
         return new SafeThrowable( junitFailure.getException() );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4TestChecker.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4TestChecker.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4TestChecker.java
index c2a6c18..49afaa7 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4TestChecker.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4TestChecker.java
@@ -47,6 +47,7 @@ public class JUnit4TestChecker
         nonAbstractClassFilter = new NonAbstractClassFilter();
     }
 
+    @Override
     public boolean accept( Class testClass )
     {
         return jUnit3TestChecker.accept( testClass ) || isValidJUnit4Test( testClass );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java
index 99d7aae..12cbb4c 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java
@@ -55,21 +55,25 @@ public class MockReporter
     {
     }
 
+    @Override
     public void testSetStarting( ReportEntry report )
     {
         events.add( SET_STARTED );
     }
 
+    @Override
     public void testSetCompleted( ReportEntry report )
     {
         events.add( SET_COMPLETED );
     }
 
+    @Override
     public void testStarting( ReportEntry report )
     {
         events.add( TEST_STARTED );
     }
 
+    @Override
     public void testSucceeded( ReportEntry report )
     {
         events.add( TEST_COMPLETED );
@@ -77,12 +81,14 @@ public class MockReporter
 
     }
 
+    @Override
     public void testSkipped( ReportEntry report )
     {
         events.add( TEST_SKIPPED );
         testIgnored.incrementAndGet();
     }
 
+    @Override
     public void testExecutionSkippedByUser()
     {
     }
@@ -102,16 +108,19 @@ public class MockReporter
         return testFailed.get();
     }
 
+    @Override
     public void testError( ReportEntry report )
     {
         testError.incrementAndGet();
     }
 
+    @Override
     public void testFailed( ReportEntry report )
     {
         testFailed.incrementAndGet();
     }
 
+    @Override
     public void testAssumptionFailure( ReportEntry report )
     {
     }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerTest.java b/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerTest.java
index deda538..baf4589 100644
--- a/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerTest.java
+++ b/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerTest.java
@@ -63,6 +63,7 @@ public class JUnit4RunListenerTest
 
         DaemonThreadFactory.newDaemonThread( new Runnable()
         {
+            @Override
             public void run()
             {
                 try

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java b/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java
index a9f1b80..a204734 100644
--- a/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java
+++ b/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java
@@ -148,11 +148,13 @@ public class JUnit4TestCheckerTest
     public static class MySuite2
         implements junit.framework.Test
     {
+        @Override
         public int countTestCases()
         {
             return 0;
         }
 
+        @Override
         public void run( TestResult testResult )
         {
         }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java
index c7f2bd7..a07caaa 100644
--- a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java
+++ b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java
@@ -46,11 +46,13 @@ public class JUnit46StackTraceWriter
     }
 
 
+    @Override
     protected final String getTestClassName()
     {
         return junitFailure.getDescription().getClassName();
     }
 
+    @Override
     protected String getTestMethodName()
     {
         return junitFailure.getDescription().getMethodName();

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48TestChecker.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48TestChecker.java b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48TestChecker.java
index 9da8715..ab475cc 100644
--- a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48TestChecker.java
+++ b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48TestChecker.java
@@ -45,6 +45,7 @@ public class JUnit48TestChecker
         this.nonAbstractClassFilter = new NonAbstractClassFilter();
     }
 
+    @Override
     public boolean accept( Class testClass )
     {
         return jUnit4TestChecker.accept( testClass ) || isAbstractWithEnclosedRunner( testClass );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
index a707fee..adfda35 100644
--- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
+++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
@@ -69,6 +69,7 @@ public class JUnit3Provider
         testChecker = new PojoAndJUnit3Checker( jUnit3TestChecker ); // Todo; use reflector
     }
 
+    @Override
     public RunResult invoke( Object forkTestSet )
         throws TestSetFailedException
     {
@@ -143,6 +144,7 @@ public class JUnit3Provider
         return runOrderCalculator.orderTestClasses( testsToRun );
     }
 
+    @Override
     public Iterable<Class<?>> getSuites()
     {
         testsToRun = scanClassPath();

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
index 919be7a..4dd1bbc 100644
--- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
+++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
@@ -64,6 +64,7 @@ public final class JUnitTestSet
     }
 
 
+    @Override
     public void execute( RunListener reporter, ClassLoader loader )
         throws TestSetFailedException
     {
@@ -120,6 +121,7 @@ public final class JUnitTestSet
         }
     }
 
+    @Override
     public String getName()
     {
         return testClass.getName();

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoAndJUnit3Checker.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoAndJUnit3Checker.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoAndJUnit3Checker.java
index d3529c1..e9debce 100644
--- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoAndJUnit3Checker.java
+++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoAndJUnit3Checker.java
@@ -38,6 +38,7 @@ public class PojoAndJUnit3Checker
         this.jUnit3TestChecker = jUnit3TestChecker;
     }
 
+    @Override
     public boolean accept( Class testClass )
     {
         return jUnit3TestChecker.accept( testClass )

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java
index d0f15cb..4d589a6 100644
--- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java
+++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java
@@ -75,6 +75,7 @@ public class PojoTestSet
         }
     }
 
+    @Override
     public void execute( RunListener reportManager, ClassLoader loader )
         throws TestSetFailedException
     {
@@ -289,6 +290,7 @@ public class PojoTestSet
         return isInstanceMethod && returnsVoid && hasNoParams;
     }
 
+    @Override
     public String getName()
     {
         return testClass.getName();

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
index c4c0f51..c96b96d 100644
--- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
+++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
@@ -76,6 +76,7 @@ public class TestListenerInvocationHandler
             this.threadOnWhichTestFailed = threadOnWhichTestFailed;
         }
 
+        @Override
         public boolean equals( Object obj )
         {
             boolean retVal = true;
@@ -101,6 +102,7 @@ public class TestListenerInvocationHandler
             return retVal;
         }
 
+        @Override
         public int hashCode()
         {
             return threadOnWhichTestFailed.hashCode();
@@ -117,6 +119,7 @@ public class TestListenerInvocationHandler
         this.reporter = reporter;
     }
 
+    @Override
     public Object invoke( Object proxy, Method method, Object[] args )
         throws Throwable
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java b/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
index 9ca397e..359a79f 100644
--- a/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
+++ b/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
@@ -63,43 +63,52 @@ public class JUnitTestSetTest
 
         private List<ReportEntry> succeededTests = new ArrayList<ReportEntry>();
 
+        @Override
         public void testSetStarting( ReportEntry report )
         {
         }
 
+        @Override
         public void testSetCompleted( ReportEntry report )
         {
         }
 
+        @Override
         public void testStarting( ReportEntry report )
         {
         }
 
+        @Override
         public void testSucceeded( ReportEntry report )
         {
             this.succeededTests.add( report );
         }
 
+        @Override
         public void testAssumptionFailure( ReportEntry report )
         {
             throw new IllegalStateException();
         }
 
+        @Override
         public void testError( ReportEntry report )
         {
             throw new IllegalStateException();
         }
 
+        @Override
         public void testFailed( ReportEntry report )
         {
             throw new IllegalStateException();
         }
 
+        @Override
         public void testSkipped( ReportEntry report )
         {
             throw new IllegalStateException();
         }
 
+        @Override
         public void testExecutionSkippedByUser()
         {
         }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java b/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
index f835cec..12842fa 100644
--- a/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
+++ b/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
@@ -112,6 +112,7 @@ public class JUnit4Provider
         rerunFailingTestsCount = testRequest.getRerunFailingTestsCount();
     }
 
+    @Override
     public RunResult invoke( Object forkTestSet )
         throws TestSetFailedException
     {
@@ -209,6 +210,7 @@ public class JUnit4Provider
     {
         commandsReader.addShutdownListener( new CommandListener()
         {
+            @Override
             public void update( Command command )
             {
                 testsToRun.markTestSetFinished();
@@ -220,6 +222,7 @@ public class JUnit4Provider
     {
         commandsReader.addSkipNextTestsListener( new CommandListener()
         {
+            @Override
             public void update( Command command )
             {
                 notifier.pleaseStop();
@@ -298,6 +301,7 @@ public class JUnit4Provider
         }
     }
 
+    @Override
     public Iterable<Class<?>> getSuites()
     {
         testsToRun = scanClassPath();

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java
index 8faa12e..0d9bacf 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java
@@ -48,12 +48,14 @@ public class AsynchronousRunner
         this.fService = fService;
     }
 
+    @Override
     public void schedule( final Runnable childStatement )
     {
         futures.add( fService.submit( Executors.callable( childStatement ) ) );
     }
 
 
+    @Override
     public void finished()
     {
         try

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
index 89c6104..8095dbf 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
@@ -69,10 +69,12 @@ public abstract class ConcurrentRunListener
         };
     }
 
+    @Override
     public void testSetStarting( ReportEntry description )
     {
     }
 
+    @Override
     public void testSetCompleted( ReportEntry result )
     {
         final RunListener reporterManager = getRunListener();
@@ -83,6 +85,7 @@ public abstract class ConcurrentRunListener
         reporterManagerThreadLocal.remove();
     }
 
+    @Override
     public void testFailed( ReportEntry failure )
     {
         final TestMethod testMethod = getOrCreateThreadAttachedTestMethod( failure );
@@ -93,6 +96,7 @@ public abstract class ConcurrentRunListener
         }
     }
 
+    @Override
     public void testError( ReportEntry failure )
     {
         final TestMethod testMethod = getOrCreateThreadAttachedTestMethod( failure );
@@ -103,6 +107,7 @@ public abstract class ConcurrentRunListener
         }
     }
 
+    @Override
     public void testSkipped( ReportEntry description )
     {
         TestSet testSet = getTestSet( description );
@@ -112,12 +117,14 @@ public abstract class ConcurrentRunListener
         testMethod.detachFromCurrentThread();
     }
 
+    @Override
     public void testExecutionSkippedByUser()
     {
         // cannot guarantee proper call to all listeners
         reporterManagerThreadLocal.get().testExecutionSkippedByUser();
     }
 
+    @Override
     public void testAssumptionFailure( ReportEntry failure )
     {
         final TestMethod testMethod = getOrCreateThreadAttachedTestMethod( failure );
@@ -128,6 +135,7 @@ public abstract class ConcurrentRunListener
         }
     }
 
+    @Override
     public void testStarting( ReportEntry description )
     {
         TestSet testSet = getTestSet( description );
@@ -137,6 +145,7 @@ public abstract class ConcurrentRunListener
         testSet.attachToThread();
     }
 
+    @Override
     public void testSucceeded( ReportEntry report )
     {
         TestMethod testMethod = getThreadTestMethod();
@@ -196,6 +205,7 @@ public abstract class ConcurrentRunListener
     }
 
 
+    @Override
     public void writeTestOutput( byte[] buf, int off, int len, boolean stdout )
     {
         TestMethod threadTestMethod = getThreadTestMethod();

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
index 0f41b6f..a4c061e 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
@@ -103,6 +103,7 @@ public class JUnitCoreProvider
         jUnit48Reflector = new JUnit48Reflector( testClassLoader );
     }
 
+    @Override
     public Iterable<Class<?>> getSuites()
     {
         testsToRun = scanClassPath();
@@ -114,6 +115,7 @@ public class JUnitCoreProvider
         return jUnitCoreParameters.isNoThreading();
     }
 
+    @Override
     public RunResult invoke( Object forkTestSet )
         throws TestSetFailedException
     {
@@ -219,6 +221,7 @@ public class JUnitCoreProvider
     {
         commandsReader.addShutdownListener( new CommandListener()
         {
+            @Override
             public void update( Command command )
             {
                 testsToRun.markTestSetFinished();
@@ -230,6 +233,7 @@ public class JUnitCoreProvider
     {
         commandsReader.addSkipNextTestsListener( new CommandListener()
         {
+            @Override
             public void update( Command command )
             {
                 stoppable.pleaseStop();

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java
index 81e4f80..98b87ef 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java
@@ -59,6 +59,7 @@ public class JUnitCoreRunListener
      *
      * @see org.junit.runner.notification.RunListener#testRunStarted(org.junit.runner.Description)
      */
+    @Override
     public void testRunStarted( Description description )
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/NonConcurrentRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/NonConcurrentRunListener.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/NonConcurrentRunListener.java
index 539fd73..0e5ee77 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/NonConcurrentRunListener.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/NonConcurrentRunListener.java
@@ -47,12 +47,14 @@ public class NonConcurrentRunListener
         super( reporter );
     }
 
+    @Override
     public synchronized void writeTestOutput( byte[] buf, int off, int len, boolean stdout )
     {
         // We can write immediately: no parallelism and a single class.
         ( (ConsoleOutputReceiver) reporter ).writeTestOutput( buf, off, len, stdout );
     }
 
+    @Override
     protected SimpleReportEntry createReportEntry( Description description )
     {
         return new SimpleReportEntry( extractDescriptionClassName( description ), description.getDisplayName() );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java
index efbca98..ebcbe8d 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java
@@ -31,11 +31,13 @@ import org.junit.runners.model.RunnerScheduler;
 class SynchronousRunner
     implements RunnerScheduler
 {
+    @Override
     public void schedule( final Runnable childStatement )
     {
         childStatement.run();
     }
 
+    @Override
     public void finished()
     {
     }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
index eb388c6..ef70027 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
@@ -172,6 +172,7 @@ class TestMethod
         return ls;
     }
 
+    @Override
     public void writeTestOutput( byte[] buf, int off, int len, boolean stdout )
     {
         getLogicalStream().write( stdout, buf, off, len );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/AbstractThreadPoolStrategy.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/AbstractThreadPoolStrategy.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/AbstractThreadPoolStrategy.java
index 5eb7715..a308952 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/AbstractThreadPoolStrategy.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/AbstractThreadPoolStrategy.java
@@ -126,6 +126,7 @@ abstract class AbstractThreadPoolStrategy
         }
     }
 
+    @Override
     public boolean destroy()
     {
         try

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/InvokerStrategy.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/InvokerStrategy.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/InvokerStrategy.java
index cc1a040..0001b08 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/InvokerStrategy.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/InvokerStrategy.java
@@ -91,6 +91,7 @@ final class InvokerStrategy
         return disable();
     }
 
+    @Override
     public boolean destroy()
     {
         return stop();

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/NullBalancer.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/NullBalancer.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/NullBalancer.java
index 56b9522..a80e8c5 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/NullBalancer.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/NullBalancer.java
@@ -29,15 +29,18 @@ package org.apache.maven.surefire.junitcore.pc;
 final class NullBalancer
     implements Balancer
 {
+    @Override
     public boolean acquirePermit()
     {
         return true;
     }
 
+    @Override
     public void releasePermit()
     {
     }
 
+    @Override
     public void releaseAllPermits()
     {
     }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java
index afec8a3..a198887 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java
@@ -182,6 +182,7 @@ public abstract class ParallelComputer
     {
         return new Callable<ShutdownResult>()
         {
+            @Override
             public ShutdownResult call()
                 throws Exception
             {
@@ -195,6 +196,7 @@ public abstract class ParallelComputer
     {
         return new Callable<ShutdownResult>()
         {
+            @Override
             public ShutdownResult call()
                 throws Exception
             {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/11511f4a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java
index 2c87fdd..3c21409 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java
@@ -335,6 +335,7 @@ public class Scheduler
     {
     }
 
+    @Override
     public void schedule( Runnable childStatement )
     {
         if ( childStatement == null )
@@ -365,6 +366,7 @@ public class Scheduler
         }
     }
 
+    @Override
     public void finished()
     {
         try
@@ -385,6 +387,7 @@ public class Scheduler
     {
         return new Runnable()
         {
+            @Override
             public void run()
             {
                 try
@@ -482,6 +485,7 @@ public class Scheduler
             this.poolHandler = poolHandler;
         }
 
+        @Override
         public void rejectedExecution( Runnable r, ThreadPoolExecutor executor )
         {
             if ( executor.isShutdown() )


Mime
View raw message