maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tibordig...@apache.org
Subject [maven-surefire] 01/06: [SUREFIRE-1591] Java 1.7 feature Diamonds replaced Generics
Date Sun, 11 Nov 2018 23:22:26 GMT
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch 3.0.0-M2
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit 5dcd98482c4ac599d0a053ddbe35ed18a70e62b4
Author: Tibor17 <tibordigana@apache.org>
AuthorDate: Sun Nov 11 22:57:58 2018 +0100

    [SUREFIRE-1591] Java 1.7 feature Diamonds replaced Generics
---
 .../plugin/surefire/AbstractSurefireMojo.java      | 10 +--
 .../maven/plugin/surefire/ClasspathCache.java      |  4 +-
 .../surefire/StartupReportConfiguration.java       |  2 +-
 .../surefire/SurefireDependencyResolver.java       |  4 +-
 .../maven/plugin/surefire/SurefireHelper.java      |  4 +-
 .../maven/plugin/surefire/TestClassPath.java       |  2 +-
 .../booterclient/DefaultForkConfiguration.java     |  2 +-
 .../surefire/booterclient/ForkNumberBucket.java    |  2 +-
 .../plugin/surefire/booterclient/Platform.java     |  2 +-
 .../lazytestprovider/TestLessInputStream.java      |  6 +-
 .../lazytestprovider/TestProvidingInputStream.java |  2 +-
 .../surefire/booterclient/output/ForkClient.java   |  6 +-
 .../output/MultipleFailureException.java           |  2 +-
 .../output/ThreadedStreamConsumer.java             |  2 +-
 .../surefire/report/DefaultReporterFactory.java    | 14 ++--
 .../plugin/surefire/report/TestSetRunListener.java |  2 +-
 .../maven/plugin/surefire/report/TestSetStats.java |  4 +-
 .../plugin/surefire/util/DirectoryScanner.java     |  2 +-
 .../plugin/surefire/util/SpecificFileFilter.java   |  2 +-
 .../plugin/surefire/AbstractSurefireMojoTest.java  |  8 +--
 .../surefire/SurefireDependencyResolverTest.java   | 12 ++--
 .../maven/plugin/surefire/SurefireHelperTest.java  |  2 +-
 .../plugin/surefire/SurefirePropertiesTest.java    |  4 +-
 ...ooterDeserializerProviderConfigurationTest.java |  8 +--
 .../booterclient/DefaultForkConfigurationTest.java |  2 +-
 .../plugin/surefire/booterclient/MockReporter.java |  4 +-
 .../report/DefaultReporterFactoryTest.java         | 22 +++---
 .../plugin/surefire/util/DirectoryScannerTest.java |  2 +-
 .../report/AbstractSurefireReportMojo.java         |  4 +-
 .../surefire/runorder/RunEntryStatisticsMap.java   |  2 +-
 .../maven/surefire/SpecificTestClassFilter.java    |  2 +-
 .../maven/surefire/booter/SurefireReflector.java   |  2 +-
 .../maven/surefire/cli/CommandLineOption.java      |  4 +-
 .../ConsoleOutputReceiverForCurrentThread.java     |  2 +-
 .../maven/surefire/report/SimpleReportEntry.java   |  2 +-
 .../maven/surefire/testset/TestListResolver.java   |  6 +-
 .../apache/maven/surefire/testset/TestRequest.java |  2 +-
 .../surefire/util/DefaultDirectoryScanner.java     |  2 +-
 .../maven/surefire/util/DefaultScanResult.java     |  4 +-
 .../org/apache/maven/surefire/util/RunOrder.java   |  2 +-
 .../maven/surefire/util/internal/ImmutableMap.java |  4 +-
 .../surefire/testset/TestListResolverTest.java     | 20 +++---
 .../surefire/util/DefaultDirectoryScannerTest.java |  4 +-
 .../apache/maven/surefire/util/ScanResultTest.java |  2 +-
 .../surefire/util/internal/ImmutableMapTest.java   | 16 ++---
 .../maven/surefire/booter/IsolatedClassLoader.java |  2 +-
 .../maven/surefire/booter/PropertiesWrapper.java   |  2 +-
 .../surefire/booter/NewClassLoaderRunner.java      |  4 +-
 .../surefire/booter/PropertiesWrapperTest.java     |  4 +-
 .../surefire/group/match/JoinGroupMatcher.java     |  2 +-
 .../maven/surefire/its/AbstractFailFastIT.java     |  2 +-
 .../org/apache/maven/surefire/its/ForkModeIT.java  |  2 +-
 .../maven/surefire/its/ForkModeMultiModuleIT.java  |  6 +-
 .../maven/surefire/its/TestMethodPatternIT.java    |  4 +-
 .../maven/surefire/its/TestSingleMethodIT.java     |  4 +-
 .../apache/maven/surefire/its/TwoTestCasesIT.java  |  2 +-
 .../surefire/its/fixture/HelperAssertions.java     |  4 +-
 .../surefire/its/fixture/OutputValidator.java      |  2 +-
 .../surefire/its/fixture/SurefireLauncher.java     |  2 +-
 .../Surefire1082ParallelJUnitParameterizedIT.java  |  8 +--
 .../its/jiras/Surefire1098BalancedRunOrderIT.java  |  2 +-
 .../Surefire747MethodParallelWithSuiteCountIT.java |  2 +-
 .../core/surefireJunitTests/BaseTest.java          |  2 +-
 .../surefire/selfdestruct/SelfDestructMojo.java    |  2 +-
 .../surefire/report/SmartStackTraceParser.java     |  4 +-
 .../maven/surefire/report/RunnableTestClass1.java  |  2 +-
 .../surefire/report/SmartStackTraceParserTest.java |  4 +-
 .../surefire/common/junit4/JUnit4ProviderUtil.java |  2 +-
 .../surefire/common/junit4/JUnit4RunListener.java  |  2 +-
 .../common/junit4/JUnit4RunListenerFactory.java    |  2 +-
 .../common/junit4/JUnitTestFailureListener.java    |  2 +-
 .../surefire/common/junit4/MatchDescriptions.java  |  2 +-
 .../maven/surefire/common/junit4/Notifier.java     |  4 +-
 .../apache/maven/surefire/junit4/MockReporter.java |  2 +-
 .../common/junit4/JUnit4ProviderUtilTest.java      |  2 +-
 .../surefire/common/junit48/MethodFilter.java      |  4 +-
 .../surefire/junitcore/JUnitCoreParameters.java    |  2 +-
 .../surefire/junitcore/JUnitCoreProvider.java      |  2 +-
 .../maven/surefire/junitcore/LogicalStream.java    |  2 +-
 .../maven/surefire/junitcore/TestMethod.java       |  4 +-
 .../apache/maven/surefire/junitcore/TestSet.java   |  4 +-
 .../surefire/junitcore/pc/InvokerStrategy.java     |  2 +-
 .../surefire/junitcore/pc/ParallelComputer.java    |  4 +-
 .../junitcore/pc/ParallelComputerBuilder.java      | 24 +++----
 .../surefire/junitcore/pc/ShutdownStatus.java      |  2 +-
 .../junitcore/pc/SingleThreadScheduler.java        |  2 +-
 .../junitcore/ConcurrentRunListenerTest.java       |  4 +-
 .../ConfigurableParallelComputerTest.java          |  2 +-
 .../junitcore/JUnitCoreParametersTest.java         | 12 ++--
 .../junitcore/JUnitCoreRunListenerTest.java        |  8 +--
 .../maven/surefire/junitcore/JUnitCoreTester.java  |  2 +-
 .../maven/surefire/junitcore/Surefire746Test.java  |  6 +-
 .../pc/OptimizedParallelComputerTest.java          | 24 +++----
 .../junitcore/pc/ParallelComputerBuilderTest.java  |  6 +-
 .../junitcore/pc/ParallelComputerUtilTest.java     | 82 +++++++++++-----------
 .../testng/utils/GroupMatcherMethodSelector.java   |  2 +-
 .../surefire/testng/TestNGDirectoryTestSuite.java  |  2 +-
 .../maven/surefire/testng/TestNGXmlTestSuite.java  |  4 +-
 .../testng/conf/AbstractDirectConfigurator.java    |  8 +--
 .../testng/conf/TestNGMapConfigurator.java         |  4 +-
 .../testng/conf/TestNG513ConfiguratorTest.java     |  2 +-
 .../testng/conf/TestNG5141ConfiguratorTest.java    |  2 +-
 .../testng/conf/TestNG5143ConfiguratorTest.java    |  2 +-
 .../testng/conf/TestNGMapConfiguratorTest.java     |  2 +-
 .../plugins/surefire/report/ReportTestSuite.java   |  2 +-
 .../surefire/report/SurefireReportParser.java      | 12 ++--
 .../surefire/report/ReportTestSuiteTest.java       |  2 +-
 .../surefire/report/SurefireReportParserTest.java  | 10 +--
 .../surefire/report/TestSuiteXmlParserTest.java    |  2 +-
 109 files changed, 279 insertions(+), 279 deletions(-)

diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 1cce687..319f21d 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -417,7 +417,7 @@ public abstract class AbstractSurefireMojo
      * @since 2.1.3
      */
     @Parameter
-    private Map<String, String> environmentVariables = new HashMap<String, String>();
+    private Map<String, String> environmentVariables = new HashMap<>();
 
     /**
      * Command line working directory.
@@ -1663,7 +1663,7 @@ public abstract class AbstractSurefireMojo
 
     private static Map<String, String> toStringProperties( Properties properties )
     {
-        Map<String, String> h = new ConcurrentHashMap<String, String>( properties.size() );
+        Map<String, String> h = new ConcurrentHashMap<>( properties.size() );
         for ( Enumeration e = properties.keys() ; e.hasMoreElements() ; )
         {
             Object k = e.nextElement();
@@ -2482,7 +2482,7 @@ public abstract class AbstractSurefireMojo
      */
     private static Set<Artifact> filterArtifacts( Set<Artifact> artifacts, ArtifactFilter filter )
     {
-        Set<Artifact> filteredArtifacts = new LinkedHashSet<Artifact>();
+        Set<Artifact> filteredArtifacts = new LinkedHashSet<>();
 
         for ( Artifact artifact : artifacts )
         {
@@ -2965,7 +2965,7 @@ public abstract class AbstractSurefireMojo
 
         @Nonnull List<ProviderInfo> resolve()
         {
-            List<ProviderInfo> providersToRun = new ArrayList<ProviderInfo>();
+            List<ProviderInfo> providersToRun = new ArrayList<>();
             Set<String> manuallyConfiguredProviders = getManuallyConfiguredProviders();
             for ( String name : manuallyConfiguredProviders )
             {
@@ -2979,7 +2979,7 @@ public abstract class AbstractSurefireMojo
 
         @Nonnull private List<ProviderInfo> autoDetectOneProvider()
         {
-            List<ProviderInfo> providersToRun = new ArrayList<ProviderInfo>();
+            List<ProviderInfo> providersToRun = new ArrayList<>();
             for ( ProviderInfo wellKnownProvider : wellKnownProviders )
             {
                 if ( wellKnownProvider.isApplicable() )
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ClasspathCache.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ClasspathCache.java
index 3bb1ac2..7ba7b54 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ClasspathCache.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ClasspathCache.java
@@ -35,7 +35,7 @@ import javax.annotation.Nonnull;
 public class ClasspathCache
 {
     private static final ConcurrentHashMap<String, Classpath> CLASSPATHS =
-        new ConcurrentHashMap<String, Classpath>( 4 );
+        new ConcurrentHashMap<>( 4 );
 
     public static Classpath getCachedClassPath( @Nonnull String artifactId )
     {
@@ -49,7 +49,7 @@ public class ClasspathCache
 
     public static Classpath setCachedClasspath( @Nonnull String key, @Nonnull Set<Artifact> artifacts )
     {
-        Collection<String> files = new ArrayList<String>();
+        Collection<String> files = new ArrayList<>();
         for ( Artifact artifact : artifacts )
         {
             files.add( artifact.getFile().getAbsolutePath() );
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
index b8e9b37..5089973 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
@@ -77,7 +77,7 @@ public final class StartupReportConfiguration
     private final String xsdSchemaLocation;
 
     private final Map<String, Map<String, List<WrappedReportEntry>>> testClassMethodRunHistory
-        = new ConcurrentHashMap<String, Map<String, List<WrappedReportEntry>>>();
+        = new ConcurrentHashMap<>();
 
     private final Charset encoding;
 
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
index 2f79830..af85bf4 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
@@ -167,7 +167,7 @@ final class SurefireDependencyResolver
     Set<Artifact> addProviderToClasspath( Map<String, Artifact> pluginArtifactMap, Artifact mojoPluginArtifact,
                                           Artifact surefireCommon, Artifact surefireApi, Artifact surefireLoggerApi )
     {
-        Set<Artifact> providerArtifacts = new LinkedHashSet<Artifact>();
+        Set<Artifact> providerArtifacts = new LinkedHashSet<>();
         ArtifactResolutionResult artifactResolutionResult = resolveArtifact( mojoPluginArtifact );
         for ( Artifact artifact : pluginArtifactMap.values() )
         {
@@ -201,7 +201,7 @@ final class SurefireDependencyResolver
 
     private static Set<Artifact> orderProviderArtifacts( Set<Artifact> providerArtifacts )
     {
-        Set<Artifact> orderedProviderArtifacts = new LinkedHashSet<Artifact>();
+        Set<Artifact> orderedProviderArtifacts = new LinkedHashSet<>();
         for ( String order : PROVIDER_CLASSPATH_ORDER )
         {
             Iterator<Artifact> providerArtifactsIt = providerArtifacts.iterator();
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
index 3e6e2c5..17021d1 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
@@ -116,7 +116,7 @@ public final class SurefireHelper
 
     public static File replaceForkThreadsInPath( File path, int replacement )
     {
-        Deque<String> dirs = new LinkedList<String>();
+        Deque<String> dirs = new LinkedList<>();
         File root = path;
         while ( !root.exists() )
         {
@@ -162,7 +162,7 @@ public final class SurefireHelper
 
     public static List<CommandLineOption> commandLineOptions( MavenSession session, PluginConsoleLogger log )
     {
-        List<CommandLineOption> cli = new ArrayList<CommandLineOption>();
+        List<CommandLineOption> cli = new ArrayList<>();
         if ( log.isErrorEnabled() )
         {
             cli.add( LOGGING_LEVEL_ERROR );
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java
index 22c2011..3e3a327 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java
@@ -81,7 +81,7 @@ final class TestClassPath
 
     Classpath toClasspath()
     {
-        List<String> classpath = new ArrayList<String>();
+        List<String> classpath = new ArrayList<>();
         classpath.add( testClassesDirectory.getAbsolutePath() );
         classpath.add( classesDirectory.getAbsolutePath() );
         for ( Artifact artifact : artifacts )
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
index a943031..8722f52 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
@@ -239,7 +239,7 @@ public abstract class DefaultForkConfiguration
     @Nonnull
     private static <K, V> Map<K, V> toImmutable( @Nullable Map<K, V> map )
     {
-        return map == null ? Collections.<K, V>emptyMap() : new ImmutableMap<K, V>( map );
+        return map == null ? Collections.<K, V>emptyMap() : new ImmutableMap<>( map );
     }
 
     @Override
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkNumberBucket.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkNumberBucket.java
index d1a8257..d5d52e6 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkNumberBucket.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkNumberBucket.java
@@ -33,7 +33,7 @@ public final class ForkNumberBucket
 {
     private static final ForkNumberBucket INSTANCE = new ForkNumberBucket();
 
-    private final Queue<Integer> qFree = new ConcurrentLinkedQueue<Integer>();
+    private final Queue<Integer> qFree = new ConcurrentLinkedQueue<>();
 
     private final AtomicInteger highWaterMark = new AtomicInteger( 1 );
 
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/Platform.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/Platform.java
index 4762453..074a3cb 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/Platform.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/Platform.java
@@ -43,7 +43,7 @@ public final class Platform
     public Platform()
     {
         // the job may take 50 or 80 ms
-        this( new FutureTask<Long>( pidJob() ), null );
+        this( new FutureTask<>( pidJob() ), null );
         newDaemonThread( pluginPidJob ).start();
     }
 
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestLessInputStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestLessInputStream.java
index 521130c..3014486 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestLessInputStream.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestLessInputStream.java
@@ -51,7 +51,7 @@ public final class TestLessInputStream
 
     private final AtomicBoolean closed = new AtomicBoolean();
 
-    private final Queue<Command> immediateCommands = new ConcurrentLinkedQueue<Command>();
+    private final Queue<Command> immediateCommands = new ConcurrentLinkedQueue<>();
 
     private final TestLessInputStreamBuilder builder;
 
@@ -180,7 +180,7 @@ public final class TestLessInputStream
     public static final class TestLessInputStreamBuilder
     {
         private final ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock();
-        private final Queue<TestLessInputStream> aliveStreams = new ConcurrentLinkedQueue<TestLessInputStream>();
+        private final Queue<TestLessInputStream> aliveStreams = new ConcurrentLinkedQueue<>();
         private final ImmediateCommands immediateCommands = new ImmediateCommands();
         private final CachableCommands cachableCommands = new CachableCommands();
         private final Node head = new Node( null );
@@ -487,7 +487,7 @@ public final class TestLessInputStream
 
         private static class Node
         {
-            private final AtomicReference<Node> next = new AtomicReference<Node>();
+            private final AtomicReference<Node> next = new AtomicReference<>();
             private final Command command;
 
             Node( Command command )
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
index bc26ab2..a4255cc 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
@@ -54,7 +54,7 @@ public final class TestProvidingInputStream
 {
     private final Semaphore barrier = new Semaphore( 0 );
 
-    private final Queue<Command> commands = new ConcurrentLinkedQueue<Command>();
+    private final Queue<Command> commands = new ConcurrentLinkedQueue<>();
 
     private final AtomicBoolean closed = new AtomicBoolean();
 
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
index 254111b..436566f 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
@@ -88,11 +88,11 @@ public class ForkClient
 
     private final DefaultReporterFactory defaultReporterFactory;
 
-    private final Map<String, String> testVmSystemProperties = new ConcurrentHashMap<String, String>();
+    private final Map<String, String> testVmSystemProperties = new ConcurrentHashMap<>();
 
     private final NotifiableTestStream notifiableTestStream;
 
-    private final Queue<String> testsInProgress = new ConcurrentLinkedQueue<String>();
+    private final Queue<String> testsInProgress = new ConcurrentLinkedQueue<>();
 
     /**
      * {@code testSetStartedAt} is set to non-zero after received
@@ -485,7 +485,7 @@ public class ForkClient
 
     public Set<String> testsInProgress()
     {
-        return new TreeSet<String>( testsInProgress );
+        return new TreeSet<>( testsInProgress );
     }
 
     public boolean hasTestsInProgress()
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/MultipleFailureException.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/MultipleFailureException.java
index 060994b..81c7dd5 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/MultipleFailureException.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/MultipleFailureException.java
@@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 final class MultipleFailureException
         extends IOException
 {
-    private final Queue<Throwable> exceptions = new ConcurrentLinkedQueue<Throwable>();
+    private final Queue<Throwable> exceptions = new ConcurrentLinkedQueue<>();
 
     void addException( Throwable exception )
     {
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
index 093c191..dad88fd 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
@@ -42,7 +42,7 @@ public final class ThreadedStreamConsumer
 
     private static final int ITEM_LIMIT_BEFORE_SLEEP = 10 * 1000;
 
-    private final BlockingQueue<String> items = new ArrayBlockingQueue<String>( ITEM_LIMIT_BEFORE_SLEEP );
+    private final BlockingQueue<String> items = new ArrayBlockingQueue<>( ITEM_LIMIT_BEFORE_SLEEP );
 
     private final AtomicBoolean stop = new AtomicBoolean();
 
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
index dd652a8..e622c6d 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -63,7 +63,7 @@ import static org.apache.maven.surefire.util.internal.ObjectUtils.useNonNull;
 public class DefaultReporterFactory
     implements ReporterFactory
 {
-    private final Collection<TestSetRunListener> listeners = new ConcurrentLinkedQueue<TestSetRunListener>();
+    private final Collection<TestSetRunListener> listeners = new ConcurrentLinkedQueue<>();
     private final StartupReportConfiguration reportConfiguration;
     private final ConsoleLogger consoleLogger;
     private final Integer forkNumber;
@@ -269,11 +269,11 @@ public class DefaultReporterFactory
     void mergeTestHistoryResult()
     {
         globalStats = new RunStatistics();
-        flakyTests = new TreeMap<String, List<TestMethodStats>>();
-        failedTests = new TreeMap<String, List<TestMethodStats>>();
-        errorTests = new TreeMap<String, List<TestMethodStats>>();
+        flakyTests = new TreeMap<>();
+        failedTests = new TreeMap<>();
+        errorTests = new TreeMap<>();
 
-        Map<String, List<TestMethodStats>> mergedTestHistoryResult = new HashMap<String, List<TestMethodStats>>();
+        Map<String, List<TestMethodStats>> mergedTestHistoryResult = new HashMap<>();
         // Merge all the stats for tests from listeners
         for ( TestSetRunListener listener : listeners )
         {
@@ -283,7 +283,7 @@ public class DefaultReporterFactory
                     mergedTestHistoryResult.get( methodStats.getTestClassMethodName() );
                 if ( currentMethodStats == null )
                 {
-                    currentMethodStats = new ArrayList<TestMethodStats>();
+                    currentMethodStats = new ArrayList<>();
                     currentMethodStats.add( methodStats );
                     mergedTestHistoryResult.put( methodStats.getTestClassMethodName(), currentMethodStats );
                 }
@@ -303,7 +303,7 @@ public class DefaultReporterFactory
             String testClassMethodName = entry.getKey();
             completedCount++;
 
-            List<ReportEntryType> resultTypes = new ArrayList<ReportEntryType>();
+            List<ReportEntryType> resultTypes = new ArrayList<>();
             for ( TestMethodStats methodStats : testMethodStats )
             {
                 resultTypes.add( methodStats.getResultType() );
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
index 62060f1..995d687 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
@@ -46,7 +46,7 @@ import static org.apache.maven.plugin.surefire.report.ReportEntryType.SUCCESS;
 public class TestSetRunListener
     implements RunListener, ConsoleOutputReceiver, ConsoleLogger
 {
-    private final Queue<TestMethodStats> testMethodStats = new ConcurrentLinkedQueue<TestMethodStats>();
+    private final Queue<TestMethodStats> testMethodStats = new ConcurrentLinkedQueue<>();
 
     private final TestSetStats detailsForThis;
 
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
index 4634b26..8698159 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java
@@ -45,7 +45,7 @@ public class TestSetStats
     private static final String IN_MARKER = " - in ";
     private static final String COMMA = ", ";
 
-    private final Queue<WrappedReportEntry> reportEntries = new ConcurrentLinkedQueue<WrappedReportEntry>();
+    private final Queue<WrappedReportEntry> reportEntries = new ConcurrentLinkedQueue<>();
 
     private final boolean trimStackTrace;
 
@@ -260,7 +260,7 @@ public class TestSetStats
 
     public List<String> getTestResults()
     {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         for ( WrappedReportEntry testResult : reportEntries )
         {
             if ( testResult.isErrorOrFailure() )
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java
index 6dc81f0..b7cde4b 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java
@@ -47,7 +47,7 @@ public class DirectoryScanner
     public DefaultScanResult scan()
     {
         FileScanner scanner = new FileScanner( basedir, "class" );
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         scanner.scanTo( result, filter );
         return new DefaultScanResult( result );
     }
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java
index 912f274..6b97b2f 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java
@@ -42,7 +42,7 @@ public class SpecificFileFilter
     {
         if ( classNames != null && classNames.length > 0 )
         {
-            this.names = new HashSet<String>();
+            this.names = new HashSet<>();
             for ( String name : classNames )
             {
                 names.add( convertSlashToSystemFileSeparator( name ) );
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
index dbe6c8b..de62c60 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
@@ -122,7 +122,7 @@ public class AbstractSurefireMojoTest
         Artifact api = new DefaultArtifact( "g", "a", createFromVersionSpec( "1" ), "compile", "jar", "", null );
         api.setFile( mockFile( "surefire-api.jar" ) );
 
-        Set<Artifact> newArtifacts = new LinkedHashSet<Artifact>();
+        Set<Artifact> newArtifacts = new LinkedHashSet<>();
         newArtifacts.add( common );
         newArtifacts.add( api );
 
@@ -152,7 +152,7 @@ public class AbstractSurefireMojoTest
         when( mojo.getClasspathDependencyExcludes() ).thenReturn( new String[]{ "g3:a3" } );
         doReturn( mock( Artifact.class ) ).when( mojo, "getTestNgArtifact" );
 
-        Set<Artifact> artifacts = new HashSet<Artifact>();
+        Set<Artifact> artifacts = new HashSet<>();
 
         Artifact a1 = mock( Artifact.class );
         when( a1.getGroupId() ).thenReturn( "g1" );
@@ -225,7 +225,7 @@ public class AbstractSurefireMojoTest
                 createFromVersion( "1" ), "runtime", "jar", "", handler );
         loggerApi.setFile( mockFile( "surefire-logger-api.jar" ) );
 
-        Map<String, Artifact> providerArtifactsMap = new HashMap<String, Artifact>();
+        Map<String, Artifact> providerArtifactsMap = new HashMap<>();
         providerArtifactsMap.put( "org.apache.maven.surefire:maven-surefire-common", common );
         providerArtifactsMap.put( "org.apache.maven.surefire:surefire-api", api );
         providerArtifactsMap.put( "org.apache.maven.surefire:surefire-logger-api", loggerApi );
@@ -289,7 +289,7 @@ public class AbstractSurefireMojoTest
         assertThat( ( Object ) conf.getClasspathConfiguration().getTestClasspath() )
                 .isEqualTo( testClasspath.toClasspath() );
 
-        Collection<String> files = new ArrayList<String>();
+        Collection<String> files = new ArrayList<>();
         for ( Artifact providerArtifact : providerArtifacts )
         {
             files.add( providerArtifact.getFile().getAbsolutePath() );
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireDependencyResolverTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireDependencyResolverTest.java
index 08b389f..cd874f3 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireDependencyResolverTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireDependencyResolverTest.java
@@ -167,7 +167,7 @@ public class SurefireDependencyResolverTest
         Artifact logger = createArtifact( "surefire-logger-api" );
         logger.setFile( new File( "" ) );
 
-        Set<Artifact> providerArtifacts = new LinkedHashSet<Artifact>();
+        Set<Artifact> providerArtifacts = new LinkedHashSet<>();
         providerArtifacts.add( api );
         providerArtifacts.add( provider );
         providerArtifacts.add( ext );
@@ -263,7 +263,7 @@ public class SurefireDependencyResolverTest
         final Artifact ext = createArtifact( "org.apiguardian", "apiguardian-api" );
         final Artifact logger = createArtifact( "surefire-logger-api" );
 
-        Set<Artifact> pluginArtifacts = new LinkedHashSet<Artifact>();
+        Set<Artifact> pluginArtifacts = new LinkedHashSet<>();
         pluginArtifacts.add( plugin );
         pluginArtifacts.add( common );
         pluginArtifacts.add( api );
@@ -297,7 +297,7 @@ public class SurefireDependencyResolverTest
 
         final ArtifactResolutionResult providerResult = mock( ArtifactResolutionResult.class );
         when( providerResult.getArtifacts() )
-                .thenReturn( new HashSet<Artifact>( asList( provider, api, logger, ext ) ) );
+                .thenReturn( new HashSet<>( asList( provider, api, logger, ext ) ) );
 
         RepositorySystem repositorySystem = mock( RepositorySystem.class );
         when( repositorySystem.resolve( any(  ArtifactResolutionRequest.class) ) )
@@ -336,7 +336,7 @@ public class SurefireDependencyResolverTest
         SurefireDependencyResolver surefireDependencyResolver =
                 new SurefireDependencyResolver( repositorySystem, null, null, null, null, null );
 
-        Map<String, Artifact> pluginArtifactsMapping = new HashMap<String, Artifact>();
+        Map<String, Artifact> pluginArtifactsMapping = new HashMap<>();
         pluginArtifactsMapping.put( plugin.getGroupId() + ":" + plugin.getArtifactId(), plugin );
         pluginArtifactsMapping.put( common.getGroupId() + ":" + common.getArtifactId(), common );
         pluginArtifactsMapping.put( api.getGroupId() + ":" + api.getArtifactId(), api );
@@ -358,7 +358,7 @@ public class SurefireDependencyResolverTest
         Artifact ext = createArtifact( "org.apiguardian", "apiguardian-api" );
         Artifact logger = createArtifact( "surefire-logger-api" );
 
-        Set<Artifact> providerArtifacts = new LinkedHashSet<Artifact>();
+        Set<Artifact> providerArtifacts = new LinkedHashSet<>();
         providerArtifacts.add( api );
         providerArtifacts.add( provider );
         providerArtifacts.add( ext );
@@ -381,7 +381,7 @@ public class SurefireDependencyResolverTest
         Set<Artifact> actual =
                 invokeMethod( SurefireDependencyResolver.class, "orderProviderArtifacts", providerArtifacts );
 
-        Set<Artifact> expected = new LinkedHashSet<Artifact>();
+        Set<Artifact> expected = new LinkedHashSet<>();
         expected.add( provider );
         expected.add( api );
         expected.add( logger );
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java
index 40ab309..e5f8eb8 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java
@@ -64,7 +64,7 @@ public class SurefireHelperTest
         String[] dumps = SurefireHelper.getDumpFilesToPrint();
         assertThat( dumps ).hasSize( 4 );
         assertThat( dumps ).doesNotHaveDuplicates();
-        List<String> onlyStrings = new ArrayList<String>();
+        List<String> onlyStrings = new ArrayList<>();
         addAll( onlyStrings, dumps );
         onlyStrings.removeAll( singleton( (String) null ) );
         assertThat( onlyStrings ).hasSize( 4 );
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefirePropertiesTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefirePropertiesTest.java
index 480656f..03aa136 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefirePropertiesTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefirePropertiesTest.java
@@ -85,7 +85,7 @@ public class SurefirePropertiesTest
         assertTrue( list( orderedProperties.keys() ).contains( "b" ) );
 
         Iterator it = orderedProperties.getStringKeySet().iterator();
-        SortedSet<Object> keys = new TreeSet<Object>();
+        SortedSet<Object> keys = new TreeSet<>();
         keys.add( it.next() );
         keys.add( it.next() );
         it = keys.iterator();
@@ -112,7 +112,7 @@ public class SurefirePropertiesTest
         assertTrue( list( orderedProperties.keys() ).contains( "b" ) );
 
         Iterator it = orderedProperties.getStringKeySet().iterator();
-        SortedSet<Object> keys = new TreeSet<Object>();
+        SortedSet<Object> keys = new TreeSet<>();
         keys.add( it.next() );
         keys.add( it.next() );
         it = keys.iterator();
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java
index 4777ce8..7750c93 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java
@@ -67,8 +67,8 @@ public class BooterDeserializerProviderConfigurationTest
     {
 
         File aDir = new File( "." );
-        List<String> includes = new ArrayList<String>();
-        List<String> excludes = new ArrayList<String>();
+        List<String> includes = new ArrayList<>();
+        List<String> excludes = new ArrayList<>();
         includes.add( "abc" );
         includes.add( "cde" );
         excludes.add( "xx1" );
@@ -191,8 +191,8 @@ public class BooterDeserializerProviderConfigurationTest
     private DirectoryScannerParameters getDirectoryScannerParametersWithoutSpecificTests()
     {
         File aDir = new File( "." );
-        List<String> includes = new ArrayList<String>();
-        List<String> excludes = new ArrayList<String>();
+        List<String> includes = new ArrayList<>();
+        List<String> excludes = new ArrayList<>();
         includes.add( "abc" );
         includes.add( "cde" );
         excludes.add( "xx1" );
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfigurationTest.java
index 98ae994..b974187 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfigurationTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfigurationTest.java
@@ -82,7 +82,7 @@ public class DefaultForkConfigurationTest
         workingDirectory = new File( "." );
         modelProperties = new Properties();
         argLine = null;
-        environmentVariables = new HashMap<String, String>();
+        environmentVariables = new HashMap<>();
         debug = true;
         forkCount = 2;
         reuseForks = true;
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java
index 951929e..2c9612f 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java
@@ -35,9 +35,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 public class MockReporter
     implements RunListener, ConsoleLogger, ConsoleOutputReceiver
 {
-    private final List<String> events = new ArrayList<String>();
+    private final List<String> events = new ArrayList<>();
 
-    private final List<Object> data = new ArrayList<Object>();
+    private final List<Object> data = new ArrayList<>();
 
     public static final String SET_STARTING = "SET_STARTED";
 
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
index e1c8ab5..55c3a64 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
@@ -75,7 +75,7 @@ public class DefaultReporterFactoryTest
         DefaultReporterFactory factory = new DefaultReporterFactory( reportConfig, reporter );
 
         // First run, four tests failed and one passed
-        Queue<TestMethodStats> firstRunStats = new ArrayDeque<TestMethodStats>();
+        Queue<TestMethodStats> firstRunStats = new ArrayDeque<>();
         firstRunStats.add( new TestMethodStats( TEST_ONE, ReportEntryType.ERROR, new DummyStackTraceWriter( ERROR ) ) );
         firstRunStats.add( new TestMethodStats( TEST_TWO, ReportEntryType.ERROR, new DummyStackTraceWriter( ERROR ) ) );
         firstRunStats.add(
@@ -86,7 +86,7 @@ public class DefaultReporterFactoryTest
             new TestMethodStats( TEST_FIVE, ReportEntryType.SUCCESS, null ) );
 
         // Second run, two tests passed
-        Queue<TestMethodStats> secondRunStats = new ArrayDeque<TestMethodStats>();
+        Queue<TestMethodStats> secondRunStats = new ArrayDeque<>();
         secondRunStats.add(
             new TestMethodStats( TEST_ONE, ReportEntryType.FAILURE, new DummyStackTraceWriter( ASSERTION_FAIL ) ) );
         secondRunStats.add( new TestMethodStats( TEST_TWO, ReportEntryType.SUCCESS, null ) );
@@ -95,7 +95,7 @@ public class DefaultReporterFactoryTest
         secondRunStats.add( new TestMethodStats( TEST_FOUR, ReportEntryType.SUCCESS, null ) );
 
         // Third run, another test passed
-        Queue<TestMethodStats> thirdRunStats = new ArrayDeque<TestMethodStats>();
+        Queue<TestMethodStats> thirdRunStats = new ArrayDeque<>();
         thirdRunStats.add( new TestMethodStats( TEST_ONE, ReportEntryType.SUCCESS, null ) );
         thirdRunStats.add(
             new TestMethodStats( TEST_THREE, ReportEntryType.ERROR, new DummyStackTraceWriter( ERROR ) ) );
@@ -144,7 +144,7 @@ public class DefaultReporterFactoryTest
 
     static final class DummyTestReporter implements ConsoleLogger
     {
-        private final List<String> messages = new ArrayList<String>();
+        private final List<String> messages = new ArrayList<>();
 
         @Override
         public boolean isDebugEnabled()
@@ -218,32 +218,32 @@ public class DefaultReporterFactoryTest
 
     public void testGetTestResultType()
     {
-        List<ReportEntryType> emptyList = new ArrayList<ReportEntryType>();
+        List<ReportEntryType> emptyList = new ArrayList<>();
         assertEquals( unknown, getTestResultType( emptyList, 1 ) );
 
-        List<ReportEntryType> successList = new ArrayList<ReportEntryType>();
+        List<ReportEntryType> successList = new ArrayList<>();
         successList.add( ReportEntryType.SUCCESS );
         successList.add( ReportEntryType.SUCCESS );
         assertEquals( success, getTestResultType( successList, 1 ) );
 
-        List<ReportEntryType> failureErrorList = new ArrayList<ReportEntryType>();
+        List<ReportEntryType> failureErrorList = new ArrayList<>();
         failureErrorList.add( ReportEntryType.FAILURE );
         failureErrorList.add( ReportEntryType.ERROR );
         assertEquals( error, getTestResultType( failureErrorList, 1 ) );
 
-        List<ReportEntryType> errorFailureList = new ArrayList<ReportEntryType>();
+        List<ReportEntryType> errorFailureList = new ArrayList<>();
         errorFailureList.add( ReportEntryType.ERROR );
         errorFailureList.add( ReportEntryType.FAILURE );
         assertEquals( error, getTestResultType( errorFailureList, 1 ) );
 
-        List<ReportEntryType> flakeList = new ArrayList<ReportEntryType>();
+        List<ReportEntryType> flakeList = new ArrayList<>();
         flakeList.add( ReportEntryType.SUCCESS );
         flakeList.add( ReportEntryType.FAILURE );
         assertEquals( flake, getTestResultType( flakeList, 1 ) );
 
         assertEquals( failure, getTestResultType( flakeList, 0 ) );
 
-        flakeList = new ArrayList<ReportEntryType>();
+        flakeList = new ArrayList<>();
         flakeList.add( ReportEntryType.ERROR );
         flakeList.add( ReportEntryType.SUCCESS );
         flakeList.add( ReportEntryType.FAILURE );
@@ -251,7 +251,7 @@ public class DefaultReporterFactoryTest
 
         assertEquals( error, getTestResultType( flakeList, 0 ) );
 
-        List<ReportEntryType> skippedList = new ArrayList<ReportEntryType>();
+        List<ReportEntryType> skippedList = new ArrayList<>();
         skippedList.add( ReportEntryType.SKIPPED );
         assertEquals( skipped, getTestResultType( skippedList, 1 ) );
     }
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DirectoryScannerTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DirectoryScannerTest.java
index de6e706..02a462b 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DirectoryScannerTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DirectoryScannerTest.java
@@ -71,7 +71,7 @@ public class DirectoryScannerTest
         assertThat( classNames, is( notNullValue() ) );
         assertThat( classNames.size(), is( expectedClassesCount ) );
 
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         classNames.writeTo( props );
         assertThat( props.values(), hasSize( expectedClassesCount ) );
     }
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
index 7c78936..2e82856 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
@@ -180,7 +180,7 @@ public abstract class AbstractSurefireReportMojo
             return resolvedReportsDirectories;
         }
 
-        resolvedReportsDirectories = new ArrayList<File>();
+        resolvedReportsDirectories = new ArrayList<>();
 
         if ( this.reportsDirectories != null )
         {
@@ -251,7 +251,7 @@ public abstract class AbstractSurefireReportMojo
 
     private List<MavenProject> getProjectsWithoutRoot()
     {
-        List<MavenProject> result = new ArrayList<MavenProject>();
+        List<MavenProject> result = new ArrayList<>();
         for ( MavenProject subProject : reactorProjects )
         {
             if ( !project.equals( subProject ) )
diff --git a/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMap.java b/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMap.java
index ab93d62..1a685dc 100644
--- a/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMap.java
+++ b/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMap.java
@@ -52,7 +52,7 @@ public final class RunEntryStatisticsMap
 
     public RunEntryStatisticsMap( Map<String, RunEntryStatistics> runEntryStatistics )
     {
-        this.runEntryStatistics = new ConcurrentHashMap<String, RunEntryStatistics>( runEntryStatistics );
+        this.runEntryStatistics = new ConcurrentHashMap<>( runEntryStatistics );
     }
 
     public RunEntryStatisticsMap()
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java b/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java
index cfe7258..6f6b751 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java
@@ -43,7 +43,7 @@ public class SpecificTestClassFilter
     {
         if ( classNames != null && classNames.length > 0 )
         {
-            this.names = new HashSet<String>();
+            names = new HashSet<>();
             Collections.addAll( names, classNames );
         }
     }
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
index bab76da..360c802 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
@@ -409,7 +409,7 @@ public class SurefireReflector
 
     private static Collection<Integer> toOrdinals( Collection<? extends Enum> enums )
     {
-        Collection<Integer> ordinals = new ArrayList<Integer>( enums.size() );
+        Collection<Integer> ordinals = new ArrayList<>( enums.size() );
         for ( Enum e : enums )
         {
             ordinals.add( e.ordinal() );
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/cli/CommandLineOption.java b/surefire-api/src/main/java/org/apache/maven/surefire/cli/CommandLineOption.java
index a806370..195828a 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/cli/CommandLineOption.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/cli/CommandLineOption.java
@@ -38,7 +38,7 @@ public enum CommandLineOption
 
     public static List<CommandLineOption> fromStrings( Collection<String> elements )
     {
-        List<CommandLineOption> options = new ArrayList<CommandLineOption>( elements.size() );
+        List<CommandLineOption> options = new ArrayList<>( elements.size() );
         for ( String element : elements )
         {
             options.add( valueOf( element ) );
@@ -48,7 +48,7 @@ public enum CommandLineOption
 
     public static List<String> toStrings( Collection<CommandLineOption> options )
     {
-        List<String> elements = new ArrayList<String>( options.size() );
+        List<String> elements = new ArrayList<>( options.size() );
         for ( CommandLineOption option : options )
         {
             elements.add( option.name() );
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputReceiverForCurrentThread.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputReceiverForCurrentThread.java
index 836a499..e221a1d 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputReceiverForCurrentThread.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputReceiverForCurrentThread.java
@@ -25,7 +25,7 @@ package org.apache.maven.surefire.report;
 public final class ConsoleOutputReceiverForCurrentThread
 {
     private static final ThreadLocal<ConsoleOutputReceiver> CURRENT
-        = new InheritableThreadLocal<ConsoleOutputReceiver>();
+        = new InheritableThreadLocal<>();
 
     private ConsoleOutputReceiverForCurrentThread()
     {
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
index 1013f39..241c874 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
@@ -94,7 +94,7 @@ public class SimpleReportEntry
 
         this.elapsed = elapsed;
 
-        this.systemProperties = new ImmutableMap<String, String>( systemProperties );
+        this.systemProperties = new ImmutableMap<>( systemProperties );
     }
 
     public SimpleReportEntry( String source, String name, StackTraceWriter stackTraceWriter, Integer elapsed )
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
index b860c3b..edc0e8a 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
@@ -64,8 +64,8 @@ public class TestListResolver
     public TestListResolver( Collection<String> tests )
     {
         final IncludedExcludedPatterns patterns = new IncludedExcludedPatterns();
-        final Set<ResolvedTest> includedFilters = new LinkedHashSet<ResolvedTest>( 0 );
-        final Set<ResolvedTest> excludedFilters = new LinkedHashSet<ResolvedTest>( 0 );
+        final Set<ResolvedTest> includedFilters = new LinkedHashSet<>( 0 );
+        final Set<ResolvedTest> excludedFilters = new LinkedHashSet<>( 0 );
 
         for ( final String csvTests : tests )
         {
@@ -360,7 +360,7 @@ public class TestListResolver
     private static Collection<String> mergeIncludedAndExcludedTests( Collection<String> included,
                                                                      Collection<String> excluded )
     {
-        ArrayList<String> incExc = new ArrayList<String>( included );
+        ArrayList<String> incExc = new ArrayList<>( included );
         incExc.removeAll( Collections.<String>singleton( null ) );
         for ( String exc : excluded )
         {
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
index ef8d666..4f2e710 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
@@ -96,7 +96,7 @@ public class TestRequest
     {
         if ( suiteXmlFiles != null )
         {
-            List<File> files = new ArrayList<File>();
+            List<File> files = new ArrayList<>();
             Object element;
             for ( Object suiteXmlFile : suiteXmlFiles )
             {
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
index b8be70f..ee5ee5c 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
@@ -139,7 +139,7 @@ public class DefaultDirectoryScanner
 
     private static String[] processIncludesExcludes( List<String> list )
     {
-        List<String> newList = new ArrayList<String>();
+        List<String> newList = new ArrayList<>();
         for ( String include : list )
         {
             String[] includes = include.split( "," );
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
index db04a35..fc62f30 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
@@ -64,7 +64,7 @@ public class DefaultScanResult
 
     public static DefaultScanResult from( Map<String, String> properties )
     {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         int i = 0;
         while ( true )
         {
@@ -145,7 +145,7 @@ public class DefaultScanResult
     {
         if ( other != null )
         {
-            List<String> src = new ArrayList<String>( classes );
+            List<String> src = new ArrayList<>( classes );
             src.addAll( other.classes );
             return new DefaultScanResult( src );
         }
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrder.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrder.java
index 79c5235..4e75b61 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrder.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrder.java
@@ -54,7 +54,7 @@ public class RunOrder
      */
     public static RunOrder[] valueOfMulti( String values )
     {
-        List<RunOrder> result = new ArrayList<RunOrder>();
+        List<RunOrder> result = new ArrayList<>();
         if ( values != null )
         {
             StringTokenizer stringTokenizer = new StringTokenizer( values, "," );
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ImmutableMap.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ImmutableMap.java
index 003d884..7eb1225 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ImmutableMap.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ImmutableMap.java
@@ -45,7 +45,7 @@ public final class ImmutableMap<K, V>
         Node<K, V> previous = null;
         for ( Entry<K, V> e : map.entrySet() )
         {
-            Node<K, V> node = new Node<K, V>( e.getKey(), e.getValue() );
+            Node<K, V> node = new Node<>( e.getKey(), e.getValue() );
             if ( first == null )
             {
                 first = node;
@@ -62,7 +62,7 @@ public final class ImmutableMap<K, V>
     @Override
     public Set<Entry<K, V>> entrySet()
     {
-        Set<Entry<K, V>> entries = new LinkedHashSet<Entry<K, V>>();
+        Set<Entry<K, V>> entries = new LinkedHashSet<>();
         Node<K, V> node = first;
         while ( node != null )
         {
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/testset/TestListResolverTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/testset/TestListResolverTest.java
index 69febe5..d7a53b6 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/testset/TestListResolverTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/testset/TestListResolverTest.java
@@ -133,8 +133,8 @@ public class TestListResolverTest
 
     public void testNonRegexClassAndMethod()
     {
-        Collection<ResolvedTest> includedFilters = new ArrayList<ResolvedTest>();
-        Collection<ResolvedTest> excludedFilters = new ArrayList<ResolvedTest>();
+        Collection<ResolvedTest> includedFilters = new ArrayList<>();
+        Collection<ResolvedTest> excludedFilters = new ArrayList<>();
         IncludedExcludedPatterns includedExcludedPatterns = new IncludedExcludedPatterns();
         TestListResolver.nonRegexClassAndMethods( "MyTest", "myTest", false, includedExcludedPatterns, includedFilters,
                                                   excludedFilters );
@@ -157,8 +157,8 @@ public class TestListResolverTest
 
     public void testNonRegexClassAndMethods()
     {
-        Collection<ResolvedTest> includedFilters = new ArrayList<ResolvedTest>();
-        Collection<ResolvedTest> excludedFilters = new ArrayList<ResolvedTest>();
+        Collection<ResolvedTest> includedFilters = new ArrayList<>();
+        Collection<ResolvedTest> excludedFilters = new ArrayList<>();
         IncludedExcludedPatterns includedExcludedPatterns = new IncludedExcludedPatterns();
         TestListResolver.nonRegexClassAndMethods( "MyTest.class", "first*+second*", false, includedExcludedPatterns,
                                                   includedFilters, excludedFilters );
@@ -191,8 +191,8 @@ public class TestListResolverTest
 
     public void testNegativeNonRegexClassAndMethod()
     {
-        Collection<ResolvedTest> includedFilters = new ArrayList<ResolvedTest>();
-        Collection<ResolvedTest> excludedFilters = new ArrayList<ResolvedTest>();
+        Collection<ResolvedTest> includedFilters = new ArrayList<>();
+        Collection<ResolvedTest> excludedFilters = new ArrayList<>();
         IncludedExcludedPatterns includedExcludedPatterns = new IncludedExcludedPatterns();
         TestListResolver.nonRegexClassAndMethods( "MyTest", "myTest", true, includedExcludedPatterns, includedFilters,
                                                   excludedFilters );
@@ -216,8 +216,8 @@ public class TestListResolverTest
 
     public void testResolveTestRequest()
     {
-        Collection<ResolvedTest> includedFilters = new ArrayList<ResolvedTest>();
-        Collection<ResolvedTest> excludedFilters = new ArrayList<ResolvedTest>();
+        Collection<ResolvedTest> includedFilters = new ArrayList<>();
+        Collection<ResolvedTest> excludedFilters = new ArrayList<>();
         IncludedExcludedPatterns includedExcludedPatterns = new IncludedExcludedPatterns();
         TestListResolver.resolveTestRequest( "!%regex[.*.MyTest.class#myTest]", includedExcludedPatterns,
                                              includedFilters, excludedFilters );
@@ -365,7 +365,7 @@ public class TestListResolverTest
 
     private static Set<ResolvedTest> $( ResolvedTest... patterns )
     {
-        Set<ResolvedTest> set = new LinkedHashSet<ResolvedTest>();
+        Set<ResolvedTest> set = new LinkedHashSet<>();
         addAll( set, patterns );
         return set;
     }
@@ -490,7 +490,7 @@ public class TestListResolverTest
 
     private static Set<ResolvedTest> resolveClass( String patterns )
     {
-        Set<ResolvedTest> resolved = new HashSet<ResolvedTest>();
+        Set<ResolvedTest> resolved = new HashSet<>();
         for ( String pattern : patterns.split( "," ) )
         {
             resolved.add( new ResolvedTest( CLASS, pattern, false ) );
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/util/DefaultDirectoryScannerTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/util/DefaultDirectoryScannerTest.java
index 4b24292..5d7aed9 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/util/DefaultDirectoryScannerTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/util/DefaultDirectoryScannerTest.java
@@ -39,9 +39,9 @@ public class DefaultDirectoryScannerTest
     {
         // use target as people can configure ide to compile in an other place than maven
         File baseDir = new File( new File( "target" ).getCanonicalPath() );
-        List<String> include = new ArrayList<String>();
+        List<String> include = new ArrayList<>();
         include.add( "**/*ZT*A.java" );
-        List<String> exclude = new ArrayList<String>();
+        List<String> exclude = new ArrayList<>();
 
         DefaultDirectoryScanner surefireDirectoryScanner =
             new DefaultDirectoryScanner( baseDir, include, exclude, new ArrayList<String>() );
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/util/ScanResultTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/util/ScanResultTest.java
index c5fd85f..d3551f0 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/util/ScanResultTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/util/ScanResultTest.java
@@ -37,7 +37,7 @@ public class ScanResultTest
     {
         List<String> files = Arrays.asList( "abc", "cde" );
         DefaultScanResult scanResult = new DefaultScanResult( files );
-        Map<String, String> serialized = new HashMap<String, String>();
+        Map<String, String> serialized = new HashMap<>();
         scanResult.writeTo( serialized );
 
         DefaultScanResult read = DefaultScanResult.from( serialized );
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/util/internal/ImmutableMapTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/util/internal/ImmutableMapTest.java
index b104cc3..0cfe918 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/util/internal/ImmutableMapTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/util/internal/ImmutableMapTest.java
@@ -43,14 +43,14 @@ public class ImmutableMapTest
     @Before
     public void setUp() throws Exception
     {
-        Map<String, String> backingMap = new HashMap<String, String>();
+        Map<String, String> backingMap = new HashMap<>();
         backingMap.put( "a", "1" );
         backingMap.put( "x", null );
         backingMap.put( "b", "2" );
         backingMap.put( "c", "3" );
         backingMap.put( "", "" );
         backingMap.put( null, "1" );
-        map = new ImmutableMap<String, String>( backingMap );
+        map = new ImmutableMap<>( backingMap );
     }
 
     @Test
@@ -58,12 +58,12 @@ public class ImmutableMapTest
     {
         Set<Entry<String, String>> entries = map.entrySet();
         assertThat( entries, hasSize( 6 ) );
-        assertThat( entries, hasItem( new Node<String, String>( "a", "1" ) ) );
-        assertThat( entries, hasItem( new Node<String, String>( "x", null ) ) );
-        assertThat( entries, hasItem( new Node<String, String>( "b", "2" ) ) );
-        assertThat( entries, hasItem( new Node<String, String>( "c", "3" ) ) );
-        assertThat( entries, hasItem( new Node<String, String>( "", "" ) ) );
-        assertThat( entries, hasItem( new Node<String, String>( null, "1" ) ) );
+        assertThat( entries, hasItem( new Node<>( "a", "1" ) ) );
+        assertThat( entries, hasItem( new Node<>( "x", (String) null ) ) );
+        assertThat( entries, hasItem( new Node<>( "b", "2" ) ) );
+        assertThat( entries, hasItem( new Node<>( "c", "3" ) ) );
+        assertThat( entries, hasItem( new Node<>( "", "" ) ) );
+        assertThat( entries, hasItem( new Node<>( (String) null, "1" ) ) );
     }
 
     @Test
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 601acd5..d67eed2 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
@@ -32,7 +32,7 @@ public class IsolatedClassLoader
 {
     private final ClassLoader parent = ClassLoader.getSystemClassLoader();
 
-    private final Set<URL> urls = new HashSet<URL>();
+    private final Set<URL> urls = new HashSet<>();
 
     private final String roleName;
 
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 d94be71..570eea0 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
@@ -89,7 +89,7 @@ public class PropertiesWrapper
 
     public List<String> getStringList( String propertyPrefix )
     {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         for ( int i = 0; ; i++ )
         {
             String value = getProperty( propertyPrefix + i );
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java
index 4cf9424..3511951 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java
+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java
@@ -222,7 +222,7 @@ public class NewClassLoaderRunner
 
         private static Collection<URL> toPathList( String path ) throws MalformedURLException
         {
-            Collection<URL> classPath = new HashSet<URL>();
+            Collection<URL> classPath = new HashSet<>();
             for ( String file : path.split( pathSeparator ) )
             {
                 classPath.add( new File( file ).toURL() );
@@ -232,7 +232,7 @@ public class NewClassLoaderRunner
 
         private static Collection<URL> toPathList()
         {
-            Collection<URL> classPath = new HashSet<URL>();
+            Collection<URL> classPath = new HashSet<>();
             try
             {
                 String[] files = readFileToString( new File( "target/test-classpath/cp.txt" ) ).split( pathSeparator );
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PropertiesWrapperTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PropertiesWrapperTest.java
index 4567b5b..9cbad17 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PropertiesWrapperTest.java
+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PropertiesWrapperTest.java
@@ -33,7 +33,7 @@ public class PropertiesWrapperTest
         throws Exception
     {
         PropertiesWrapper propertiesWrapper = new PropertiesWrapper( new HashMap<String, String>() );
-        List<String> items = new ArrayList<String>();
+        List<String> items = new ArrayList<>();
         items.add( "String1" );
         items.add( "String2,String3" );
         items.add( "String4" );
@@ -54,7 +54,7 @@ public class PropertiesWrapperTest
 
     private static final String SECOND_ELEMENT = "foo1";
 
-    private final Map<String, String> properties = new HashMap<String, String>();
+    private final Map<String, String> properties = new HashMap<>();
 
     private final PropertiesWrapper mapper = new PropertiesWrapper( properties );
 
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 f130ee4..478b3c0 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
@@ -30,7 +30,7 @@ public abstract class JoinGroupMatcher
     implements GroupMatcher
 {
 
-    Set<GroupMatcher> matchers = new HashSet<GroupMatcher>();
+    Set<GroupMatcher> matchers = new HashSet<>();
 
     public final boolean addMatcher( GroupMatcher matcher )
     {
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
index 14b19c7..3531c7c 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
@@ -84,7 +84,7 @@ public abstract class AbstractFailFastIT
 
     static Map<String, String> props( int forkCount, int skipAfterFailureCount, boolean reuseForks )
     {
-        Map<String, String> props = new HashMap<String, String>( 3 );
+        Map<String, String> props = new HashMap<>( 3 );
         props.put( "surefire.skipAfterFailureCount", "" + skipAfterFailureCount );
         props.put( "forkCount", "" + forkCount );
         props.put( "reuseForks", "" + reuseForks );
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
index 9bbb4b3..6965b4d 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
@@ -174,7 +174,7 @@ public class ForkModeIT
 
     private void assertDifferentPids( String[] pids, int numOfDifferentPids )
     {
-        Set<String> pidSet = new HashSet<String>( Arrays.asList( pids ) );
+        Set<String> pidSet = new HashSet<>( Arrays.asList( pids ) );
         assertEquals( "number of different pids is not as expected", numOfDifferentPids, pidSet.size() );
     }
 
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
index 22588cc..6a8d9df 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
@@ -117,7 +117,7 @@ public class ForkModeMultiModuleIT
 
     private void assertDifferentPids( List<String> pids, int numOfDifferentPids )
     {
-        Set<String> pidSet = new HashSet<String>( pids );
+        Set<String> pidSet = new HashSet<>( pids );
         assertEquals( "number of different pids is not as expected", numOfDifferentPids, pidSet.size() );
     }
 
@@ -131,7 +131,7 @@ public class ForkModeMultiModuleIT
         forkMode.addGoal( "-T2" );
         forkMode.sysProp( "testProperty", "testValue_${surefire.threadNumber}_${surefire.forkNumber}" );
         final OutputValidator outputValidator = forkMode.setForkJvm().executeTest();
-        List<String> pids = new ArrayList<String>( 6 );
+        List<String> pids = new ArrayList<>( 6 );
         pids.addAll( validateModule( outputValidator, "module-a" ) );
         pids.addAll( validateModule( outputValidator, "module-b" ) );
 
@@ -142,7 +142,7 @@ public class ForkModeMultiModuleIT
     {
         HelperAssertions.assertTestSuiteResults( 3, 0, 0, 0, new File( outputValidator.getBaseDir(), module ) );
 
-        List<String> pids = new ArrayList<String>( 3 );
+        List<String> pids = new ArrayList<>( 3 );
         for ( int i = 1; i <= 3; i++ )
         {
             final TestFile targetFile = outputValidator.getTargetFile( module, "test" + i + "-pid" );
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java
index 447d8f1..917ef93 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java
@@ -86,7 +86,7 @@ public class TestMethodPatternIT
     @Test
     public void testTestNgMethodBefore()
     {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put( "testNgVersion", "5.7" );
         props.put( "testNgClassifier", "jdk15" );
         runMethodPattern( "testng-method-pattern-before", props );
@@ -95,7 +95,7 @@ public class TestMethodPatternIT
     @Test
     public void testTestNGMethodPattern()
     {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put( "testNgVersion", "5.7" );
         props.put( "testNgClassifier", "jdk15" );
         runMethodPattern( "/testng-method-pattern", props );
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
index 53eddce..24dd8f4 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
@@ -99,7 +99,7 @@ public class TestSingleMethodIT
     public void testTestNg()
         throws Exception
     {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put( "testNgVersion", "5.7" );
         props.put( "testNgClassifier", "jdk15" );
         singleMethod( "testng-single-method", props, null );
@@ -132,7 +132,7 @@ public class TestSingleMethodIT
     public void fullyQualifiedTestNg()
             throws Exception
     {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put( "testNgVersion", "5.7" );
         props.put( "testNgClassifier", "jdk15" );
         singleMethod( "testng-single-method", props, "testng.BasicTest#testSuccessOne" );
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
index c218769..61b5517 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
@@ -81,7 +81,7 @@ public class TwoTestCasesIT
 
     private Set<String> extractClassNames( List<ReportTestSuite> reports )
     {
-        HashSet<String> classNames = new HashSet<String>();
+        HashSet<String> classNames = new HashSet<>();
         for ( ReportTestSuite suite : reports )
         {
             classNames.add( suite.getFullClassName() );
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
index 5bea87e..b8e63f2 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
@@ -126,7 +126,7 @@ public class HelperAssertions
 
     public static List<ReportTestSuite> extractReports( File... testDirs )
     {
-        List<File> reportsDirs = new ArrayList<File>();
+        List<File> reportsDirs = new ArrayList<>();
         for ( File testDir : testDirs )
         {
             File reportsDir = new File( testDir, "target/surefire-reports" );
@@ -147,7 +147,7 @@ public class HelperAssertions
 
     private static List<ReportTestSuite> extractITReports( File... testDirs )
     {
-        List<File> reportsDirs = new ArrayList<File>();
+        List<File> reportsDirs = new ArrayList<>();
         for ( File testDir : testDirs )
         {
             File reportsDir = new File( testDir, "target/failsafe-reports" );
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
index 56046f1..5f61fc4 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
@@ -107,7 +107,7 @@ public class OutputValidator
     public List<String> loadLogLines( Matcher<String> line )
             throws VerificationException
     {
-        List<String> matchedLines = new ArrayList<String>();
+        List<String> matchedLines = new ArrayList<>();
         for ( String log : loadLogLines() )
         {
             if ( line.matches( log ) )
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index 0e40622..bb19ea9 100755
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -138,7 +138,7 @@ public final class SurefireLauncher
 
     private List<String> getInitialGoals()
     {
-        List<String> goals = new ArrayList<String>();
+        List<String> goals = new ArrayList<>();
 
         goals.add( "-Dsurefire.version=" + surefireVersion );
 
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
index 2209061..34dd5ae 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
@@ -55,7 +55,7 @@ public class Surefire1082ParallelJUnitParameterizedIT
 
     private static Set<String> printOnlyTestLines( Collection<String> logs )
     {
-        Set<String> log = new TreeSet<String>();
+        Set<String> log = new TreeSet<>();
         for ( String line : logs )
         {
             if ( line.startsWith( "class jiras.surefire1082." ) )
@@ -70,13 +70,13 @@ public class Surefire1082ParallelJUnitParameterizedIT
     {
         assertThat( log.size(), is( 4 ) );
 
-        Set<String> expectedLogs1 = new TreeSet<String>();
+        Set<String> expectedLogs1 = new TreeSet<>();
         expectedLogs1.add( "class jiras.surefire1082.Jira1082Test a 0 pool-[\\d]+-thread-1" );
         expectedLogs1.add( "class jiras.surefire1082.Jira1082Test b 0 pool-[\\d]+-thread-1" );
         expectedLogs1.add( "class jiras.surefire1082.Jira1082Test a 1 pool-[\\d]+-thread-2" );
         expectedLogs1.add( "class jiras.surefire1082.Jira1082Test b 1 pool-[\\d]+-thread-2" );
 
-        Set<String> expectedLogs2 = new TreeSet<String>();
+        Set<String> expectedLogs2 = new TreeSet<>();
         expectedLogs2.add( "class jiras.surefire1082.Jira1082Test a 1 pool-[\\d]+-thread-1" );
         expectedLogs2.add( "class jiras.surefire1082.Jira1082Test b 1 pool-[\\d]+-thread-1" );
         expectedLogs2.add( "class jiras.surefire1082.Jira1082Test a 0 pool-[\\d]+-thread-2" );
@@ -100,7 +100,7 @@ public class Surefire1082ParallelJUnitParameterizedIT
 
         validator.assertThatLogLine( containsString( "Running jiras.surefire1082.Jira1082Test" ), is( 1 ) );
 
-        Set<String> log = new TreeSet<String>( validator.loadLogLines( startsWith( "class jiras.surefire1082." ) ) );
+        Set<String> log = new TreeSet<>( validator.loadLogLines( startsWith( "class jiras.surefire1082." ) ) );
         assertParallelRun( log );
     }
 
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
index e81f066..9a1fd11 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
@@ -94,7 +94,7 @@ public class Surefire1098BalancedRunOrderIT
     private static List<String> printOnlyTestLines( OutputValidator validator )
         throws VerificationException
     {
-        List<String> log = new ArrayList<String>( validator.loadLogLines() );
+        List<String> log = new ArrayList<>( validator.loadLogLines() );
         for ( Iterator<String> it = log.iterator(); it.hasNext(); ) {
             String line = it.next();
             if ( !line.startsWith( "class jiras.surefire1098." ) ) {
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
index c5dbc84..1eab676 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
@@ -56,7 +56,7 @@ public class Surefire747MethodParallelWithSuiteCountIT
     private static Set<String> printTestLines( OutputValidator validator, String pattern )
             throws VerificationException
     {
-        Set<String> log = new TreeSet<String>( validator.loadLogLines() );
+        Set<String> log = new TreeSet<>( validator.loadLogLines() );
         for ( Iterator<String> it = log.iterator(); it.hasNext(); )
         {
             String line = it.next();
diff --git a/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BaseTest.java b/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BaseTest.java
index bff4077..8764ca5 100644
--- a/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BaseTest.java
+++ b/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BaseTest.java
@@ -28,7 +28,7 @@ public abstract class BaseTest
     @Parameters( name = "{0}" )
     public static Collection< String > parameterList() throws Exception
     {
-        Collection< String > c = new ConcurrentLinkedQueue< String >();
+        Collection< String > c = new ConcurrentLinkedQueue<>();
         c.add( "p0" );
         c.add( "p1" );
 
diff --git a/surefire-its/src/test/resources/surefire-946-self-destruct-plugin/src/main/java/org/apache/maven/plugins/surefire/selfdestruct/SelfDestructMojo.java b/surefire-its/src/test/resources/surefire-946-self-destruct-plugin/src/main/java/org/apache/maven/plugins/surefire/selfdestruct/SelfDestructMojo.java
index d5f791f..61016de 100644
--- a/surefire-its/src/test/resources/surefire-946-self-destruct-plugin/src/main/java/org/apache/maven/plugins/surefire/selfdestruct/SelfDestructMojo.java
+++ b/surefire-its/src/test/resources/surefire-946-self-destruct-plugin/src/main/java/org/apache/maven/plugins/surefire/selfdestruct/SelfDestructMojo.java
@@ -109,7 +109,7 @@ public class SelfDestructMojo
                     String pid = name.substring( 0, indexOfAt );
                     getLog().warn( "Going to kill process with PID " + pid );
 
-                    List<String> args = new ArrayList<String>();
+                    List<String> args = new ArrayList<>();
                     if ( System.getProperty( "os.name" ).startsWith( "Windows" ) )
                     {
                         args.add( "taskkill" );
diff --git a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
index 7c68f95..6ebb2d4 100644
--- a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
+++ b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
@@ -201,7 +201,7 @@ public class SmartStackTraceParser
 
     static List<StackTraceElement> focusOnClass( StackTraceElement[] stackTrace, Class clazz )
     {
-        List<StackTraceElement> result = new ArrayList<StackTraceElement>();
+        List<StackTraceElement> result = new ArrayList<>();
         for ( StackTraceElement element : stackTrace )
         {
             if ( element != null && isInSupers( clazz, element.getClassName() ) )
@@ -252,7 +252,7 @@ public class SmartStackTraceParser
 
     static List<StackTraceElement> focusInsideClass( StackTraceElement[] stackTrace, StackTraceFilter filter )
     {
-        List<StackTraceElement> result = new ArrayList<StackTraceElement>();
+        List<StackTraceElement> result = new ArrayList<>();
         for ( StackTraceElement element : stackTrace )
         {
             if ( filter.matches( element ) )
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 ef007b2..521c873 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
@@ -39,7 +39,7 @@ class RunnableTestClass1
         throws ExecutionException
     {
         RunnableTestClass2 rt2 = new RunnableTestClass2();
-        FutureTask<Object> futureTask = new FutureTask<Object>( rt2 );
+        FutureTask<Object> futureTask = new FutureTask<>( rt2 );
         DaemonThreadFactory.newDaemonThread( futureTask ).start();
         try
         {
diff --git a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
index e600718..d450219 100644
--- a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
+++ b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
@@ -305,7 +305,7 @@ public class SmartStackTraceParserTest
 
     public ExecutionException getSingleNested()
     {
-        FutureTask<Object> futureTask = new FutureTask<Object>( new RunnableTestClass2() );
+        FutureTask<Object> futureTask = new FutureTask<>( new RunnableTestClass2() );
         DaemonThreadFactory.newDaemonThread( futureTask ).start();
         try
         {
@@ -325,7 +325,7 @@ public class SmartStackTraceParserTest
 
     private ExecutionException getDoubleNestedException()
     {
-        FutureTask<Object> futureTask = new FutureTask<Object>( new RunnableTestClass1() );
+        FutureTask<Object> futureTask = new FutureTask<>( new RunnableTestClass1() );
         DaemonThreadFactory.newDaemonThread( futureTask ).start();
         try
         {
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4ProviderUtil.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4ProviderUtil.java
index 6b94a64..d19a0e1 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4ProviderUtil.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4ProviderUtil.java
@@ -52,7 +52,7 @@ public final class JUnit4ProviderUtil
      */
     public static Set<Description> generateFailingTestDescriptions( List<Failure> allFailures )
     {
-        Set<Description> failingTestDescriptions = new HashSet<Description>();
+        Set<Description> failingTestDescriptions = new HashSet<>();
 
         for ( Failure failure : allFailures )
         {
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 7eec856..7ed2ad9 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
@@ -50,7 +50,7 @@ public class JUnit4RunListener
      * This is necessary because JUnit4 always fires a {@link org.junit.runner.notification.RunListener#testRunFinished}
      * event-- even if there was a failure.
      */
-    private final ThreadLocal<Boolean> failureFlag = new InheritableThreadLocal<Boolean>();
+    private final ThreadLocal<Boolean> failureFlag = new InheritableThreadLocal<>();
 
     /**
      * Constructor.
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java
index 21d0cc9..d98895e 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java
@@ -35,7 +35,7 @@ public class JUnit4RunListenerFactory
 {
     public static List<RunListener> createCustomListeners( String listeners )
     {
-        List<RunListener> result = new ArrayList<RunListener>();
+        List<RunListener> result = new ArrayList<>();
         if ( isNotBlank( listeners ) )
         {
             ClassLoader cl = Thread.currentThread().getContextClassLoader();
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnitTestFailureListener.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnitTestFailureListener.java
index 2585f50..203a888 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnitTestFailureListener.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnitTestFailureListener.java
@@ -33,7 +33,7 @@ import java.util.List;
 public class JUnitTestFailureListener
     extends RunListener
 {
-    private final List<Failure> allFailures = new ArrayList<Failure>();
+    private final List<Failure> allFailures = new ArrayList<>();
 
     @Override
     public void testFailure( Failure failure )
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/MatchDescriptions.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/MatchDescriptions.java
index 3275f7f..22fdd25 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/MatchDescriptions.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/MatchDescriptions.java
@@ -33,7 +33,7 @@ import java.util.List;
 public final class MatchDescriptions
     extends Filter
 {
-    private final List<Filter> filters = new ArrayList<Filter>();
+    private final List<Filter> filters = new ArrayList<>();
 
     public MatchDescriptions( Iterable<Description> descriptions )
     {
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
index dfa3948..c2c6df8 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
@@ -46,9 +46,9 @@ import static org.apache.maven.surefire.util.internal.ConcurrencyUtils.countDown
 public class Notifier
     extends RunNotifier
 {
-    private final Collection<RunListener> listeners = new ArrayList<RunListener>();
+    private final Collection<RunListener> listeners = new ArrayList<>();
 
-    private final Queue<String> testClassNames = new ConcurrentLinkedQueue<String>();
+    private final Queue<String> testClassNames = new ConcurrentLinkedQueue<>();
 
     private final AtomicInteger skipAfterFailureCount;
 
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 7561da7..18f0592 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
@@ -32,7 +32,7 @@ import org.apache.maven.surefire.report.TestSetReportEntry;
 public class MockReporter
     implements RunListener
 {
-    private final List<String> events = new ArrayList<String>();
+    private final List<String> events = new ArrayList<>();
 
     public static final String SET_STARTED = "SET_STARTED";
 
diff --git a/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4ProviderUtilTest.java b/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4ProviderUtilTest.java
index 7a2e6da..163308c 100644
--- a/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4ProviderUtilTest.java
+++ b/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4ProviderUtilTest.java
@@ -37,7 +37,7 @@ public class JUnit4ProviderUtilTest
 {
     public void testGenerateFailingTestDescriptions()
     {
-        List<Failure> failures = new ArrayList<Failure>();
+        List<Failure> failures = new ArrayList<>();
 
         Description test1Description = Description.createTestDescription( T1.class, "testOne" );
         Description test2Description = Description.createTestDescription( T1.class, "testTwo" );
diff --git a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/MethodFilter.java b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/MethodFilter.java
index a275634..1cc3b62 100644
--- a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/MethodFilter.java
+++ b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/MethodFilter.java
@@ -39,8 +39,8 @@ final class MethodFilter
 
     MethodFilter( TestListResolver testResolver )
     {
-        Collection<Filter> includedFilters = new LinkedHashSet<Filter>();
-        Collection<Filter> excludedFilters = new LinkedHashSet<Filter>();
+        Collection<Filter> includedFilters = new LinkedHashSet<>();
+        Collection<Filter> excludedFilters = new LinkedHashSet<>();
         for ( ResolvedTest test : testResolver.getIncludedPatterns() )
         {
             includedFilters.add( new RequestedTest( test, true ) );
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
index 52aec92..9ac3e33 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
@@ -86,7 +86,7 @@ public final class JUnitCoreParameters
 
     private static Collection<String> lowerCase( String... elements )
     {
-        ArrayList<String> lowerCase = new ArrayList<String>();
+        ArrayList<String> lowerCase = new ArrayList<>();
         for ( String element : elements )
         {
             lowerCase.add( element.toLowerCase() );
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 3c23611..7c74e8b 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
@@ -250,7 +250,7 @@ public class JUnitCoreProvider
         }
         else
         {
-            final Map<String, TestSet> testSetMap = new ConcurrentHashMap<String, TestSet>();
+            final Map<String, TestSet> testSetMap = new ConcurrentHashMap<>();
 
             ConcurrentRunListener listener = createInstance( testSetMap, reporterFactory, isParallelTypes(),
                                                              isParallelMethodsAndTypes(), consoleStream );
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java
index 1089585..068674f 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java
@@ -30,7 +30,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
  */
 public final class LogicalStream
 {
-    private final Queue<Entry> output = new ConcurrentLinkedQueue<Entry>();
+    private final Queue<Entry> output = new ConcurrentLinkedQueue<>();
 
     private static final class Entry
     {
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 1a7dd12..ae89fbf 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
@@ -36,9 +36,9 @@ import java.util.concurrent.atomic.AtomicReference;
 class TestMethod
     implements ConsoleOutputReceiver
 {
-    private static final InheritableThreadLocal<TestMethod> TEST_METHOD = new InheritableThreadLocal<TestMethod>();
+    private static final InheritableThreadLocal<TestMethod> TEST_METHOD = new InheritableThreadLocal<>();
 
-    private final AtomicReference<LogicalStream> output = new AtomicReference<LogicalStream>();
+    private final AtomicReference<LogicalStream> output = new AtomicReference<>();
 
     private final ReportEntry description;
 
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
index 184d32e..e710cda 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
@@ -38,11 +38,11 @@ import static org.apache.maven.surefire.util.internal.ObjectUtils.systemProps;
  */
 public class TestSet
 {
-    private static final InheritableThreadLocal<TestSet> TEST_SET = new InheritableThreadLocal<TestSet>();
+    private static final InheritableThreadLocal<TestSet> TEST_SET = new InheritableThreadLocal<>();
 
     private final String testClassName;
 
-    private final Collection<TestMethod> testMethods = new ConcurrentLinkedQueue<TestMethod>();
+    private final Collection<TestMethod> testMethods = new ConcurrentLinkedQueue<>();
 
     private final AtomicBoolean played = new AtomicBoolean();
 
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 0001b08..2301e50 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
@@ -35,7 +35,7 @@ final class InvokerStrategy
     extends SchedulingStrategy
 {
 
-    private final Queue<Thread> activeThreads = new ConcurrentLinkedQueue<Thread>();
+    private final Queue<Thread> activeThreads = new ConcurrentLinkedQueue<>();
 
     protected InvokerStrategy( ConsoleStream logger )
     {
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 2e4104c..aa18e0e 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
@@ -115,8 +115,8 @@ public abstract class ParallelComputer
 
             try
             {
-                final TreeSet<String> executedTests = new TreeSet<String>();
-                final TreeSet<String> incompleteTests = new TreeSet<String>();
+                final TreeSet<String> executedTests = new TreeSet<>();
+                final TreeSet<String> incompleteTests = new TreeSet<>();
 
                 if ( isShutdownTimeout )
                 {
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
index 4153084..806e312 100755
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
@@ -87,11 +87,11 @@ public final class ParallelComputerBuilder
 
     private static final Class<? extends Annotation> JCIP_NOT_THREAD_SAFE = loadNotThreadSafeAnnotations();
 
-    private static final Set<?> NULL_SINGLETON = Collections.singleton( null );
+    private static final Set<Runner> NULL_SINGLETON = Collections.singleton( null );
 
     static final int TOTAL_POOL_SIZE_UNDEFINED = 0;
 
-    private final Map<Type, Integer> parallelGroups = new EnumMap<Type, Integer>( Type.class );
+    private final Map<Type, Integer> parallelGroups = new EnumMap<>( Type.class );
 
     private final ConsoleStream logger;
 
@@ -255,15 +255,15 @@ public final class ParallelComputerBuilder
         private final SingleThreadScheduler notThreadSafeTests =
             new SingleThreadScheduler( ParallelComputerBuilder.this.logger );
 
-        private final Collection<ParentRunner> suites = new LinkedHashSet<ParentRunner>();
+        private final Collection<ParentRunner> suites = new LinkedHashSet<>();
 
-        private final Collection<ParentRunner> nestedSuites = new LinkedHashSet<ParentRunner>();
+        private final Collection<ParentRunner> nestedSuites = new LinkedHashSet<>();
 
-        private final Collection<ParentRunner> classes = new LinkedHashSet<ParentRunner>();
+        private final Collection<ParentRunner> classes = new LinkedHashSet<>();
 
-        private final Collection<ParentRunner> nestedClasses = new LinkedHashSet<ParentRunner>();
+        private final Collection<ParentRunner> nestedClasses = new LinkedHashSet<>();
 
-        private final Collection<Runner> notParallelRunners = new LinkedHashSet<Runner>();
+        private final Collection<Runner> notParallelRunners = new LinkedHashSet<>();
 
         private int poolCapacity;
 
@@ -278,7 +278,7 @@ public final class ParallelComputerBuilder
         private PC()
         {
             super( parallelTestsTimeoutInSeconds(), parallelTestsTimeoutForcedInSeconds() );
-            allGroups = new EnumMap<Type, Integer>( ParallelComputerBuilder.this.parallelGroups );
+            allGroups = new EnumMap<>( ParallelComputerBuilder.this.parallelGroups );
             poolCapacity = ParallelComputerBuilder.this.totalPoolSize;
             splitPool = ParallelComputerBuilder.this.useSeparatePools;
         }
@@ -419,7 +419,7 @@ public final class ParallelComputerBuilder
         {
             // Do NOT use allGroups here.
             long childrenCounter = 0;
-            ArrayList<Runner> runs = new ArrayList<Runner>();
+            ArrayList<Runner> runs = new ArrayList<>();
             for ( T runner : runners )
             {
                 if ( runner != null )
@@ -549,7 +549,7 @@ public final class ParallelComputerBuilder
             }
 
             // schedulers for parallel classes
-            ArrayList<ParentRunner> allSuites = new ArrayList<ParentRunner>( suites );
+            ArrayList<ParentRunner> allSuites = new ArrayList<>( suites );
             allSuites.addAll( nestedSuites );
             if ( suiteClasses != null )
             {
@@ -561,7 +561,7 @@ public final class ParallelComputerBuilder
             }
 
             // schedulers for parallel methods
-            ArrayList<ParentRunner> allClasses = new ArrayList<ParentRunner>( classes );
+            ArrayList<ParentRunner> allClasses = new ArrayList<>( classes );
             allClasses.addAll( nestedClasses );
             if ( !allClasses.isEmpty() )
             {
@@ -722,7 +722,7 @@ public final class ParallelComputerBuilder
 
     private static List<Runner> removeNullRunners( Collection<Runner> runners )
     {
-        final List<Runner> onlyRunners = new ArrayList<Runner>( runners );
+        final List<Runner> onlyRunners = new ArrayList<>( runners );
         onlyRunners.removeAll( NULL_SINGLETON );
         return onlyRunners;
     }
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ShutdownStatus.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ShutdownStatus.java
index b1a519f..d805e93 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ShutdownStatus.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ShutdownStatus.java
@@ -33,7 +33,7 @@ import java.util.concurrent.atomic.AtomicReference;
 final class ShutdownStatus
 {
     private final AtomicReference<ExecutionStatus> status =
-        new AtomicReference<ExecutionStatus>( ExecutionStatus.STARTED );
+        new AtomicReference<>( ExecutionStatus.STARTED );
 
     private Future<ShutdownResult> descriptionsBeforeShutdown;
 
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java
index 8e61fa3..13ff8d7 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java
@@ -87,7 +87,7 @@ final class SingleThreadScheduler
 
     private Collection<Description> copyExisting( Collection<Description> descriptions )
     {
-        Collection<Description> activeChildren = new ConcurrentLinkedQueue<Description>( descriptions );
+        Collection<Description> activeChildren = new ConcurrentLinkedQueue<>( descriptions );
         ParallelComputerUtil.removeUnusedDescriptions( activeChildren );
         return activeChildren;
     }
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentRunListenerTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentRunListenerTest.java
index de18f55..a4f6e52 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentRunListenerTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentRunListenerTest.java
@@ -147,7 +147,7 @@ public class ConcurrentRunListenerTest
         throws TestSetFailedException
     {
         DefaultReporterFactory reporterFactory = createReporterFactory();
-        HashMap<String, TestSet> classMethodCounts = new HashMap<String, TestSet>();
+        HashMap<String, TestSet> classMethodCounts = new HashMap<>();
         final ConsoleStream defaultConsoleReporter = new DefaultDirectConsoleReporter( System.out );
         RunListener reporter =
             new ClassesParallelRunListener( classMethodCounts, reporterFactory, defaultConsoleReporter );
@@ -166,7 +166,7 @@ public class ConcurrentRunListenerTest
     private RunStatistics runClasses( Class<?>... classes )
         throws TestSetFailedException
     {
-        HashMap<String, TestSet> classMethodCounts = new HashMap<String, TestSet>();
+        HashMap<String, TestSet> classMethodCounts = new HashMap<>();
         final DefaultReporterFactory reporterManagerFactory = createReporterFactory();
         org.junit.runner.notification.RunListener demultiplexingRunListener =
             createRunListener( reporterManagerFactory, classMethodCounts );
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputerTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputerTest.java
index ac3ab35..ca50956 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputerTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputerTest.java
@@ -221,7 +221,7 @@ public class ConfigurableParallelComputerTest
 
     private Class<?>[] getClassList( Class<?> testClass, int numItems )
     {
-        List<Class> realClasses = new ArrayList<Class>();
+        List<Class<?>> realClasses = new ArrayList<>();
         for ( int i = 0; i < numItems; i++ )
         {
             realClasses.add( testClass );
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java
index 76bb7c3..3734afe 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java
@@ -127,13 +127,13 @@ public class JUnitCoreParametersTest
 
     private Map<String, String> newDefaultProperties()
     {
-        return new HashMap<String, String>();
+        return new HashMap<>();
     }
 
 
     private Map<String, String> newPropertiesClasses()
     {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put(JUnitCoreParameters.PARALLEL_KEY, "classes");
         props.put(JUnitCoreParameters.PERCORETHREADCOUNT_KEY, "false");
         props.put(JUnitCoreParameters.THREADCOUNT_KEY, "2");
@@ -143,7 +143,7 @@ public class JUnitCoreParametersTest
 
     private Map<String, String> newPropertiesMethods()
     {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put(JUnitCoreParameters.PARALLEL_KEY, "methods");
         props.put(JUnitCoreParameters.PERCORETHREADCOUNT_KEY, "false");
         props.put(JUnitCoreParameters.THREADCOUNT_KEY, "2");
@@ -153,7 +153,7 @@ public class JUnitCoreParametersTest
 
     private Map<String, String> newPropertiesBoth()
     {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put(JUnitCoreParameters.PARALLEL_KEY, "both");
         props.put(JUnitCoreParameters.PERCORETHREADCOUNT_KEY, "true");
         props.put(JUnitCoreParameters.THREADCOUNT_KEY, "7");
@@ -163,7 +163,7 @@ public class JUnitCoreParametersTest
 
     private Map<String, String> newPropertiesTimeouts( double timeout, double forcedTimeout )
     {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put(JUnitCoreParameters.PARALLEL_TIMEOUT_KEY, Double.toString(timeout));
         props.put(JUnitCoreParameters.PARALLEL_TIMEOUTFORCED_KEY, Double.toString(forcedTimeout));
         return props;
@@ -171,7 +171,7 @@ public class JUnitCoreParametersTest
 
     private Map<String, String> newPropertiesOptimization( boolean optimize )
     {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put( JUnitCoreParameters.PARALLEL_OPTIMIZE_KEY, Boolean.toString( optimize ) );
         return props;
     }
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java
index c5b6c89..b467f63 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java
@@ -78,7 +78,7 @@ public class JUnitCoreRunListenerTest
   //      st2.addChild( Description.createSuiteDescription( STest2.class ) );
         testDescription.addChild( st2 );
 
-        Map<String, TestSet> classMethodCounts = new HashMap<String, TestSet>();
+        Map<String, TestSet> classMethodCounts = new HashMap<>();
         JUnitCoreRunListener listener = new JUnitCoreRunListener( new MockReporter(), classMethodCounts );
         listener.testRunStarted( testDescription );
         assertEquals( 2, classMethodCounts.size() );
@@ -98,7 +98,7 @@ public class JUnitCoreRunListenerTest
         assertNull( testDescription.getTestClass() );
         Description suiteDescription = Description.createSuiteDescription( "testSuite" );
         suiteDescription.addChild( testDescription );
-        Map<String, TestSet> classMethodCounts = new HashMap<String, TestSet>();
+        Map<String, TestSet> classMethodCounts = new HashMap<>();
         JUnitCoreRunListener listener = new JUnitCoreRunListener( new MockReporter(), classMethodCounts );
         listener.testRunStarted( suiteDescription );
         assertEquals( 1, classMethodCounts.size() );
@@ -114,7 +114,7 @@ public class JUnitCoreRunListenerTest
         suite.addChild( Description.createSuiteDescription( "testMethodB(some.junit.Test)" ) );
         suite.addChild( Description.createSuiteDescription( "testMethod(another.junit.Test)" ) );
         aggregator.addChild( suite );
-        Map<String, TestSet> classMethodCounts = new HashMap<String, TestSet>();
+        Map<String, TestSet> classMethodCounts = new HashMap<>();
         JUnitCoreRunListener listener = new JUnitCoreRunListener( new MockReporter(), classMethodCounts );
         listener.testRunStarted( aggregator );
         assertThat( classMethodCounts.keySet(), hasSize( 2 ) );
@@ -133,7 +133,7 @@ public class JUnitCoreRunListenerTest
         Description aggregator = Description.createSuiteDescription( "null" );
         Description suite = Description.createSuiteDescription( "some.junit.TestSuite" );
         aggregator.addChild( suite );
-        Map<String, TestSet> classMethodCounts = new HashMap<String, TestSet>();
+        Map<String, TestSet> classMethodCounts = new HashMap<>();
         JUnitCoreRunListener listener = new JUnitCoreRunListener( new MockReporter(), classMethodCounts );
         listener.testRunStarted( aggregator );
         assertThat( classMethodCounts.keySet(), hasSize( 1 ) );
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreTester.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreTester.java
index 0bd2e6f..915b64a 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreTester.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreTester.java
@@ -62,7 +62,7 @@ public class JUnitCoreTester
 
         try
         {
-            final HashMap<String, TestSet> classMethodCounts = new HashMap<String, TestSet>();
+            final HashMap<String, TestSet> classMethodCounts = new HashMap<>();
             RunListener reporter = createInstance( classMethodCounts, reporterManagerFactory, parallelClasses, false,
                                                          new DefaultDirectConsoleReporter( System.out ) );
             startCapture( (ConsoleOutputReceiver) reporter );
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
index 6fba6ab..aded93f 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
@@ -90,12 +90,12 @@ public class Surefire746Test
         BaseProviderFactory providerParameters = new BaseProviderFactory( reporterFactory, true );
 
         providerParameters.setReporterConfiguration( new ReporterConfiguration( new File( "" ), false ) );
-        Map<String, String> junitProps = new HashMap<String, String>();
+        Map<String, String> junitProps = new HashMap<>();
         junitProps.put( ProviderParameterNames.PARALLEL_PROP, "none" );
 
         JUnitCoreParameters jUnitCoreParameters = new JUnitCoreParameters( junitProps );
 
-        final Map<String, TestSet> testSetMap = new ConcurrentHashMap<String, TestSet>();
+        final Map<String, TestSet> testSetMap = new ConcurrentHashMap<>();
 
         RunListener listener =
             ConcurrentRunListener.createInstance( testSetMap, reporterFactory, false, false,
@@ -106,7 +106,7 @@ public class Surefire746Test
         org.junit.runner.notification.RunListener jUnit4RunListener = new JUnitCoreRunListener( listener, testSetMap );
 
         List<org.junit.runner.notification.RunListener> customRunListeners =
-            new ArrayList<org.junit.runner.notification.RunListener>();
+            new ArrayList<>();
         customRunListeners.add( 0, jUnit4RunListener );
 
         try
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/OptimizedParallelComputerTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/OptimizedParallelComputerTest.java
index cb092a6..9be816f 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/OptimizedParallelComputerTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/OptimizedParallelComputerTest.java
@@ -75,7 +75,7 @@ public final class OptimizedParallelComputerTest
         throws TestSetFailedException
     {
         overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suites");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -95,7 +95,7 @@ public final class OptimizedParallelComputerTest
         throws TestSetFailedException
     {
         overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "classes");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -115,7 +115,7 @@ public final class OptimizedParallelComputerTest
         throws TestSetFailedException
     {
         overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "methods");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -135,7 +135,7 @@ public final class OptimizedParallelComputerTest
         throws TestSetFailedException
     {
         overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "both");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -155,7 +155,7 @@ public final class OptimizedParallelComputerTest
         throws TestSetFailedException
     {
         overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "classesAndMethods");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -175,7 +175,7 @@ public final class OptimizedParallelComputerTest
         throws TestSetFailedException
     {
         overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suitesAndMethods");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -195,7 +195,7 @@ public final class OptimizedParallelComputerTest
         throws TestSetFailedException
     {
         overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suitesAndClasses");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -215,7 +215,7 @@ public final class OptimizedParallelComputerTest
         throws TestSetFailedException
     {
         overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "all");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -236,7 +236,7 @@ public final class OptimizedParallelComputerTest
     {
         // 4 * cpu to 5 * cpu threads to run test classes
         overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suitesAndClasses");
         properties.put(THREADCOUNT_KEY, "6");
         properties.put(THREADCOUNTSUITES_KEY, "2");
@@ -258,7 +258,7 @@ public final class OptimizedParallelComputerTest
     {
         // 4 * cpu to 5 * cpu threads to run test methods
         overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suitesAndMethods");
         properties.put(THREADCOUNT_KEY, "6");
         properties.put(THREADCOUNTSUITES_KEY, "2");
@@ -280,7 +280,7 @@ public final class OptimizedParallelComputerTest
     {
         // 4 * cpu to 5 * cpu threads to run test methods
         overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "classesAndMethods");
         properties.put(THREADCOUNT_KEY, "6");
         properties.put(THREADCOUNTCLASSES_KEY, "2");
@@ -302,7 +302,7 @@ public final class OptimizedParallelComputerTest
     {
         // 8 * cpu to 13 * cpu threads to run test methods
         overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put( PARALLEL_KEY, "all" );
         properties.put( THREADCOUNT_KEY, "14" );
         properties.put( THREADCOUNTSUITES_KEY, "2" );
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
index 814456d..d87d63a 100755
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
@@ -451,7 +451,7 @@ public class ParallelComputerBuilderTest
         Class<?>[] classes = { NothingDoingTest1.class, NothingDoingTest2.class, NothingDoingTest3.class };
         Result result = core.run( builder.buildComputer(), classes );
         assertTrue( result.wasSuccessful() );
-        ArrayList<String> methods = new ArrayList<String>( NothingDoingTest1.methods );
+        ArrayList<String> methods = new ArrayList<>( NothingDoingTest1.methods );
         assertThat( methods.size(), is( 12 ) );
         assertThat( methods.subList( 9, 12 ), is( not( Arrays.asList( "deinit", "deinit", "deinit" ) ) ) );
     }
@@ -595,7 +595,7 @@ public class ParallelComputerBuilderTest
     {
         Thread[] t = new Thread[1000];
         Thread.enumerate( t );
-        ArrayList<Thread> appThreads = new ArrayList<Thread>( t.length );
+        ArrayList<Thread> appThreads = new ArrayList<>( t.length );
         Collections.addAll( appThreads, t );
         appThreads.removeAll( Collections.singleton( (Thread) null ) );
         Collections.sort( appThreads, new Comparator<Thread>()
@@ -680,7 +680,7 @@ public class ParallelComputerBuilderTest
 
     public static class NothingDoingTest1
     {
-        static final Collection<String> methods = new ConcurrentLinkedQueue<String>();
+        static final Collection<String> methods = new ConcurrentLinkedQueue<>();
 
         @BeforeClass
         public static void init()
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
index d753705..b9f862c 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
@@ -98,7 +98,7 @@ public final class ParallelComputerUtilTest
     public void unknownParallel()
         throws TestSetFailedException
     {
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         exception.expect( TestSetFailedException.class );
         resolveConcurrency( new JUnitCoreParameters( properties ), null );
     }
@@ -204,7 +204,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suites");
         properties.put(USEUNLIMITEDTHREADS_KEY, "true");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -234,7 +234,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "classes");
         properties.put(USEUNLIMITEDTHREADS_KEY, "true");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -264,7 +264,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "methods");
         properties.put(USEUNLIMITEDTHREADS_KEY, "true");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -294,7 +294,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suitesAndClasses");
         properties.put(USEUNLIMITEDTHREADS_KEY, "true");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -325,7 +325,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suitesAndMethods");
         properties.put(USEUNLIMITEDTHREADS_KEY, "true");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -356,7 +356,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "classesAndMethods");
         properties.put(USEUNLIMITEDTHREADS_KEY, "true");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -387,7 +387,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "all");
         properties.put(USEUNLIMITEDTHREADS_KEY, "true");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -419,7 +419,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suites");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -438,7 +438,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "classes");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -457,7 +457,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "methods");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -476,7 +476,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "both");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -495,7 +495,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "classesAndMethods");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -514,7 +514,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suitesAndMethods");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -533,7 +533,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suitesAndClasses");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -552,7 +552,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "all");
         properties.put(THREADCOUNT_KEY, "3");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -571,7 +571,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suitesAndClasses");
         properties.put(THREADCOUNT_KEY, "3");
         // % percentage ratio
@@ -594,7 +594,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suitesAndMethods");
         properties.put(THREADCOUNT_KEY, "3");
         // % percentage ratio
@@ -617,7 +617,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "classesAndMethods");
         properties.put(THREADCOUNT_KEY, "3");
         // % percentage ratio
@@ -640,7 +640,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "all");
         properties.put(THREADCOUNT_KEY, "3");
         // % percentage ratio
@@ -666,7 +666,7 @@ public final class ParallelComputerUtilTest
     {
         // 4 * cpu to 5 * cpu threads to run test classes
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suitesAndClasses");
         properties.put(THREADCOUNT_KEY, "6");
         properties.put(THREADCOUNTSUITES_KEY, "2");
@@ -687,7 +687,7 @@ public final class ParallelComputerUtilTest
     {
         // 4 * cpu to 5 * cpu threads to run test methods
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suitesAndMethods");
         properties.put(THREADCOUNT_KEY, "6");
         properties.put(THREADCOUNTSUITES_KEY, "2");
@@ -708,7 +708,7 @@ public final class ParallelComputerUtilTest
     {
         // 4 * cpu to 5 * cpu threads to run test methods
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "classesAndMethods");
         properties.put(THREADCOUNT_KEY, "6");
         properties.put(THREADCOUNTCLASSES_KEY, "2");
@@ -729,7 +729,7 @@ public final class ParallelComputerUtilTest
     {
         // 8 * cpu to 13 * cpu threads to run test methods
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "all");
         properties.put(THREADCOUNT_KEY, "14");
         properties.put(THREADCOUNTSUITES_KEY, "2");
@@ -750,7 +750,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suites");
         properties.put(THREADCOUNTSUITES_KEY, "5");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -769,7 +769,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "classes");
         properties.put(THREADCOUNTCLASSES_KEY, "5");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -788,7 +788,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "methods");
         properties.put(THREADCOUNTMETHODS_KEY, "5");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -807,7 +807,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
 
         properties.put(PARALLEL_KEY, "suitesAndClasses");
         properties.put(THREADCOUNTSUITES_KEY, "5");
@@ -824,7 +824,7 @@ public final class ParallelComputerUtilTest
 
         // Warning: this case works but is not enabled in AbstractSurefireMojo
         // Instead use the 'useUnlimitedThreads' parameter.
-        properties = new HashMap<String, String>();
+        properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suitesAndClasses");
         properties.put(THREADCOUNTSUITES_KEY, "5");
         params = new JUnitCoreParameters( properties );
@@ -843,7 +843,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
 
         properties.put(PARALLEL_KEY, "suitesAndMethods");
         properties.put(THREADCOUNTSUITES_KEY, "5");
@@ -860,7 +860,7 @@ public final class ParallelComputerUtilTest
 
         // Warning: this case works but is not enabled in AbstractSurefireMojo
         // Instead use the 'useUnlimitedThreads' parameter.
-        properties = new HashMap<String, String>();
+        properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "suitesAndMethods");
         properties.put(THREADCOUNTSUITES_KEY, "5");
         params = new JUnitCoreParameters( properties );
@@ -879,7 +879,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
 
         properties.put(PARALLEL_KEY, "classesAndMethods");
         properties.put(THREADCOUNTCLASSES_KEY, "5");
@@ -896,7 +896,7 @@ public final class ParallelComputerUtilTest
 
         // Warning: this case works but is not enabled in AbstractSurefireMojo
         // Instead use the 'useUnlimitedThreads' parameter.
-        properties = new HashMap<String, String>();
+        properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "classesAndMethods");
         properties.put(THREADCOUNTCLASSES_KEY, "5");
         params = new JUnitCoreParameters( properties );
@@ -915,7 +915,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         ParallelComputerUtil.overrideAvailableProcessors( cpu );
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
 
         properties.put(PARALLEL_KEY, "all");
         properties.put(THREADCOUNTSUITES_KEY, "5");
@@ -933,7 +933,7 @@ public final class ParallelComputerUtilTest
 
         // Warning: these cases work but they are not enabled in AbstractSurefireMojo
         // Instead use the 'useUnlimitedThreads' parameter.
-        properties = new HashMap<String, String>();
+        properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "all");
         properties.put(THREADCOUNTSUITES_KEY, "5");
         properties.put(THREADCOUNTCLASSES_KEY, "15");
@@ -947,7 +947,7 @@ public final class ParallelComputerUtilTest
         assertThat( concurrency.classes, is( 15 * cpu ) );
         assertThat( concurrency.methods, is( Integer.MAX_VALUE ) );
 
-        properties = new HashMap<String, String>();
+        properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "all");
         properties.put(THREADCOUNTCLASSES_KEY, "15");
         params = new JUnitCoreParameters( properties );
@@ -964,7 +964,7 @@ public final class ParallelComputerUtilTest
     @Test
     public void withoutShutdown()
     {
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "methods");
         properties.put(THREADCOUNTMETHODS_KEY, "2");
         JUnitCoreParameters params = new JUnitCoreParameters( properties );
@@ -991,7 +991,7 @@ public final class ParallelComputerUtilTest
     {
         // The JUnitCore returns after 2.5s.
         // The test-methods in TestClass are NOT interrupted, and return normally after 5s.
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "methods");
         properties.put(THREADCOUNTMETHODS_KEY, "2");
         properties.put(PARALLEL_TIMEOUT_KEY, Double.toString( 2.5d ));
@@ -1017,7 +1017,7 @@ public final class ParallelComputerUtilTest
         throws TestSetFailedException
     {
         // The JUnitCore returns after 2.5s, and the test-methods in TestClass are interrupted.
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "methods");
         properties.put(THREADCOUNTMETHODS_KEY, "2");
         properties.put(PARALLEL_TIMEOUTFORCED_KEY, Double.toString( 2.5d ));
@@ -1045,7 +1045,7 @@ public final class ParallelComputerUtilTest
         // The JUnitCore returns after 3.5s and the test-methods in TestClass are timed out after 2.5s.
         // No new test methods are scheduled for execution after 2.5s.
         // Interruption of test methods after 3.5s.
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "methods");
         properties.put(THREADCOUNTMETHODS_KEY, "2");
         properties.put(PARALLEL_TIMEOUT_KEY, Double.toString( 2.5d ));
@@ -1072,7 +1072,7 @@ public final class ParallelComputerUtilTest
         throws Exception
     {
         // The JUnitCore returns after 3.5s and the test-methods in TestClass are interrupted after 3.5s.
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PARALLEL_KEY, "methods");
         properties.put(THREADCOUNTMETHODS_KEY, "2");
         properties.put(PARALLEL_TIMEOUTFORCED_KEY, Double.toString( 3.5d ) );
diff --git a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
index e801b06..e540569 100644
--- a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
+++ b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
@@ -44,7 +44,7 @@ public class GroupMatcherMethodSelector
 
     private static GroupMatcher matcher;
 
-    private Map<ITestNGMethod, Boolean> answers = new HashMap<ITestNGMethod, Boolean>();
+    private Map<ITestNGMethod, Boolean> answers = new HashMap<>();
 
     @Override
     public boolean includeMethod( IMethodSelectorContext context, ITestNGMethod method, boolean isTestMethod )
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
index a695ef6..82b9b90 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
@@ -240,7 +240,7 @@ final class TestNGDirectoryTestSuite
 
     private Map<String, String> createJUnitOptions()
     {
-        Map<String, String> junitOptions = new HashMap<String, String>( options );
+        Map<String, String> junitOptions = new HashMap<>( options );
         String onlyJUnit = options.get( "junit" );
         if ( isBlank( onlyJUnit ) )
         {
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
index c8abd60..e9b16e9 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
@@ -89,8 +89,8 @@ final class TestNGXmlTestSuite
             throw new IllegalStateException( "No suite files were specified" );
         }
 
-        suiteFilePaths = new ArrayList<String>( suiteFiles.size() );
-        ArrayList<File> testSets = new ArrayList<File>( suiteFiles.size() );
+        suiteFilePaths = new ArrayList<>( suiteFiles.size() );
+        ArrayList<File> testSets = new ArrayList<>( suiteFiles.size() );
 
         for ( File suiteFile : suiteFiles )
         {
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
index c639ce9..e966731 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
@@ -41,7 +41,7 @@ public abstract class AbstractDirectConfigurator
 
     AbstractDirectConfigurator()
     {
-        Map<String, Setter> options = new HashMap<String, Setter>();
+        Map<String, Setter> options = new HashMap<>();
         // options.put( ProviderParameterNames.TESTNG_GROUPS_PROP, new Setter( "setGroups", String.class ) );
         // options.put( ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP, new Setter( "setExcludedGroups", String.class
         // ) );
@@ -76,7 +76,7 @@ public abstract class AbstractDirectConfigurator
 
     protected Map<String, String> filterForSuite( Map<String, String> options )
     {
-        Map<String, String> result = new HashMap<String, String>();
+        Map<String, String> result = new HashMap<>();
         addPropIfNotNull( options, result, ProviderParameterNames.PARALLEL_PROP );
         addPropIfNotNull( options, result, ProviderParameterNames.THREADCOUNT_PROP );
         return result;
@@ -116,10 +116,10 @@ public abstract class AbstractDirectConfigurator
     {
         if ( listenerClasses == null || listenerClasses.trim().isEmpty() )
         {
-            return new ArrayList<Class>();
+            return new ArrayList<>();
         }
 
-        List<Class> classes = new ArrayList<Class>();
+        List<Class> classes = new ArrayList<>();
         String[] classNames = listenerClasses.split( "\\s*,\\s*(\\r?\\n)?\\s*" );
         for ( String className : classNames )
         {
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
index a837cc3..b6bf82e 100755
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
@@ -75,7 +75,7 @@ public class TestNGMapConfigurator
     Map<String, Object> getConvertedOptions( Map<String, String> options )
         throws TestSetFailedException
     {
-        Map<String, Object> convertedOptions = new HashMap<String, Object>();
+        Map<String, Object> convertedOptions = new HashMap<>();
         convertedOptions.put( "-mixed", false );
         for ( Map.Entry<String, String> entry : options.entrySet() )
         {
@@ -136,7 +136,7 @@ public class TestNGMapConfigurator
             Class<?> reporterConfig = Class.forName( "org.testng.ReporterConfig" );
             Method deserialize = reporterConfig.getMethod( "deserialize", String.class );
             Object rc = deserialize.invoke( null, val );
-            ArrayList<Object> reportersList = new ArrayList<Object>();
+            ArrayList<Object> reportersList = new ArrayList<>();
             reportersList.add( rc );
             return reportersList;
         }
diff --git a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG513ConfiguratorTest.java b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG513ConfiguratorTest.java
index 1fbcda1..bbbe40d 100644
--- a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG513ConfiguratorTest.java
+++ b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG513ConfiguratorTest.java
@@ -65,7 +65,7 @@ public class TestNG513ConfiguratorTest
             throws TestSetFailedException
     {
         TestNGMapConfigurator testNGMapConfigurator = new TestNG513Configurator();
-        Map<String, String> raw = new HashMap<String, String>();
+        Map<String, String> raw = new HashMap<>();
         raw.put( key, value );
         return testNGMapConfigurator.getConvertedOptions( raw );
     }
diff --git a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG5141ConfiguratorTest.java b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG5141ConfiguratorTest.java
index e253f3f..54d1eb7 100644
--- a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG5141ConfiguratorTest.java
+++ b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG5141ConfiguratorTest.java
@@ -71,7 +71,7 @@ public class TestNG5141ConfiguratorTest
             throws TestSetFailedException
     {
         TestNGMapConfigurator testNGMapConfigurator = new TestNG5141Configurator();
-        Map<String, String> raw = new HashMap<String, String>();
+        Map<String, String> raw = new HashMap<>();
         raw.put( key, value );
         return testNGMapConfigurator.getConvertedOptions( raw );
     }
diff --git a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG5143ConfiguratorTest.java b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG5143ConfiguratorTest.java
index 2ea5398..34f46b1 100644
--- a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG5143ConfiguratorTest.java
+++ b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG5143ConfiguratorTest.java
@@ -65,7 +65,7 @@ public class TestNG5143ConfiguratorTest
             throws TestSetFailedException
     {
         TestNGMapConfigurator testNGMapConfigurator = new TestNG5143Configurator();
-        Map<String, String> raw = new HashMap<String, String>();
+        Map<String, String> raw = new HashMap<>();
         raw.put( key, value );
         return testNGMapConfigurator.getConvertedOptions( raw );
     }
diff --git a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNGMapConfiguratorTest.java b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNGMapConfiguratorTest.java
index 28bba7c..60a6b37 100755
--- a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNGMapConfiguratorTest.java
+++ b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNGMapConfiguratorTest.java
@@ -87,7 +87,7 @@ public class TestNGMapConfiguratorTest
         throws TestSetFailedException
     {
         TestNGMapConfigurator testNGMapConfigurator = new TestNGMapConfigurator();
-        Map<String, String> raw = new HashMap<String, String>();
+        Map<String, String> raw = new HashMap<>();
         raw.put( key, value );
         return testNGMapConfigurator.getConvertedOptions( raw );
     }
diff --git a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java
index 20a9456..59e0e90 100644
--- a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java
+++ b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java
@@ -27,7 +27,7 @@ import java.util.List;
  */
 public final class ReportTestSuite
 {
-    private final List<ReportTestCase> testCases = new ArrayList<ReportTestCase>();
+    private final List<ReportTestCase> testCases = new ArrayList<>();
 
     private int numberOfErrors;
 
diff --git a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
index 7eba4ac..da1b255 100644
--- a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
+++ b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
@@ -51,7 +51,7 @@ public final class SurefireReportParser
 
     private static final int PCENT = 100;
 
-    private final List<ReportTestSuite> testSuites = new ArrayList<ReportTestSuite>();
+    private final List<ReportTestSuite> testSuites = new ArrayList<>();
 
     private final NumberFormat numberFormat;
 
@@ -69,7 +69,7 @@ public final class SurefireReportParser
     public List<ReportTestSuite> parseXMLReportFiles()
         throws MavenReportException
     {
-        final Collection<File> xmlReportFiles = new ArrayList<File>();
+        final Collection<File> xmlReportFiles = new ArrayList<>();
         for ( File reportsDirectory : reportsDirectories )
         {
             if ( reportsDirectory.exists() )
@@ -121,7 +121,7 @@ public final class SurefireReportParser
 
     public Map<String, String> getSummary( List<ReportTestSuite> suites )
     {
-        Map<String, String> totalSummary = new HashMap<String, String>();
+        Map<String, String> totalSummary = new HashMap<>();
 
         int totalNumberOfTests = 0;
 
@@ -176,11 +176,11 @@ public final class SurefireReportParser
 
     public Map<String, List<ReportTestSuite>> getSuitesGroupByPackage( List<ReportTestSuite> testSuitesList )
     {
-        Map<String, List<ReportTestSuite>> suitePackage = new HashMap<String, List<ReportTestSuite>>();
+        Map<String, List<ReportTestSuite>> suitePackage = new HashMap<>();
 
         for ( ReportTestSuite suite : testSuitesList )
         {
-            List<ReportTestSuite> suiteList = new ArrayList<ReportTestSuite>();
+            List<ReportTestSuite> suiteList = new ArrayList<>();
 
             if ( suitePackage.get( suite.getPackageName() ) != null )
             {
@@ -204,7 +204,7 @@ public final class SurefireReportParser
 
     public List<ReportTestCase> getFailureDetails( List<ReportTestSuite> testSuites )
     {
-        List<ReportTestCase> failureDetails = new ArrayList<ReportTestCase>();
+        List<ReportTestCase> failureDetails = new ArrayList<>();
 
         for ( ReportTestSuite suite : testSuites )
         {
diff --git a/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java b/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java
index 729b60b..f454bc8 100644
--- a/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java
+++ b/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java
@@ -47,7 +47,7 @@ public class ReportTestSuiteTest
     {
         ReportTestCase tCase = new ReportTestCase();
 
-        List<ReportTestCase> tCaseList = new ArrayList<ReportTestCase>();
+        List<ReportTestCase> tCaseList = new ArrayList<>();
 
         tCaseList.add( tCase );
 
diff --git a/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java b/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java
index 5de439d..870cd92 100644
--- a/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java
+++ b/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java
@@ -111,7 +111,7 @@ public class SurefireReportParserTest
             .setTimeElapsed( 1.0f )
             .setNumberOfTests( 100 );
 
-        List<ReportTestSuite> suites = new ArrayList<ReportTestSuite>();
+        List<ReportTestSuite> suites = new ArrayList<>();
 
         suites.add( tSuite1 );
 
@@ -148,7 +148,7 @@ public class SurefireReportParserTest
 
         tSuite3.setPackageName( "Package2" );
 
-        List<ReportTestSuite> suites = new ArrayList<ReportTestSuite>();
+        List<ReportTestSuite> suites = new ArrayList<>();
 
         suites.add( tSuite1 );
 
@@ -191,9 +191,9 @@ public class SurefireReportParserTest
 
         tCase3.setFailure( "index: 0, size: 0", IndexOutOfBoundsException.class.getName() );
 
-        List<ReportTestCase> tCases = new ArrayList<ReportTestCase>();
+        List<ReportTestCase> tCases = new ArrayList<>();
 
-        List<ReportTestCase> tCases2 = new ArrayList<ReportTestCase>();
+        List<ReportTestCase> tCases2 = new ArrayList<>();
 
         tCases.add( tCase1 );
 
@@ -205,7 +205,7 @@ public class SurefireReportParserTest
 
         tSuite2.setTestCases( tCases2 );
 
-        List<ReportTestSuite> suites = new ArrayList<ReportTestSuite>();
+        List<ReportTestSuite> suites = new ArrayList<>();
 
         suites.add( tSuite1 );
 
diff --git a/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java b/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java
index 9c336b6..d79fe64 100644
--- a/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java
+++ b/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParserTest.java
@@ -44,7 +44,7 @@ public class TestSuiteXmlParserTest
 {
     private static final String[] linePatterns = { "at org.apache.Test.", "at org.apache.Test$" };
 
-    private final Collection<String> loggedErrors = new ArrayList<String>();
+    private final Collection<String> loggedErrors = new ArrayList<>();
 
     private ConsoleLogger consoleLogger;
 


Mime
View raw message