diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java
index ca8737101c..5bf070258e 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java
@@ -288,7 +288,7 @@ public class App
 
   /** Field description */
   @Argument(index = 1, metaVar = "arg")
-  private List<String> arguments = new ArrayList<String>();
+  private List<String> arguments = new ArrayList<>();
 
   /** Field description */
   private BufferedReader input;
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateGroupSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateGroupSubCommand.java
index a64a273253..5fba296532 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateGroupSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateGroupSubCommand.java
@@ -169,7 +169,7 @@ public class CreateGroupSubCommand extends TemplateSubCommand
 
     session.getGroupHandler().create(group);
 
-    Map<String, Object> env = new HashMap<String, Object>();
+    Map<String, Object> env = new HashMap<>();
 
     env.put("group", new GroupWrapper(group));
     renderTemplate(env, GetGroupSubCommand.TEMPLATE);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java
index 52828eba25..a0d675e2be 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java
@@ -168,7 +168,7 @@ public class CreateRepositorySubCommand extends TemplateSubCommand
 
     session.getRepositoryHandler().create(repository);
 
-    Map<String, Object> env = new HashMap<String, Object>();
+    Map<String, Object> env = new HashMap<>();
 
     env.put("repository", new RepositoryWrapper(config, repository));
     renderTemplate(env, GetRepositorySubCommand.TEMPLATE);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateUserSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateUserSubCommand.java
index c6a72d4ce8..805c05d83b 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateUserSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateUserSubCommand.java
@@ -214,7 +214,7 @@ public class CreateUserSubCommand extends TemplateSubCommand
 
     session.getUserHandler().create(user);
 
-    Map<String, Object> env = new HashMap<String, Object>();
+    Map<String, Object> env = new HashMap<>();
 
     env.put("user", new UserWrapper(user));
     renderTemplate(env, GetUserSubCommand.TEMPLATE);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetGroupSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetGroupSubCommand.java
index 5d823217e1..9bb02a4703 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetGroupSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetGroupSubCommand.java
@@ -102,7 +102,7 @@ public class GetGroupSubCommand extends TemplateSubCommand
 
     if (group != null)
     {
-      Map<String, Object> env = new HashMap<String, Object>();
+      Map<String, Object> env = new HashMap<>();
 
       env.put("group", new GroupWrapper(group));
       renderTemplate(env, TEMPLATE);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java
index 2e8227fa60..5dd27db525 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java
@@ -117,7 +117,7 @@ public class GetRepositorySubCommand extends TemplateSubCommand
 
     if (repository != null)
     {
-      Map<String, Object> env = new HashMap<String, Object>();
+      Map<String, Object> env = new HashMap<>();
 
       env.put("repository", new RepositoryWrapper(config, repository));
       renderTemplate(env, TEMPLATE);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetUserSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetUserSubCommand.java
index 60d70349cb..2356d6323a 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetUserSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetUserSubCommand.java
@@ -102,7 +102,7 @@ public class GetUserSubCommand extends TemplateSubCommand
 
     if (user != null)
     {
-      Map<String, Object> env = new HashMap<String, Object>();
+      Map<String, Object> env = new HashMap<>();
 
       env.put("user", new UserWrapper(user));
       renderTemplate(env, TEMPLATE);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListGroupsSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListGroupsSubCommand.java
index 968e574ca6..80b9428f6b 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListGroupsSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListGroupsSubCommand.java
@@ -71,7 +71,7 @@ public class ListGroupsSubCommand extends TemplateSubCommand
   {
     ScmClientSession session = createSession();
     List<Group> groups = session.getGroupHandler().getAll();
-    Map<String, Object> env = new HashMap<String, Object>();
+    Map<String, Object> env = new HashMap<>();
 
     env.put("groups", WrapperUtil.wrapGroups(groups));
     renderTemplate(env, TEMPLATE);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java
index 2235781791..f876d2a878 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java
@@ -72,7 +72,7 @@ public class ListRepositoriesSubCommand extends TemplateSubCommand
   {
     ScmClientSession session = createSession();
     List<Repository> repositories = session.getRepositoryHandler().getAll();
-    Map<String, Object> env = new HashMap<String, Object>();
+    Map<String, Object> env = new HashMap<>();
 
     env.put("repositories", WrapperUtil.wrapRepositories(config, repositories));
     renderTemplate(env, TEMPLATE);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListUsersSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListUsersSubCommand.java
index 58da1fc2f3..9f17f59160 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListUsersSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListUsersSubCommand.java
@@ -71,7 +71,7 @@ public class ListUsersSubCommand extends TemplateSubCommand
   {
     ScmClientSession session = createSession();
     List<User> users = session.getUserHandler().getAll();
-    Map<String, Object> env = new HashMap<String, Object>();
+    Map<String, Object> env = new HashMap<>();
 
     env.put("users", WrapperUtil.wrapUsers(users));
     renderTemplate(env, TEMPLATE);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/MembersSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/MembersSubCommand.java
index 279b0602ec..490a239cd3 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/MembersSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/MembersSubCommand.java
@@ -132,7 +132,7 @@ public abstract class MembersSubCommand extends TemplateSubCommand
       modifyMembers(group, members);
       handler.modify(group);
 
-      Map<String, Object> env = new HashMap<String, Object>();
+      Map<String, Object> env = new HashMap<>();
 
       env.put("group", new GroupWrapper(group));
       renderTemplate(env, GetGroupSubCommand.TEMPLATE);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyGroupSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyGroupSubCommand.java
index 244f40f114..6cb151e22d 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyGroupSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyGroupSubCommand.java
@@ -108,7 +108,7 @@ public class ModifyGroupSubCommand extends TemplateSubCommand
 
       handler.modify(group);
 
-      Map<String, Object> env = new HashMap<String, Object>();
+      Map<String, Object> env = new HashMap<>();
 
       env.put("group", new GroupWrapper(group));
       renderTemplate(env, GetGroupSubCommand.TEMPLATE);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java
index 5ec4c59519..b0d64242d0 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java
@@ -212,7 +212,7 @@ public class ModifyRepositorySubCommand extends TemplateSubCommand
 
       handler.modify(repository);
 
-      Map<String, Object> env = new HashMap<String, Object>();
+      Map<String, Object> env = new HashMap<>();
 
       env.put("repository", new RepositoryWrapper(config, repository));
       renderTemplate(env, GetRepositorySubCommand.TEMPLATE);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyUserSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyUserSubCommand.java
index 613b07d552..63a25d5d07 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyUserSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyUserSubCommand.java
@@ -184,7 +184,7 @@ public class ModifyUserSubCommand extends TemplateSubCommand
 
       handler.modify(user);
 
-      Map<String, Object> env = new HashMap<String, Object>();
+      Map<String, Object> env = new HashMap<>();
 
       env.put("user", new UserWrapper(user));
       renderTemplate(env, GetUserSubCommand.TEMPLATE);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java
index a6b5eba2f5..d40c50c38a 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java
@@ -111,14 +111,14 @@ public abstract class PermissionSubCommand extends TemplateSubCommand
 
       if (permissions == null)
       {
-        permissions = new ArrayList<Permission>();
+        permissions = new ArrayList<>();
       }
 
       modifyPermissions(permissions);
       repository.setPermissions(permissions);
       handler.modify(repository);
 
-      Map<String, Object> env = new HashMap<String, Object>();
+      Map<String, Object> env = new HashMap<>();
 
       env.put("repository", new RepositoryWrapper(config, repository));
       renderTemplate(env, GetRepositorySubCommand.TEMPLATE);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandHandler.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandHandler.java
index 3f8e1f74fb..36f39d470c 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandHandler.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandHandler.java
@@ -83,7 +83,7 @@ public class SubCommandHandler
    */
   private SubCommandHandler()
   {
-    subCommands = new HashMap<String, CommandDescriptor>();
+    subCommands = new HashMap<>();
     loadSubCommands();
   }
 
@@ -133,7 +133,7 @@ public class SubCommandHandler
   public List<CommandDescriptor> getDescriptors()
   {
     List<CommandDescriptor> descs =
-      new ArrayList<CommandDescriptor>(subCommands.values());
+      new ArrayList<>(subCommands.values());
 
     Collections.sort(descs);
 
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfig.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfig.java
index 281a0f8c3b..68c50731b7 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfig.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfig.java
@@ -63,7 +63,7 @@ public class ScmClientConfig
    */
   private ScmClientConfig()
   {
-    this.serverConfigMap = new HashMap<String, ServerConfig>();
+    this.serverConfigMap = new HashMap<>();
   }
 
   //~--- get methods ----------------------------------------------------------
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/XmlConfigAdapter.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/XmlConfigAdapter.java
index fcf109d879..c7471cf601 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/XmlConfigAdapter.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/XmlConfigAdapter.java
@@ -63,7 +63,7 @@ public class XmlConfigAdapter
   @Override
   public XmlConfigSet marshal(Map<String, ServerConfig> map) throws Exception
   {
-    Set<XmlConfigElement> set = new HashSet<XmlConfigElement>();
+    Set<XmlConfigElement> set = new HashSet<>();
 
     for (Map.Entry<String, ServerConfig> e : map.entrySet())
     {
@@ -86,7 +86,7 @@ public class XmlConfigAdapter
   @Override
   public Map<String, ServerConfig> unmarshal(XmlConfigSet set) throws Exception
   {
-    Map<String, ServerConfig> map = new HashMap<String, ServerConfig>();
+    Map<String, ServerConfig> map = new HashMap<>();
 
     for (XmlConfigElement e : set)
     {
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/wrapper/WrapperUtil.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/wrapper/WrapperUtil.java
index 0c87424fe6..466cf55019 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/wrapper/WrapperUtil.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/wrapper/WrapperUtil.java
@@ -71,7 +71,7 @@ public final class WrapperUtil
    */
   public static List<GroupWrapper> wrapGroups(Collection<Group> groups)
   {
-    List<GroupWrapper> wrappers = new ArrayList<GroupWrapper>();
+    List<GroupWrapper> wrappers = new ArrayList<>();
 
     for (Group g : groups)
     {
@@ -95,7 +95,7 @@ public final class WrapperUtil
   public static List<RepositoryWrapper> wrapRepositories(ServerConfig config,
     Collection<Repository> repositories)
   {
-    List<RepositoryWrapper> wrappers = new ArrayList<RepositoryWrapper>();
+    List<RepositoryWrapper> wrappers = new ArrayList<>();
 
     for (Repository r : repositories)
     {
@@ -115,7 +115,7 @@ public final class WrapperUtil
    */
   public static List<UserWrapper> wrapUsers(Collection<User> users)
   {
-    List<UserWrapper> wrappers = new ArrayList<UserWrapper>();
+    List<UserWrapper> wrappers = new ArrayList<>();
 
     for (User u : users)
     {
diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientRepositoryBrowser.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientRepositoryBrowser.java
index 571c30f7db..1b68cdc63d 100644
--- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientRepositoryBrowser.java
+++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientRepositoryBrowser.java
@@ -187,7 +187,7 @@ public class JerseyClientRepositoryBrowser implements ClientRepositoryBrowser
         BrowserResult result = response.getEntity(BrowserResult.class);
 
         AssertUtil.assertIsNotNull(result);
-        files = new ArrayList<FileObjectWrapper>();
+        files = new ArrayList<>();
 
         List<FileObject> foList = result.getFiles();
 
diff --git a/scm-core/src/main/java/sonia/scm/collect/IterableQueue.java b/scm-core/src/main/java/sonia/scm/collect/IterableQueue.java
index 9d3c85bb90..6b6af9fd0f 100644
--- a/scm-core/src/main/java/sonia/scm/collect/IterableQueue.java
+++ b/scm-core/src/main/java/sonia/scm/collect/IterableQueue.java
@@ -134,7 +134,7 @@ public final class IterableQueue<T> implements Iterable<T>
     else
     {
       logger.trace("create queue iterator");
-      iterator = new QueueIterator<T>(this);
+      iterator = new QueueIterator<>(this);
     }
 
     return iterator;
diff --git a/scm-core/src/main/java/sonia/scm/collect/LimitedSortedSet.java b/scm-core/src/main/java/sonia/scm/collect/LimitedSortedSet.java
index fe99ee7a1c..681b8ef07c 100644
--- a/scm-core/src/main/java/sonia/scm/collect/LimitedSortedSet.java
+++ b/scm-core/src/main/java/sonia/scm/collect/LimitedSortedSet.java
@@ -63,7 +63,7 @@ public class LimitedSortedSet<E> extends ForwardingSortedSet<E>
    */
   public LimitedSortedSet(int maxSize)
   {
-    this.sortedSet = new TreeSet<E>();
+    this.sortedSet = new TreeSet<>();
     this.maxSize = maxSize;
   }
 
diff --git a/scm-core/src/main/java/sonia/scm/io/AbstractResourceProcessor.java b/scm-core/src/main/java/sonia/scm/io/AbstractResourceProcessor.java
index 8b5c1d1dd7..6c00a319c9 100644
--- a/scm-core/src/main/java/sonia/scm/io/AbstractResourceProcessor.java
+++ b/scm-core/src/main/java/sonia/scm/io/AbstractResourceProcessor.java
@@ -183,5 +183,5 @@ public abstract class AbstractResourceProcessor implements ResourceProcessor
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  private Map<String, String> variableMap = new HashMap<String, String>();
+  private Map<String, String> variableMap = new HashMap<>();
 }
diff --git a/scm-core/src/main/java/sonia/scm/io/INIConfiguration.java b/scm-core/src/main/java/sonia/scm/io/INIConfiguration.java
index 9f3cce03f6..c9695b7ca6 100644
--- a/scm-core/src/main/java/sonia/scm/io/INIConfiguration.java
+++ b/scm-core/src/main/java/sonia/scm/io/INIConfiguration.java
@@ -52,7 +52,7 @@ public class INIConfiguration
    */
   public INIConfiguration()
   {
-    this.sectionMap = new LinkedHashMap<String, INISection>();
+    this.sectionMap = new LinkedHashMap<>();
   }
 
   //~--- methods --------------------------------------------------------------
diff --git a/scm-core/src/main/java/sonia/scm/io/INISection.java b/scm-core/src/main/java/sonia/scm/io/INISection.java
index 03768a84ca..0ce6ea6bcf 100644
--- a/scm-core/src/main/java/sonia/scm/io/INISection.java
+++ b/scm-core/src/main/java/sonia/scm/io/INISection.java
@@ -55,7 +55,7 @@ public class INISection
   public INISection(String name)
   {
     this.name = name;
-    this.parameters = new LinkedHashMap<String, String>();
+    this.parameters = new LinkedHashMap<>();
   }
 
   /**
diff --git a/scm-core/src/main/java/sonia/scm/plugin/PluginCenter.java b/scm-core/src/main/java/sonia/scm/plugin/PluginCenter.java
index e1598e0490..e4de29eb26 100644
--- a/scm-core/src/main/java/sonia/scm/plugin/PluginCenter.java
+++ b/scm-core/src/main/java/sonia/scm/plugin/PluginCenter.java
@@ -111,10 +111,10 @@ public class PluginCenter implements Serializable
   /** Field description */
   @XmlElement(name = "plugin")
   @XmlElementWrapper(name = "plugins")
-  private Set<PluginInformation> plugins = new HashSet<PluginInformation>();
+  private Set<PluginInformation> plugins = new HashSet<>();
 
   /** Field description */
   @XmlElement(name = "repository")
   @XmlElementWrapper(name = "repositories")
-  private Set<PluginRepository> repositories = new HashSet<PluginRepository>();
+  private Set<PluginRepository> repositories = new HashSet<>();
 }
diff --git a/scm-core/src/main/java/sonia/scm/plugin/PluginCondition.java b/scm-core/src/main/java/sonia/scm/plugin/PluginCondition.java
index 8f9ce89185..2a5dfcee8c 100644
--- a/scm-core/src/main/java/sonia/scm/plugin/PluginCondition.java
+++ b/scm-core/src/main/java/sonia/scm/plugin/PluginCondition.java
@@ -101,7 +101,7 @@ public class PluginCondition implements Cloneable, Serializable
 
     if (Util.isNotEmpty(os))
     {
-      clone.setOs(new ArrayList<String>(os));
+      clone.setOs(new ArrayList<>(os));
     }
 
     return clone;
diff --git a/scm-core/src/main/java/sonia/scm/plugin/PluginInformation.java b/scm-core/src/main/java/sonia/scm/plugin/PluginInformation.java
index 1cf23fd3d9..4fffdd8572 100644
--- a/scm-core/src/main/java/sonia/scm/plugin/PluginInformation.java
+++ b/scm-core/src/main/java/sonia/scm/plugin/PluginInformation.java
@@ -106,7 +106,7 @@ public class PluginInformation
 
     if (Util.isNotEmpty(screenshots))
     {
-      clone.setScreenshots(new ArrayList<String>(screenshots));
+      clone.setScreenshots(new ArrayList<>(screenshots));
     }
 
     clone.setState(state);
diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
index a327b50dae..5ad5d0f9ca 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
@@ -209,7 +209,7 @@ public abstract class AbstractRepositoryHandler<C extends SimpleRepositoryConfig
   private void fireConfigChanged()
   {
     ScmEventBus.getInstance().post(
-      new RepositoryHandlerConfigChangedEvent<C>(config));
+      new RepositoryHandlerConfigChangedEvent<>(config));
   }
 
   //~--- fields ---------------------------------------------------------------
diff --git a/scm-core/src/main/java/sonia/scm/repository/Changeset.java b/scm-core/src/main/java/sonia/scm/repository/Changeset.java
index fecfd74cc9..ce3fb5424b 100644
--- a/scm-core/src/main/java/sonia/scm/repository/Changeset.java
+++ b/scm-core/src/main/java/sonia/scm/repository/Changeset.java
@@ -220,7 +220,7 @@ public class Changeset extends BasicPropertiesAware
   {
     if (branches == null)
     {
-      branches = new ArrayList<String>();
+      branches = new ArrayList<>();
     }
 
     return branches;
@@ -286,7 +286,7 @@ public class Changeset extends BasicPropertiesAware
   {
     if (parents == null)
     {
-      parents = new ArrayList<String>();
+      parents = new ArrayList<>();
     }
 
     return parents;
@@ -302,7 +302,7 @@ public class Changeset extends BasicPropertiesAware
   {
     if (tags == null)
     {
-      tags = new ArrayList<String>();
+      tags = new ArrayList<>();
     }
 
     return tags;
diff --git a/scm-core/src/main/java/sonia/scm/repository/PreProcessorUtil.java b/scm-core/src/main/java/sonia/scm/repository/PreProcessorUtil.java
index b44da13ad1..72e4ed7d63 100644
--- a/scm-core/src/main/java/sonia/scm/repository/PreProcessorUtil.java
+++ b/scm-core/src/main/java/sonia/scm/repository/PreProcessorUtil.java
@@ -110,8 +110,8 @@ public class PreProcessorUtil
     EscapeUtil.escape(blameLine);
 
     PreProcessorHandler<BlameLine> handler =
-      new PreProcessorHandler<BlameLine>(blameLinePreProcessorFactorySet,
-        blameLinePreProcessorSet, repository);
+      new PreProcessorHandler<>(blameLinePreProcessorFactorySet,
+                                blameLinePreProcessorSet, repository);
 
     handler.callPreProcessors(blameLine);
     handler.callPreProcessorFactories(blameLine);
@@ -154,8 +154,8 @@ public class PreProcessorUtil
     }
 
     PreProcessorHandler<BlameLine> handler =
-      new PreProcessorHandler<BlameLine>(blameLinePreProcessorFactorySet,
-        blameLinePreProcessorSet, repository);
+      new PreProcessorHandler<>(blameLinePreProcessorFactorySet,
+                                blameLinePreProcessorSet, repository);
 
     handler.callPreProcessors(blameResult.getBlameLines());
     handler.callPreProcessorFactories(blameResult.getBlameLines());
@@ -198,8 +198,8 @@ public class PreProcessorUtil
     }
 
     PreProcessorHandler<Changeset> handler =
-      new PreProcessorHandler<Changeset>(changesetPreProcessorFactorySet,
-        changesetPreProcessorSet, repository);
+      new PreProcessorHandler<>(changesetPreProcessorFactorySet,
+                                changesetPreProcessorSet, repository);
 
     handler.callPreProcessors(changeset);
     handler.callPreProcessorFactories(changeset);
@@ -242,8 +242,8 @@ public class PreProcessorUtil
     }
 
     PreProcessorHandler<FileObject> handler =
-      new PreProcessorHandler<FileObject>(fileObjectPreProcessorFactorySet,
-        fileObjectPreProcessorSet, repository);
+      new PreProcessorHandler<>(fileObjectPreProcessorFactorySet,
+                                fileObjectPreProcessorSet, repository);
 
     handler.callPreProcessors(result);
     handler.callPreProcessorFactories(result);
@@ -274,8 +274,8 @@ public class PreProcessorUtil
     }
 
     PreProcessorHandler<Changeset> handler =
-      new PreProcessorHandler<Changeset>(changesetPreProcessorFactorySet,
-        changesetPreProcessorSet, repository);
+      new PreProcessorHandler<>(changesetPreProcessorFactorySet,
+                                changesetPreProcessorSet, repository);
 
     handler.callPreProcessors(result);
     handler.callPreProcessorFactories(result);
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryUtil.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryUtil.java
index e271992248..fd955d27b7 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryUtil.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryUtil.java
@@ -85,7 +85,7 @@ public final class RepositoryUtil
   public static List<File> searchRepositoryDirectories(File directory,
     String... names)
   {
-    List<File> repositories = new ArrayList<File>();
+    List<File> repositories = new ArrayList<>();
 
     searchRepositoryDirectories(repositories, directory, Arrays.asList(names));
 
@@ -253,7 +253,7 @@ public final class RepositoryUtil
     String... directoryNames)
     throws IOException
   {
-    List<String> repositories = new ArrayList<String>();
+    List<String> repositories = new ArrayList<>();
     List<File> repositoryFiles = searchRepositoryDirectories(baseDirectory,
                                    directoryNames);
 
diff --git a/scm-core/src/main/java/sonia/scm/search/SearchUtil.java b/scm-core/src/main/java/sonia/scm/search/SearchUtil.java
index dc18e6bd27..10ce9ed1d1 100644
--- a/scm-core/src/main/java/sonia/scm/search/SearchUtil.java
+++ b/scm-core/src/main/java/sonia/scm/search/SearchUtil.java
@@ -160,7 +160,7 @@ public final class SearchUtil
   public static <T> Collection<T> search(SearchRequest searchRequest,
     Collection<T> collection, TransformFilter<T> filter)
   {
-    List<T> items = new ArrayList<T>();
+    List<T> items = new ArrayList<>();
     int index = 0;
     int counter = 0;
 
diff --git a/scm-core/src/main/java/sonia/scm/util/IOUtil.java b/scm-core/src/main/java/sonia/scm/util/IOUtil.java
index d71f8a36fc..51c67b0b7d 100644
--- a/scm-core/src/main/java/sonia/scm/util/IOUtil.java
+++ b/scm-core/src/main/java/sonia/scm/util/IOUtil.java
@@ -592,7 +592,7 @@ public final class IOUtil
   public static List<String> searchAll(String[] path, String cmd,
     String checkParameter)
   {
-    List<String> cmds = new ArrayList<String>();
+    List<String> cmds = new ArrayList<>();
 
     if (isCommandAvailable(cmd, checkParameter))
     {
diff --git a/scm-core/src/main/java/sonia/scm/util/LinkTextParser.java b/scm-core/src/main/java/sonia/scm/util/LinkTextParser.java
index 2037beeeff..67ca800bcb 100644
--- a/scm-core/src/main/java/sonia/scm/util/LinkTextParser.java
+++ b/scm-core/src/main/java/sonia/scm/util/LinkTextParser.java
@@ -79,7 +79,7 @@ public final class LinkTextParser
   public static String parseText(String content)
   {
     Matcher m = REGEX_URL.matcher(content);
-    List<Token> tokens = new ArrayList<Token>();
+    List<Token> tokens = new ArrayList<>();
     int position = 0;
     String tokenContent = null;
 
diff --git a/scm-core/src/main/java/sonia/scm/util/ServiceUtil.java b/scm-core/src/main/java/sonia/scm/util/ServiceUtil.java
index 138345bb05..04bdfb6dea 100644
--- a/scm-core/src/main/java/sonia/scm/util/ServiceUtil.java
+++ b/scm-core/src/main/java/sonia/scm/util/ServiceUtil.java
@@ -119,7 +119,7 @@ public final class ServiceUtil
    */
   public static <T> List<T> getServices(Class<T> type)
   {
-    List<T> result = new ArrayList<T>();
+    List<T> result = new ArrayList<>();
 
     try
     {
diff --git a/scm-core/src/main/java/sonia/scm/util/Util.java b/scm-core/src/main/java/sonia/scm/util/Util.java
index d17219bfa2..cb64b75aff 100644
--- a/scm-core/src/main/java/sonia/scm/util/Util.java
+++ b/scm-core/src/main/java/sonia/scm/util/Util.java
@@ -262,8 +262,8 @@ public final class Util
     Comparator<T> comparator, CollectionAppender<T> appender, int start,
     int limit)
   {
-    List<T> result = new ArrayList<T>();
-    List<T> valueList = new ArrayList<T>(values);
+    List<T> result = new ArrayList<>();
+    List<T> valueList = new ArrayList<>(values);
 
     if (comparator != null)
     {
diff --git a/scm-core/src/main/java/sonia/scm/web/cgi/EnvList.java b/scm-core/src/main/java/sonia/scm/web/cgi/EnvList.java
index 796d6125d8..541ae9ba23 100644
--- a/scm-core/src/main/java/sonia/scm/web/cgi/EnvList.java
+++ b/scm-core/src/main/java/sonia/scm/web/cgi/EnvList.java
@@ -66,7 +66,7 @@ public class EnvList
    */
   public EnvList()
   {
-    envMap = new HashMap<String, String>();
+    envMap = new HashMap<>();
   }
 
   /**
@@ -77,7 +77,7 @@ public class EnvList
    */
   public EnvList(EnvList l)
   {
-    envMap = new HashMap<String, String>(l.envMap);
+    envMap = new HashMap<>(l.envMap);
   }
 
   //~--- methods --------------------------------------------------------------
diff --git a/scm-core/src/main/java/sonia/scm/web/filter/BufferedHttpServletResponse.java b/scm-core/src/main/java/sonia/scm/web/filter/BufferedHttpServletResponse.java
index b91f2b62c9..ff174c4fe8 100644
--- a/scm-core/src/main/java/sonia/scm/web/filter/BufferedHttpServletResponse.java
+++ b/scm-core/src/main/java/sonia/scm/web/filter/BufferedHttpServletResponse.java
@@ -470,13 +470,13 @@ public class BufferedHttpServletResponse extends HttpServletResponseWrapper
   private ByteArrayPrintWriter pw = null;
 
   /** Field description */
-  private Set<Cookie> cookies = new HashSet<Cookie>();
+  private Set<Cookie> cookies = new HashSet<>();
 
   /** Field description */
   private int statusCode = HttpServletResponse.SC_OK;
 
   /** Field description */
-  private Map<String, String> headers = new LinkedHashMap<String, String>();
+  private Map<String, String> headers = new LinkedHashMap<>();
 
   /** Field description */
   private String statusMessage;
diff --git a/scm-core/src/main/java/sonia/scm/xml/XmlMapStringAdapter.java b/scm-core/src/main/java/sonia/scm/xml/XmlMapStringAdapter.java
index ab6cd83ccc..04d04fae60 100644
--- a/scm-core/src/main/java/sonia/scm/xml/XmlMapStringAdapter.java
+++ b/scm-core/src/main/java/sonia/scm/xml/XmlMapStringAdapter.java
@@ -102,7 +102,7 @@ public class XmlMapStringAdapter
   public Map<String, String> unmarshal(XmlMapStringElement[] elements)
           throws Exception
   {
-    Map<String, String> map = new HashMap<String, String>();
+    Map<String, String> map = new HashMap<>();
 
     if (elements != null)
     {
diff --git a/scm-core/src/main/java/sonia/scm/xml/XmlSetStringAdapter.java b/scm-core/src/main/java/sonia/scm/xml/XmlSetStringAdapter.java
index 708159bfac..8d088aa205 100644
--- a/scm-core/src/main/java/sonia/scm/xml/XmlSetStringAdapter.java
+++ b/scm-core/src/main/java/sonia/scm/xml/XmlSetStringAdapter.java
@@ -90,7 +90,7 @@ public class XmlSetStringAdapter extends XmlAdapter<String, Set<String>>
   @Override
   public Set<String> unmarshal(String rawString) throws Exception
   {
-    Set<String> tokens = new HashSet<String>();
+    Set<String> tokens = new HashSet<>();
 
     for (String token : rawString.split(","))
     {
diff --git a/scm-core/src/test/java/sonia/scm/collect/IterableQueueTest.java b/scm-core/src/test/java/sonia/scm/collect/IterableQueueTest.java
index ade4f3247b..130924fcd4 100644
--- a/scm-core/src/test/java/sonia/scm/collect/IterableQueueTest.java
+++ b/scm-core/src/test/java/sonia/scm/collect/IterableQueueTest.java
@@ -63,7 +63,7 @@ public class IterableQueueTest
   @Test(expected = IllegalStateException.class)
   public void testDuplicatedEndReached()
   {
-    IterableQueue<String> queue = new IterableQueue<String>();
+    IterableQueue<String> queue = new IterableQueue<>();
 
     queue.endReached();
     queue.endReached();
@@ -76,7 +76,7 @@ public class IterableQueueTest
   @Test
   public void testIterator()
   {
-    IterableQueue<String> queue = new IterableQueue<String>();
+    IterableQueue<String> queue = new IterableQueue<>();
 
     assertEquals(QueueIterator.class, queue.iterator().getClass());
     queue.endReached();
@@ -120,7 +120,7 @@ public class IterableQueueTest
   @Test(expected = IllegalStateException.class)
   public void testPushEndReached()
   {
-    IterableQueue<String> queue = new IterableQueue<String>();
+    IterableQueue<String> queue = new IterableQueue<>();
 
     queue.push("a");
     queue.endReached();
@@ -134,7 +134,7 @@ public class IterableQueueTest
   @Test
   public void testSingleConsumer()
   {
-    final IterableQueue<Integer> queue = new IterableQueue<Integer>();
+    final IterableQueue<Integer> queue = new IterableQueue<>();
 
     new Thread(new IntegerProducer(queue, false, 100)).start();
     assertResult(Lists.newArrayList(queue), 100);
@@ -176,12 +176,12 @@ public class IterableQueueTest
     ExecutorService executor = Executors.newFixedThreadPool(threads);
     List<Future<List<Integer>>> futures = Lists.newArrayList();
 
-    final IterableQueue<Integer> queue = new IterableQueue<Integer>();
+    final IterableQueue<Integer> queue = new IterableQueue<>();
 
     for (int i = 0; i < consumer; i++)
     {
       Future<List<Integer>> future =
-        executor.submit(new CallableQueueCollector<Integer>(queue));
+        executor.submit(new CallableQueueCollector<>(queue));
 
       futures.add(future);
     }
diff --git a/scm-core/src/test/java/sonia/scm/template/TemplateEngineFactoryTest.java b/scm-core/src/test/java/sonia/scm/template/TemplateEngineFactoryTest.java
index b676b4bbaf..775f9f0814 100644
--- a/scm-core/src/test/java/sonia/scm/template/TemplateEngineFactoryTest.java
+++ b/scm-core/src/test/java/sonia/scm/template/TemplateEngineFactoryTest.java
@@ -128,7 +128,7 @@ public class TemplateEngineFactoryTest
     assertTrue(engines.contains(engine1));
     assertTrue(engines.contains(engine2));
 
-    Set<TemplateEngine> ce = new HashSet<TemplateEngine>();
+    Set<TemplateEngine> ce = new HashSet<>();
 
     ce.add(engine1);
     factory = new TemplateEngineFactory(ce, engine2);
diff --git a/scm-core/src/test/java/sonia/scm/url/WUIModelUrlProviderTest.java b/scm-core/src/test/java/sonia/scm/url/WUIModelUrlProviderTest.java
index b6073a841a..24b2d6d11f 100644
--- a/scm-core/src/test/java/sonia/scm/url/WUIModelUrlProviderTest.java
+++ b/scm-core/src/test/java/sonia/scm/url/WUIModelUrlProviderTest.java
@@ -50,7 +50,7 @@ public class WUIModelUrlProviderTest extends ModelUrlProviderTestBase
    */
   public WUIModelUrlProviderTest()
   {
-    modelMap = new HashMap<String, String>();
+    modelMap = new HashMap<>();
     modelMap.put(MODEL_REPOSITORY, "repositoryPanel");
     modelMap.put(MODEL_USERS, "userPanel");
     modelMap.put(MODEL_GROUPS, "groupPanel");
diff --git a/scm-dao-xml/src/main/java/sonia/scm/group/xml/XmlGroupDatabase.java b/scm-dao-xml/src/main/java/sonia/scm/group/xml/XmlGroupDatabase.java
index 431d53594a..e4d436283c 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/group/xml/XmlGroupDatabase.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/group/xml/XmlGroupDatabase.java
@@ -199,7 +199,7 @@ public class XmlGroupDatabase implements XmlDatabase<Group>
   /** Field description */
   @XmlJavaTypeAdapter(XmlGroupMapAdapter.class)
   @XmlElement(name = "groups")
-  private Map<String, Group> groupMap = new LinkedHashMap<String, Group>();
+  private Map<String, Group> groupMap = new LinkedHashMap<>();
 
   /** Field description */
   private Long lastModified;
diff --git a/scm-dao-xml/src/main/java/sonia/scm/group/xml/XmlGroupList.java b/scm-dao-xml/src/main/java/sonia/scm/group/xml/XmlGroupList.java
index da14968d30..c889944fc4 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/group/xml/XmlGroupList.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/group/xml/XmlGroupList.java
@@ -72,7 +72,7 @@ public class XmlGroupList implements Iterable<Group>
    */
   public XmlGroupList(Map<String, Group> groupMap)
   {
-    this.groups = new LinkedList<Group>(groupMap.values());
+    this.groups = new LinkedList<>(groupMap.values());
   }
 
   //~--- methods --------------------------------------------------------------
diff --git a/scm-dao-xml/src/main/java/sonia/scm/group/xml/XmlGroupMapAdapter.java b/scm-dao-xml/src/main/java/sonia/scm/group/xml/XmlGroupMapAdapter.java
index b79c8836d2..430d0a84a8 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/group/xml/XmlGroupMapAdapter.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/group/xml/XmlGroupMapAdapter.java
@@ -81,7 +81,7 @@ public class XmlGroupMapAdapter
   @Override
   public Map<String, Group> unmarshal(XmlGroupList groups) throws Exception
   {
-    Map<String, Group> groupMap = new LinkedHashMap<String, Group>();
+    Map<String, Group> groupMap = new LinkedHashMap<>();
 
     for (Group group : groups)
     {
diff --git a/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java b/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java
index a5c599c291..8f065a5ca2 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java
@@ -298,6 +298,5 @@ public class XmlRepositoryDatabase implements XmlDatabase<Repository>
   /** Field description */
   @XmlJavaTypeAdapter(XmlRepositoryMapAdapter.class)
   @XmlElement(name = "repositories")
-  private Map<String, Repository> repositoryMap = new LinkedHashMap<String,
-                                                    Repository>();
+  private Map<String, Repository> repositoryMap = new LinkedHashMap<>();
 }
diff --git a/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryList.java b/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryList.java
index d9807e9188..085d65476a 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryList.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryList.java
@@ -72,7 +72,7 @@ public class XmlRepositoryList implements Iterable<Repository>
    */
   public XmlRepositoryList(Map<String, Repository> repositoryMap)
   {
-    this.repositories = new LinkedList<Repository>(repositoryMap.values());
+    this.repositories = new LinkedList<>(repositoryMap.values());
   }
 
   //~--- methods --------------------------------------------------------------
diff --git a/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java b/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java
index a90a2d4fa9..c31a0cd26d 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java
@@ -83,8 +83,7 @@ public class XmlRepositoryMapAdapter
   public Map<String, Repository> unmarshal(XmlRepositoryList repositories)
           throws Exception
   {
-    Map<String, Repository> repositoryMap = new LinkedHashMap<String,
-                                              Repository>();
+    Map<String, Repository> repositoryMap = new LinkedHashMap<>();
 
     for (Repository repository : repositories)
     {
diff --git a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStore.java b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStore.java
index 6a9098b545..f1f3040883 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStore.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStore.java
@@ -436,8 +436,8 @@ public class JAXBConfigurationEntryStore<V> implements ConfigurationEntryStore<V
         writer.writeEndElement();
 
         // value
-        JAXBElement<V> je = new JAXBElement<V>(QName.valueOf(TAG_VALUE), type,
-                              e.getValue());
+        JAXBElement<V> je = new JAXBElement<>(QName.valueOf(TAG_VALUE), type,
+                                              e.getValue());
 
         m.marshal(je, writer);
 
diff --git a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStoreFactory.java b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStoreFactory.java
index bf5dae720f..69ac5784cb 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStoreFactory.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStoreFactory.java
@@ -102,9 +102,9 @@ public class JAXBConfigurationEntryStoreFactory
       type, name);
 
     //J-
-    return new JAXBConfigurationEntryStore<T>(
-      new File(directory,name.concat(StoreConstants.FILE_EXTENSION)), 
-      keyGenerator, 
+    return new JAXBConfigurationEntryStore<>(
+      new File(directory, name.concat(StoreConstants.FILE_EXTENSION)),
+      keyGenerator,
       type
     );
     //J+
diff --git a/scm-dao-xml/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java b/scm-dao-xml/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java
index 579856fce7..2306fd588b 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java
@@ -202,5 +202,5 @@ public class XmlUserDatabase implements XmlDatabase<User>
   /** Field description */
   @XmlJavaTypeAdapter(XmlUserMapAdapter.class)
   @XmlElement(name = "users")
-  private Map<String, User> userMap = new LinkedHashMap<String, User>();
+  private Map<String, User> userMap = new LinkedHashMap<>();
 }
diff --git a/scm-dao-xml/src/main/java/sonia/scm/user/xml/XmlUserList.java b/scm-dao-xml/src/main/java/sonia/scm/user/xml/XmlUserList.java
index e76f008b92..6877d8544e 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/user/xml/XmlUserList.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/user/xml/XmlUserList.java
@@ -72,7 +72,7 @@ public class XmlUserList implements Iterable<User>
    */
   public XmlUserList(Map<String, User> userMap)
   {
-    this.users = new LinkedList<User>(userMap.values());
+    this.users = new LinkedList<>(userMap.values());
   }
 
   //~--- methods --------------------------------------------------------------
diff --git a/scm-dao-xml/src/main/java/sonia/scm/user/xml/XmlUserMapAdapter.java b/scm-dao-xml/src/main/java/sonia/scm/user/xml/XmlUserMapAdapter.java
index f5573310d5..0c2386f37c 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/user/xml/XmlUserMapAdapter.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/user/xml/XmlUserMapAdapter.java
@@ -81,7 +81,7 @@ public class XmlUserMapAdapter
   @Override
   public Map<String, User> unmarshal(XmlUserList users) throws Exception
   {
-    Map<String, User> userMap = new LinkedHashMap<String, User>();
+    Map<String, User> userMap = new LinkedHashMap<>();
 
     for (User user : users)
     {
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitChangesetConverter.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitChangesetConverter.java
index a59e3b5754..4838f8ec23 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitChangesetConverter.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitChangesetConverter.java
@@ -198,7 +198,7 @@ public class GitChangesetConverter implements Closeable
 
     if (Util.isNotEmpty(parents))
     {
-      parentList = new ArrayList<String>();
+      parentList = new ArrayList<>();
 
       for (RevCommit parent : parents)
       {
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitSubModuleParser.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitSubModuleParser.java
index 7244a1f2bb..d5ed9cb500 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitSubModuleParser.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitSubModuleParser.java
@@ -71,8 +71,7 @@ public final class GitSubModuleParser
    */
   public static Map<String, SubRepository> parse(String content)
   {
-    Map<String, SubRepository> subRepositories = new HashMap<String,
-                                                   SubRepository>();
+    Map<String, SubRepository> subRepositories = new HashMap<>();
     Scanner scanner = new Scanner(content);
     SubRepository repository = null;
 
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBlameCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBlameCommand.java
index c797fd70eb..51f6974daa 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBlameCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBlameCommand.java
@@ -137,7 +137,7 @@ public class GitBlameCommand extends AbstractGitCommand implements BlameCommand
               request.getPath()));
       }
 
-      List<BlameLine> blameLines = new ArrayList<BlameLine>();
+      List<BlameLine> blameLines = new ArrayList<>();
       int total = gitBlameResult.getResultContents().size();
       int i = 0;
 
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageReader.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageReader.java
index d16f056889..cb09c32870 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageReader.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageReader.java
@@ -145,7 +145,7 @@ public class HgPackageReader
    */
   private void filterPackage(HgPackages packages)
   {
-    List<HgPackage> pkgList = new ArrayList<HgPackage>();
+    List<HgPackage> pkgList = new ArrayList<>();
 
     for (HgPackage pkg : packages)
     {
@@ -228,7 +228,7 @@ public class HgPackageReader
     if (packages == null)
     {
       packages = new HgPackages();
-      packages.setPackages(new ArrayList<HgPackage>());
+      packages.setPackages(new ArrayList<>());
     }
 
     return packages;
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/WindowsHgInstaller.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/WindowsHgInstaller.java
index 19df6f43d6..528f6b941a 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/WindowsHgInstaller.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/WindowsHgInstaller.java
@@ -282,7 +282,7 @@ public class WindowsHgInstaller extends AbstractHgInstaller
    */
   private List<String> getInstallations(String[] registryKeys)
   {
-    List<String> installations = new ArrayList<String>();
+    List<String> installations = new ArrayList<>();
 
     for (String registryKey : registryKeys)
     {
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/AbstractHgHandler.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/AbstractHgHandler.java
index 5f0e721594..1d54d0ad87 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/AbstractHgHandler.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/AbstractHgHandler.java
@@ -174,7 +174,7 @@ public class AbstractHgHandler
    */
   protected Process createHgProcess(String... args) throws IOException
   {
-    return createHgProcess(new HashMap<String, String>(), args);
+    return createHgProcess(new HashMap<>(), args);
   }
 
   /**
@@ -262,7 +262,7 @@ public class AbstractHgHandler
     throws IOException, RepositoryException
   {
     return getResultFromScript(resultType, script,
-      new HashMap<String, String>());
+                               new HashMap<>());
   }
 
   /**
@@ -315,7 +315,7 @@ public class AbstractHgHandler
     throws IOException
   {
     HgConfig config = handler.getConfig();
-    List<String> cmdList = new ArrayList<String>();
+    List<String> cmdList = new ArrayList<>();
 
     cmdList.add(cmd);
 
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java
index af485d19df..6dbba81a16 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java
@@ -168,7 +168,7 @@ public class HgLogCommand extends AbstractCommand implements LogCommand
       {
 
         // empty repository
-        result = new ChangesetPagingResult(0, new ArrayList<Changeset>());
+        result = new ChangesetPagingResult(0, new ArrayList<>());
       }
     }
 
diff --git a/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java b/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java
index 86b3de5615..054ef892ea 100644
--- a/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java
+++ b/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java
@@ -282,7 +282,7 @@ public abstract class UserManagerTestBase
     throws UserException, IOException, InterruptedException
   {
     int initialSize = manager.getAll().size();
-    List<MultiThreadTester> testers = new ArrayList<MultiThreadTester>();
+    List<MultiThreadTester> testers = new ArrayList<>();
 
     for (int i = 0; i < THREAD_COUNT; i++)
     {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/UriExtensionsConfig.java b/scm-webapp/src/main/java/sonia/scm/api/rest/UriExtensionsConfig.java
index 637866ad61..d0b44a1ce1 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/UriExtensionsConfig.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/UriExtensionsConfig.java
@@ -101,7 +101,7 @@ public class UriExtensionsConfig extends PackagesResourceConfig
   {
     if (mediaTypeMap == null)
     {
-      mediaTypeMap = new HashMap<String, MediaType>();
+      mediaTypeMap = new HashMap<>();
       mediaTypeMap.put(EXTENSION_JSON, MediaType.APPLICATION_JSON_TYPE);
       mediaTypeMap.put(EXTENSION_XML, MediaType.APPLICATION_XML_TYPE);
     }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
index d6bb92d233..8b52d693ed 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
@@ -320,7 +320,7 @@ public class RepositoryImportResource
   {
     SecurityUtils.getSubject().checkRole(Role.ADMIN);
 
-    List<Repository> repositories = new ArrayList<Repository>();
+    List<Repository> repositories = new ArrayList<>();
 
     importFromDirectory(repositories, type);
 
@@ -354,7 +354,7 @@ public class RepositoryImportResource
 
     logger.info("start directory import for all supported repository types");
 
-    List<Repository> repositories = new ArrayList<Repository>();
+    List<Repository> repositories = new ArrayList<>();
 
     for (Type t : findImportableTypes())
     {
@@ -628,7 +628,7 @@ public class RepositoryImportResource
    */
   private List<Type> findImportableTypes()
   {
-    List<Type> types = new ArrayList<Type>();
+    List<Type> types = new ArrayList<>();
     Collection<Type> handlerTypes = manager.getTypes();
 
     for (Type t : handlerTypes)
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
index ad092911ee..1ae31fcebf 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
@@ -1028,7 +1028,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
     {
       if (repository.getPermissions() == null)
       {
-        repository.setPermissions(new ArrayList<Permission>());
+        repository.setPermissions(new ArrayList<>());
       }
     }
     else
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/SearchResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/SearchResource.java
index b08a2aaace..4b05493d3a 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/SearchResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/SearchResource.java
@@ -98,14 +98,14 @@ public class SearchResource
     // create user searchhandler
     Cache<String, SearchResults> userCache = cacheManager.getCache(CACHE_USER);
 
-    this.userSearchHandler = new SearchHandler<User>(userCache, userManager);
+    this.userSearchHandler = new SearchHandler<>(userCache, userManager);
 
     // create group searchhandler
     Cache<String, SearchResults> groupCache =
       cacheManager.getCache(CACHE_GROUP);
 
-    this.groupSearchHandler = new SearchHandler<Group>(groupCache,
-      groupManager);
+    this.groupSearchHandler = new SearchHandler<>(groupCache,
+                                                  groupManager);
   }
 
   //~--- methods --------------------------------------------------------------
diff --git a/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManager.java b/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManager.java
index 43e86c762c..94abbc6e7e 100644
--- a/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManager.java
@@ -140,7 +140,7 @@ public class GuavaCacheManager
       logger.debug(
         "cache {} does not exists, creating a new instance from default configuration: {}",
         name, defaultConfiguration);
-      cache = new GuavaCache<K, V>(defaultConfiguration, name);
+      cache = new GuavaCache<>(defaultConfiguration, name);
       cacheMap.put(name, cache);
     }
 
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/MultiParentClassLoader.java b/scm-webapp/src/main/java/sonia/scm/plugin/MultiParentClassLoader.java
index 5881652ec4..ebd8b6e24e 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/MultiParentClassLoader.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/MultiParentClassLoader.java
@@ -74,7 +74,7 @@ public class MultiParentClassLoader extends ClassLoader
   public MultiParentClassLoader(Collection<? extends ClassLoader> parents)
   {
     super(null);
-    this.parents = new CopyOnWriteArrayList<ClassLoader>(parents);
+    this.parents = new CopyOnWriteArrayList<>(parents);
   }
 
   //~--- get methods ----------------------------------------------------------
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/UberClassLoader.java b/scm-webapp/src/main/java/sonia/scm/plugin/UberClassLoader.java
index 6906afc7d4..ba25fe8c65 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/UberClassLoader.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/UberClassLoader.java
@@ -100,7 +100,7 @@ public final class UberClassLoader extends ClassLoader
 
         if (clazz != null)
         {
-          cache.put(name, new WeakReference<Class<?>>(clazz));
+          cache.put(name, new WeakReference<>(clazz));
 
           break;
         }
diff --git a/scm-webapp/src/main/java/sonia/scm/template/ErrorServlet.java b/scm-webapp/src/main/java/sonia/scm/template/ErrorServlet.java
index 4d62b823a1..726ab33032 100644
--- a/scm-webapp/src/main/java/sonia/scm/template/ErrorServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/template/ErrorServlet.java
@@ -153,7 +153,7 @@ public class ErrorServlet extends HttpServlet
     {
       writer = response.getWriter();
 
-      Map<String, Object> env = new HashMap<String, Object>();
+      Map<String, Object> env = new HashMap<>();
       String error = Util.EMPTY_STRING;
 
       if (context.getStartupError() != null)
diff --git a/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java b/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java
index 89e6baa685..902755f1f9 100644
--- a/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java
@@ -129,7 +129,7 @@ public class TemplateServlet extends HttpServlet
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
     throws ServletException, IOException
   {
-    Map<String, Object> params = new HashMap<String, Object>();
+    Map<String, Object> params = new HashMap<>();
     String contextPath = request.getContextPath();
 
     params.put("contextPath", contextPath);
diff --git a/scm-webapp/src/test/java/sonia/scm/it/GetRepositoriesITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GetRepositoriesITCase.java
index 6978c897f8..5ffe144158 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/GetRepositoriesITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/GetRepositoriesITCase.java
@@ -90,7 +90,7 @@ public class GetRepositoriesITCase extends AbstractAdminITCaseBase
   @Parameters
   public static Collection<String[]> createParameters()
   {
-    Collection<String[]> params = new ArrayList<String[]>();
+    Collection<String[]> params = new ArrayList<>();
 
     params.add(new String[] { "git" });
     params.add(new String[] { "svn" });
diff --git a/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java
index e95f613f2a..175d58b45d 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java
@@ -89,7 +89,7 @@ public class GroupITCase extends AbstractAdminITCaseBase
     group.setName("group-a");
     group.setDescription("group a");
 
-    List<String> members = new ArrayList<String>();
+    List<String> members = new ArrayList<>();
 
     members.add("slarti");
     members.add("marvin");
@@ -110,7 +110,7 @@ public class GroupITCase extends AbstractAdminITCaseBase
     group.setName("group-b");
     group.setDescription("group b");
 
-    List<String> members = new ArrayList<String>();
+    List<String> members = new ArrayList<>();
 
     members.add("slarti");
     members.add("dent");
diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java
index 8e356152be..3ba12fc282 100644
--- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java
@@ -59,7 +59,7 @@ public class RepositoryTypeITCaseBase
   @Parameters
   public static Collection<String[]> createParameters()
   {
-    Collection<String[]> params = new ArrayList<String[]>();
+    Collection<String[]> params = new ArrayList<>();
 
     params.add(new String[] { "git" });
     params.add(new String[] { "svn" });
diff --git a/scm-webapp/src/test/java/sonia/scm/net/ahc/DefaultAdvancedHttpClientTest.java b/scm-webapp/src/test/java/sonia/scm/net/ahc/DefaultAdvancedHttpClientTest.java
index faac9a99e5..2fa9748dd4 100644
--- a/scm-webapp/src/test/java/sonia/scm/net/ahc/DefaultAdvancedHttpClientTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/net/ahc/DefaultAdvancedHttpClientTest.java
@@ -284,7 +284,7 @@ public class DefaultAdvancedHttpClientTest
   public void setUp()
   {
     configuration = new ScmConfiguration();
-    transformers = new HashSet<ContentTransformer>();
+    transformers = new HashSet<>();
     client = new TestingAdvacedHttpClient(configuration, transformers);
   }
 
diff --git a/scm-webapp/src/test/java/sonia/scm/plugin/DefaultUberWebResourceLoaderTest.java b/scm-webapp/src/test/java/sonia/scm/plugin/DefaultUberWebResourceLoaderTest.java
index 19db037a9a..43f53e3814 100644
--- a/scm-webapp/src/test/java/sonia/scm/plugin/DefaultUberWebResourceLoaderTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/plugin/DefaultUberWebResourceLoaderTest.java
@@ -111,7 +111,7 @@ public class DefaultUberWebResourceLoaderTest extends WebResourceLoaderTestBase
 
     DefaultUberWebResourceLoader resourceLoader =
       new DefaultUberWebResourceLoader(servletContext,
-        new ArrayList<PluginWrapper>());
+                                       new ArrayList<>());
 
     resourceLoader.getCache().put("/myresource", GITHUB);
 
@@ -152,7 +152,7 @@ public class DefaultUberWebResourceLoaderTest extends WebResourceLoaderTestBase
 
     WebResourceLoader resourceLoader =
       new DefaultUberWebResourceLoader(servletContext,
-        new ArrayList<PluginWrapper>());
+                                       new ArrayList<>());
     URL resource = resourceLoader.getResource("/myresource");
 
     assertSame(SCM_MANAGER, resource);
diff --git a/scm-webapp/src/test/java/sonia/scm/plugin/PluginTreeTest.java b/scm-webapp/src/test/java/sonia/scm/plugin/PluginTreeTest.java
index 31e008b42d..54765934dd 100644
--- a/scm-webapp/src/test/java/sonia/scm/plugin/PluginTreeTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/plugin/PluginTreeTest.java
@@ -66,7 +66,7 @@ public class PluginTreeTest
   public void testPluginConditionFailed() throws IOException
   {
     PluginCondition condition = new PluginCondition("999",
-                                  new ArrayList<String>(), "hit");
+                                                    new ArrayList<>(), "hit");
     Plugin plugin = new Plugin(2, createInfo("a", "b", "1"), null, condition,
                       false, null);
     ExplodedSmp smp = createSmp(plugin);