diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/SessionEventSupport.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/SessionEventSupport.java
index 4cf5876f2..efe95d042 100644
--- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/SessionEventSupport.java
+++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/SessionEventSupport.java
@@ -33,7 +33,7 @@ public final class SessionEventSupport
     /**
      * registered listeners
      */
-    private final List<SessionListener> listeners = new ArrayList<SessionListener>();
+    private final List<SessionListener> listeners = new ArrayList<>();
 
     /**
      * Adds the listener to the collection of listeners
diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEventSupport.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEventSupport.java
index cb3d0cb59..ff5531e05 100644
--- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEventSupport.java
+++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEventSupport.java
@@ -35,7 +35,7 @@ public final class TransferEventSupport
     /**
      * registered listeners
      */
-    private final List<TransferListener> listeners = new ArrayList<TransferListener>();
+    private final List<TransferListener> listeners = new ArrayList<>();
 
     /**
      * Adds the listener to the collection of listeners
diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
index 937f37ebd..e4c370caa 100644
--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
@@ -539,7 +539,7 @@ public void testWagonPutDirectoryWhenDirectoryAlreadyExists()
 
             wagon.putDirectory( sourceFile, dirName );
 
-            List<String> resourceNames = new ArrayList<String>( resources.length + 1 );
+            List<String> resourceNames = new ArrayList<>( resources.length + 1 );
 
             resourceNames.add( dirName + "/" + resourceToCreate );
             for ( String resource : resources )
@@ -591,7 +591,7 @@ public void testWagonPutDirectoryForDot()
 
             wagon.putDirectory( sourceFile, "." );
 
-            List<String> resourceNames = new ArrayList<String>( resources.length + 1 );
+            List<String> resourceNames = new ArrayList<>( resources.length + 1 );
 
             resourceNames.add( resourceToCreate );
             Collections.addAll( resourceNames, resources );
diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
index 47cdfcabb..dbabd8ecf 100644
--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
@@ -1172,7 +1172,7 @@ public static class RedirectHandler
 
         File repositoryDirectory;
 
-        public List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<HandlerRequestResponse>();
+        public List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<>();
 
         RedirectHandler( String reason, int retCode, String redirectUrl, File repositoryDirectory )
         {
@@ -2079,11 +2079,11 @@ public static class PutHandler
     {
         private final File resourceBase;
 
-        public List<DeployedResource> deployedResources = new ArrayList<DeployedResource>();
+        public List<DeployedResource> deployedResources = new ArrayList<>();
 
         public int putCallNumber = 0;
 
-        public List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<HandlerRequestResponse>();
+        public List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<>();
 
         public PutHandler( File repositoryDirectory )
         {
@@ -2140,7 +2140,7 @@ private static class AuthorizingProxyHandler
         extends TestHeaderHandler
     {
 
-        List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<HandlerRequestResponse>();
+        List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<>();
 
         public void handle( String target, Request baseRequest, HttpServletRequest request,
             HttpServletResponse response ) throws IOException, ServletException
@@ -2173,7 +2173,7 @@ private static class TestHeaderHandler
     {
         public Map<String, String> headers = Collections.emptyMap();
 
-        public List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<HandlerRequestResponse>();
+        public List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<>();
 
         TestHeaderHandler()
         {
@@ -2182,7 +2182,7 @@ private static class TestHeaderHandler
         public void handle( String target, Request baseRrequest, HttpServletRequest request,
             HttpServletResponse response ) throws IOException, ServletException
         {
-            headers = new HashMap<String, String>();
+            headers = new HashMap<>();
             for ( Enumeration<String> e = baseRrequest.getHeaderNames(); e.hasMoreElements(); )
             {
                 String name = e.nextElement();
@@ -2243,7 +2243,7 @@ public static class TestSecurityHandler
         extends ConstraintSecurityHandler
     {
 
-        public List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<HandlerRequestResponse>();
+        public List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<>();
 
         @Override
         public void handle( String target, Request baseRequest, HttpServletRequest request,
diff --git a/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java b/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
index a1da2b82a..1e8695ecf 100644
--- a/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
+++ b/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
@@ -240,7 +240,7 @@ public List<String> getFileList( String destinationDirectory )
 
         File[] files = path.listFiles();
 
-        List<String> list = new ArrayList<String>( files.length );
+        List<String> list = new ArrayList<>( files.length );
         for ( File file : files )
         {
             String name = file.getName();
diff --git a/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java b/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
index ddaadfc1a..8dc5208e1 100644
--- a/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
+++ b/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
@@ -466,7 +466,7 @@ public List<String> getFileList( String destinationDirectory )
                 throw new ResourceDoesNotExistException( "Could not find file: '" + resource + "'" );
             }
 
-            List<String> ret = new ArrayList<String>();
+            List<String> ret = new ArrayList<>();
             for ( FTPFile file : ftpFiles )
             {
                 String name = file.getName();
diff --git a/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java b/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
index 6f20f990d..83b702d7e 100644
--- a/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
+++ b/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
@@ -90,7 +90,7 @@ protected void setupWagonTestingFixtures()
             user.setName("admin");
             user.setPassword("admin");
 
-            List<Authority> authorities = new ArrayList<Authority>();
+            List<Authority> authorities = new ArrayList<>();
             authorities.add( new WritePermission() );
 
             user.setAuthorities( authorities );
diff --git a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonAuthenticator.java b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonAuthenticator.java
index d5d02bf33..b904a02ab 100644
--- a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonAuthenticator.java
+++ b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonAuthenticator.java
@@ -29,7 +29,7 @@
 public class LightweightHttpWagonAuthenticator
     extends Authenticator
 {
-    ThreadLocal<LightweightHttpWagon> localWagon = new ThreadLocal<LightweightHttpWagon>();
+    ThreadLocal<LightweightHttpWagon> localWagon = new ThreadLocal<>();
 
     protected PasswordAuthentication getPasswordAuthentication()
     {
diff --git a/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java b/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
index fc6a9f5d5..b2fd43e88 100644
--- a/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
+++ b/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
@@ -509,7 +509,7 @@ private String ensureDirs( ScmProvider scmProvider, ScmRepository scmRepository,
         String res =
             partCOSubdir.length() >= targetName.length() ? "" : targetName.substring( partCOSubdir.length() ) + '/';
 
-        ArrayList<File> createdDirs = new ArrayList<File>();
+        ArrayList<File> createdDirs = new ArrayList<>();
         File deepDir = new File( checkoutDirectory, res );
 
         boolean added = false;
@@ -842,7 +842,7 @@ public List<String> getFileList( String resourcePath )
                 throw new ResourceDoesNotExistException( result.getProviderMessage() );
             }
 
-            List<String> files = new ArrayList<String>();
+            List<String> files = new ArrayList<>();
 
             for ( ScmFile f : result.getFiles() )
             {
diff --git a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommandFactory.java b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommandFactory.java
index e16904ebe..0b52d7b79 100644
--- a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommandFactory.java
+++ b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommandFactory.java
@@ -82,7 +82,7 @@ private String[] splitCommandString( String command )
         }
 
         String[] args = command.split( " " );
-        List<String> parts = new ArrayList<String>();
+        List<String> parts = new ArrayList<>();
         parts.add( args[0] );
         for ( int i = 1; i < args.length; i++ )
         {
diff --git a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java
index d9884517d..47334025d 100644
--- a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java
+++ b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java
@@ -54,7 +54,7 @@ public class SshServerEmbedded
 
     private SshServer sshd;
 
-    private List<String> sshKeysResources = new ArrayList<String>();
+    private List<String> sshKeysResources = new ArrayList<>();
 
     private TestPublickeyAuthenticator publickeyAuthenticator;
 
diff --git a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPasswordAuthenticator.java b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPasswordAuthenticator.java
index 83cca139c..0f12410f5 100644
--- a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPasswordAuthenticator.java
+++ b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPasswordAuthenticator.java
@@ -33,7 +33,7 @@ public class TestPasswordAuthenticator
     implements PasswordAuthenticator
 {
     List<PasswordAuthenticatorRequest> requests =
-        new ArrayList<PasswordAuthenticatorRequest>();
+        new ArrayList<>();
 
     public boolean authenticate( String username, String password, ServerSession session )
     {
diff --git a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPublickeyAuthenticator.java b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPublickeyAuthenticator.java
index d49c48d09..98c3e78ba 100644
--- a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPublickeyAuthenticator.java
+++ b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPublickeyAuthenticator.java
@@ -43,7 +43,7 @@ public class TestPublickeyAuthenticator
     implements PublickeyAuthenticator
 {
     private List<PublickeyAuthenticatorRequest> publickeyAuthenticatorRequests =
-        new ArrayList<PublickeyAuthenticatorRequest>();
+        new ArrayList<>();
 
     private boolean keyAuthz;
 
diff --git a/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java b/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java
index 49d009e50..3c189a36b 100644
--- a/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java
+++ b/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java
@@ -67,7 +67,7 @@ public class LSParser
     public List<String> parseFiles( String rawLS )
         throws TransferFailedException
     {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         try
         {
             BufferedReader br = new BufferedReader( new StringReader( rawLS ) );
diff --git a/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/AbstractKnownHostsProvider.java b/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/AbstractKnownHostsProvider.java
index 6b9117a59..4a2e0b961 100644
--- a/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/AbstractKnownHostsProvider.java
+++ b/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/AbstractKnownHostsProvider.java
@@ -44,7 +44,7 @@ public abstract class AbstractKnownHostsProvider
      */
     protected String contents;
 
-    protected Set<KnownHostEntry> knownHosts = new HashSet<KnownHostEntry>();
+    protected Set<KnownHostEntry> knownHosts = new HashSet<>();
 
     public void setHostKeyChecking( String hostKeyChecking )
     {
diff --git a/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/StreamKnownHostsProvider.java b/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/StreamKnownHostsProvider.java
index ef131fa77..478d27363 100644
--- a/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/StreamKnownHostsProvider.java
+++ b/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/StreamKnownHostsProvider.java
@@ -64,7 +64,7 @@ public StreamKnownHostsProvider( InputStream stream )
     protected Set<KnownHostEntry> loadKnownHosts( String contents )
         throws IOException
     {
-        Set<KnownHostEntry> hosts = new HashSet<KnownHostEntry>();
+        Set<KnownHostEntry> hosts = new HashSet<>();
         
         BufferedReader br = new BufferedReader( new StringReader( contents ) );
         
diff --git a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
index 06d952aa7..a37fe6cda 100644
--- a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
+++ b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
@@ -373,7 +373,7 @@ public List<String> getFileList( String destinationDirectory )
 
             @SuppressWarnings( "unchecked" )
             List<ChannelSftp.LsEntry> fileList = channel.ls( filename );
-            List<String> files = new ArrayList<String>( fileList.size() );
+            List<String> files = new ArrayList<>( fileList.size() );
             for ( ChannelSftp.LsEntry entry : fileList )
             {
                 String name = entry.getFilename();
diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
index c5c2badff..8bf95203b 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
@@ -41,7 +41,7 @@ public class MultiStatus
      * Map collecting the responses for this multistatus, where every href must
      * only occur one single time.
      */
-    private Map<String, MultiStatusResponse> responses = new LinkedHashMap<String, MultiStatusResponse>();
+    private Map<String, MultiStatusResponse> responses = new LinkedHashMap<>();
 
     /**
      * A general response description at the multistatus top level is used to
diff --git a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
index 5cdbbf5a6..b1e443550 100644
--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
+++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
@@ -61,11 +61,11 @@ public abstract class HttpWagonTests
 
     private String baseUrl;
 
-    private static final Set<File> TMP_FILES = new HashSet<File>();
+    private static final Set<File> TMP_FILES = new HashSet<>();
 
     private Repository repo;
 
-    private final Set<Object> notificationTargets = new HashSet<Object>();
+    private final Set<Object> notificationTargets = new HashSet<>();
 
     // CHECKSTYLE_OFF: ConstantName
     protected static final Logger logger = LoggerFactory.getLogger( HttpWagonTests.class );
diff --git a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java
index 1fc207667..2314fc5c3 100644
--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java
+++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java
@@ -46,7 +46,7 @@ public final class TestUtil
     private static final Logger logger = LoggerFactory.getLogger( TestUtil.class );
     // CHECKSTYLE_ON: ConstantName
 
-    private static final Map<String, File> BASES = new HashMap<String, File>();
+    private static final Map<String, File> BASES = new HashMap<>();
 
     private TestUtil()
     {