diff --git a/pom.xml b/pom.xml
index 324f025f69..26291e1f66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,6 +182,7 @@
           <source>${project.build.javaLevel}</source>
           <target>${project.build.javaLevel}</target>
           <encoding>${project.build.sourceEncoding}</encoding>
+           <compilerArgument>-Xlint:unchecked</compilerArgument>
         </configuration>
       </plugin>
 
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 a59c7ffaa4..3f8e1f74fb 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
@@ -205,6 +205,7 @@ public class SubCommandHandler
    *
    * @param line
    */
+  @SuppressWarnings("unchecked")
   private void parseLine(String line)
   {
     line = line.trim();
diff --git a/scm-core/src/main/java/sonia/scm/group/GroupNames.java b/scm-core/src/main/java/sonia/scm/group/GroupNames.java
index d6b6d0d6ee..acd75a0319 100644
--- a/scm-core/src/main/java/sonia/scm/group/GroupNames.java
+++ b/scm-core/src/main/java/sonia/scm/group/GroupNames.java
@@ -70,6 +70,7 @@ public final class GroupNames implements Serializable, Iterable<String>
    * Constructs ...
    *
    */
+  @SuppressWarnings("unchecked")
   public GroupNames()
   {
     this.collection = Collections.EMPTY_LIST;
diff --git a/scm-core/src/main/java/sonia/scm/io/DeepCopy.java b/scm-core/src/main/java/sonia/scm/io/DeepCopy.java
index 0db3da01aa..a7d5a31bbe 100644
--- a/scm-core/src/main/java/sonia/scm/io/DeepCopy.java
+++ b/scm-core/src/main/java/sonia/scm/io/DeepCopy.java
@@ -65,6 +65,7 @@ public final class DeepCopy
    *
    * @throws IOException
    */
+  @SuppressWarnings("unchecked")
   public static <T> T copy(T orig) throws IOException
   {
     T obj = null;
diff --git a/scm-core/src/main/java/sonia/scm/plugin/ext/AnnotatedClass.java b/scm-core/src/main/java/sonia/scm/plugin/ext/AnnotatedClass.java
index 4bdcf5be35..36deb8098d 100644
--- a/scm-core/src/main/java/sonia/scm/plugin/ext/AnnotatedClass.java
+++ b/scm-core/src/main/java/sonia/scm/plugin/ext/AnnotatedClass.java
@@ -76,6 +76,7 @@ public class AnnotatedClass<T extends Annotation>
    * @return
    */
   @Override
+  @SuppressWarnings("unchecked")
   public boolean equals(Object obj)
   {
     if (obj == null)
diff --git a/scm-core/src/main/java/sonia/scm/repository/CacheClearHook.java b/scm-core/src/main/java/sonia/scm/repository/CacheClearHook.java
index 8ad08df9f1..4f66ef59e4 100644
--- a/scm-core/src/main/java/sonia/scm/repository/CacheClearHook.java
+++ b/scm-core/src/main/java/sonia/scm/repository/CacheClearHook.java
@@ -76,6 +76,7 @@ public class CacheClearHook
    *
    * @param predicate
    */
+  @SuppressWarnings("unchecked")
   public void clearCache(Predicate predicate)
   {
     if (predicate != null)
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java
index 41c28c8dea..632b54b741 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java
@@ -184,6 +184,7 @@ public class RepositoryManagerDecorator
    * @return
    */
   @Override
+  @SuppressWarnings("unchecked")
   public RepositoryHandler getHandler(String type)
   {
     return decorated.getHandler(type);
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryType.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryType.java
index 75e264fdb7..969b14d042 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryType.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryType.java
@@ -67,6 +67,7 @@ public class RepositoryType extends Type
    * @param displayName display name of the type
    * @param supportedCommands supported commands of the type
    */
+  @SuppressWarnings("unchecked")
   public RepositoryType(String name, String displayName,
     Set<Command> supportedCommands)
   {
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java b/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java
index f29af95ef2..42dd6a2b15 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java
@@ -202,6 +202,7 @@ public abstract class RepositoryServiceProvider implements Closeable
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   public Set<Feature> getSupportedFeatures()
   {
     return Collections.EMPTY_SET;
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 5dd6ac4a6a..f946385644 100644
--- a/scm-core/src/main/java/sonia/scm/util/Util.java
+++ b/scm-core/src/main/java/sonia/scm/util/Util.java
@@ -84,6 +84,7 @@ public final class Util
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   public static <T extends Comparable> int compare(T object, T otherObject)
   {
     int result = 0;
@@ -268,7 +269,7 @@ public final class Util
     int limit)
   {
     List<T> result = new ArrayList<T>();
-    List<T> valueList = new ArrayList(values);
+    List<T> valueList = new ArrayList<T>(values);
 
     if (comparator != null)
     {
diff --git a/scm-core/src/main/java/sonia/scm/web/proxy/ProxyConfiguration.java b/scm-core/src/main/java/sonia/scm/web/proxy/ProxyConfiguration.java
index 3b4787f9b9..71e39e13dd 100644
--- a/scm-core/src/main/java/sonia/scm/web/proxy/ProxyConfiguration.java
+++ b/scm-core/src/main/java/sonia/scm/web/proxy/ProxyConfiguration.java
@@ -163,6 +163,7 @@ public class ProxyConfiguration
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   public Set<String> getRequestHeaderExcludes()
   {
     if (requestHeaderExcludes == null)
@@ -179,6 +180,7 @@ public class ProxyConfiguration
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   public Set<String> getResponseHeaderExcludes()
   {
     if (responseHeaderExcludes == null)
diff --git a/scm-core/src/main/java/sonia/scm/web/proxy/ProxyServlet.java b/scm-core/src/main/java/sonia/scm/web/proxy/ProxyServlet.java
index 653e48fb18..1d865dc4bc 100644
--- a/scm-core/src/main/java/sonia/scm/web/proxy/ProxyServlet.java
+++ b/scm-core/src/main/java/sonia/scm/web/proxy/ProxyServlet.java
@@ -203,6 +203,7 @@ public class ProxyServlet extends HttpServlet
    * @param request
    * @param con
    */
+  @SuppressWarnings("unchecked")
   private void copyRequestHeaders(ProxyConfiguration configuration,
     HttpServletRequest request, HttpURLConnection con)
   {
diff --git a/scm-dao-orientdb/src/main/java/sonia/scm/store/orientdb/OrientDBStore.java b/scm-dao-orientdb/src/main/java/sonia/scm/store/orientdb/OrientDBStore.java
index 23c9ac66dd..077e9fb443 100644
--- a/scm-dao-orientdb/src/main/java/sonia/scm/store/orientdb/OrientDBStore.java
+++ b/scm-dao-orientdb/src/main/java/sonia/scm/store/orientdb/OrientDBStore.java
@@ -118,6 +118,7 @@ public class OrientDBStore<T> extends AbstractStore<T>
    * @return
    */
   @Override
+  @SuppressWarnings("unchecked")
   protected T readObject()
   {
     T result = null;
diff --git a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBDataStore.java b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBDataStore.java
index 40ba0a2053..c772016ee3 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBDataStore.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBDataStore.java
@@ -175,6 +175,7 @@ public class JAXBDataStore<T> extends FileBasedStore<T> implements DataStore<T>
    * @return
    */
   @Override
+  @SuppressWarnings("unchecked")
   protected T read(File file)
   {
     T item = null;
@@ -203,5 +204,5 @@ public class JAXBDataStore<T> extends FileBasedStore<T> implements DataStore<T>
   private JAXBContext context;
 
   /** Field description */
-  private KeyGenerator keyGenerator;
+  private final KeyGenerator keyGenerator;
 }
diff --git a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBStore.java b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBStore.java
index 579a59b410..a668a7ab86 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBStore.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBStore.java
@@ -104,12 +104,10 @@ public class JAXBStore<T> extends AbstractStore<T>
    * @return
    */
   @Override
+  @SuppressWarnings("unchecked")
   protected T readObject()
   {
-    if (logger.isDebugEnabled())
-    {
-      logger.debug("load {} from store {}", type, configFile);
-    }
+    logger.debug("load {} from store {}", type, configFile);
 
     T result = null;
 
@@ -140,7 +138,7 @@ public class JAXBStore<T> extends AbstractStore<T>
     if (logger.isDebugEnabled())
     {
       logger.debug("store {} to {}", object.getClass().getName(),
-                   configFile.getPath());
+        configFile.getPath());
     }
 
     try
diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/security/SecurityModule.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/security/SecurityModule.java
index b902696eef..eaedcab0fc 100644
--- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/security/SecurityModule.java
+++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/security/SecurityModule.java
@@ -155,6 +155,7 @@ public class SecurityModule extends ShiroWebModule
    *
    */
   @Override
+  @SuppressWarnings("unchecked")
   protected void configureShiroWeb()
   {
     bindConstants();
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
index f6e0c9a778..f4a7a06c23 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
@@ -72,6 +72,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import sonia.scm.util.IOUtil;
 
 /**
  *
@@ -99,7 +100,6 @@ public class GitBrowseCommand extends AbstractGitCommand
    *
    * @param context
    * @param repository
-   * @param repositoryDirectory
    */
   public GitBrowseCommand(GitContext context, Repository repository)
   {
@@ -120,6 +120,7 @@ public class GitBrowseCommand extends AbstractGitCommand
    * @throws RepositoryException
    */
   @Override
+  @SuppressWarnings("unchecked")
   public BrowserResult getBrowserResult(BrowseCommandRequest request)
     throws IOException, RepositoryException
   {
@@ -462,6 +463,7 @@ public class GitBrowseCommand extends AbstractGitCommand
    * @throws IOException
    * @throws RepositoryException
    */
+  @SuppressWarnings("unchecked")
   private Map<String,
     SubRepository> getSubRepositories(org.eclipse.jgit.lib.Repository repo,
       ObjectId revision)
@@ -474,10 +476,11 @@ public class GitBrowseCommand extends AbstractGitCommand
     }
 
     Map<String, SubRepository> subRepositories = null;
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    ByteArrayOutputStream baos = null;
 
     try
     {
+      baos = new ByteArrayOutputStream();
       new GitCatCommand(context, repository).getContent(repo, revision,
         PATH_MODULES, baos);
       subRepositories = GitSubModuleParser.parse(baos.toString());
@@ -486,6 +489,8 @@ public class GitBrowseCommand extends AbstractGitCommand
     {
       logger.trace("could not find .gitmodules", ex);
       subRepositories = Collections.EMPTY_MAP;
+    } finally {
+      IOUtil.close(baos);
     }
 
     return subRepositories;
@@ -494,6 +499,6 @@ public class GitBrowseCommand extends AbstractGitCommand
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  private Map<ObjectId, Map<String, SubRepository>> subrepositoryCache =
+  private final Map<ObjectId, Map<String, SubRepository>> subrepositoryCache =
     Maps.newHashMap();
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
index d47dea9440..35ba01f584 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
@@ -163,6 +163,7 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
    * @throws RepositoryException
    */
   @Override
+  @SuppressWarnings("unchecked")
   public ChangesetPagingResult getChangesets(LogCommandRequest request)
     throws IOException, RepositoryException
   {
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 ff4829e046..63c82cbbf8 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
@@ -296,6 +296,7 @@ public class AbstractHgHandler
    * @throws IOException
    * @throws RepositoryException
    */
+  @SuppressWarnings("unchecked")
   protected <T> T getResultFromScript(Class<T> resultType,
     HgPythonScript script, Map<String, String> extraEnv)
     throws IOException, RepositoryException
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgIncomingCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgIncomingCommand.java
index 321e34a7ce..73284d886a 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgIncomingCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgIncomingCommand.java
@@ -91,6 +91,7 @@ public class HgIncomingCommand extends AbstractCommand
    * @throws RepositoryException
    */
   @Override
+  @SuppressWarnings("unchecked")
   public ChangesetPagingResult getIncomingChangesets(
     IncomingCommandRequest request)
     throws RepositoryException
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java
index b2f04d0bc8..1322424198 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java
@@ -91,6 +91,7 @@ public class HgOutgoingCommand extends AbstractCommand
    * @throws RepositoryException
    */
   @Override
+  @SuppressWarnings("unchecked")
   public ChangesetPagingResult getOutgoingChangesets(
     OutgoingCommandRequest request)
     throws RepositoryException
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPullCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPullCommand.java
index 0553fa667d..b8c34e9418 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPullCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPullCommand.java
@@ -86,6 +86,7 @@ public class HgPullCommand extends AbstractCommand implements PullCommand
    * @throws RepositoryException
    */
   @Override
+  @SuppressWarnings("unchecked")
   public PullResponse pull(PullCommandRequest request)
     throws RepositoryException, IOException
   {
@@ -109,5 +110,5 @@ public class HgPullCommand extends AbstractCommand implements PullCommand
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  private HgRepositoryHandler handler;
+  private final HgRepositoryHandler handler;
 }
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPushCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPushCommand.java
index 5025914484..01ae9572fa 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPushCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPushCommand.java
@@ -86,6 +86,7 @@ public class HgPushCommand extends AbstractCommand implements PushCommand
    * @throws RepositoryException
    */
   @Override
+  @SuppressWarnings("unchecked")
   public PushResponse push(PushCommandRequest request)
     throws RepositoryException, IOException
   {
@@ -109,5 +110,5 @@ public class HgPushCommand extends AbstractCommand implements PushCommand
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  private HgRepositoryHandler handler;
+  private final HgRepositoryHandler handler;
 }
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
index a9346b3027..63992c2e71 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
@@ -215,6 +215,7 @@ public class HgCGIServlet extends HttpServlet
    * @param env
    * @param session
    */
+  @SuppressWarnings("unchecked")
   private void passSessionAttributes(EnvList env, HttpSession session)
   {
     Enumeration<String> enm = session.getAttributeNames();
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameHandler.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameHandler.java
index 7c50a67eda..7eabf39ab1 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameHandler.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameHandler.java
@@ -189,6 +189,7 @@ public class SvnBlameHandler implements ISVNAnnotateHandler
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   private String getDescription(long revision)
   {
     String description = descriptionCache.get(revision);
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/AbstractSvnHookChangesetProvider.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/AbstractSvnHookChangesetProvider.java
index 745ffa7e0d..189dfbaa0f 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/AbstractSvnHookChangesetProvider.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/AbstractSvnHookChangesetProvider.java
@@ -77,6 +77,7 @@ public abstract class AbstractSvnHookChangesetProvider
    * @return
    */
   @Override
+  @SuppressWarnings("unchecked")
   public synchronized HookChangesetResponse handleRequest(
     HookChangesetRequest request)
   {
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
index bda84d4682..ef9ddfbaf0 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
@@ -106,6 +106,7 @@ public class SvnBrowseCommand extends AbstractSvnCommand
    * @throws RepositoryException
    */
   @Override
+  @SuppressWarnings("unchecked")
   public BrowserResult getBrowserResult(BrowseCommandRequest request)
     throws IOException, RepositoryException
   {
@@ -172,6 +173,7 @@ public class SvnBrowseCommand extends AbstractSvnCommand
    *
    * @throws SVNException
    */
+  @SuppressWarnings("unchecked")
   private void browseRecursive(SVNRepository svnRepository,
     long revisionNumber, BrowseCommandRequest request,
     List<FileObject> children, Collection<SVNDirEntry> entries, String basePath)
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java
index df9fc9f76f..b568cde7ee 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java
@@ -102,6 +102,7 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand
    * @throws RepositoryException
    */
   @Override
+  @SuppressWarnings("unchecked")
   public Changeset getChangeset(String revision)
     throws IOException, RepositoryException
   {
@@ -149,6 +150,7 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand
    * @throws RepositoryException
    */
   @Override
+  @SuppressWarnings("unchecked")
   public ChangesetPagingResult getChangesets(LogCommandRequest request)
     throws IOException, RepositoryException
   {
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnPostReceiveHookChangesetProvier.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnPostReceiveHookChangesetProvier.java
index f19fc419ca..20c1beb6fd 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnPostReceiveHookChangesetProvier.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnPostReceiveHookChangesetProvier.java
@@ -105,6 +105,7 @@ public class SvnPostReceiveHookChangesetProvier
    * @return
    */
   @Override
+  @SuppressWarnings("unchecked")
   protected Changeset fetchChangeset()
   {
     Changeset changeset = null;
diff --git a/scm-test/src/main/java/sonia/scm/cache/MapCacheManager.java b/scm-test/src/main/java/sonia/scm/cache/MapCacheManager.java
index 036701122e..8aa5f6f8b9 100644
--- a/scm-test/src/main/java/sonia/scm/cache/MapCacheManager.java
+++ b/scm-test/src/main/java/sonia/scm/cache/MapCacheManager.java
@@ -34,7 +34,6 @@ package sonia.scm.cache;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import com.google.common.base.Objects;
 import com.google.common.collect.Maps;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -94,5 +93,6 @@ public class MapCacheManager implements CacheManager
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
+  @SuppressWarnings("unchecked")
   private final Map<String, Cache> cacheMap = Maps.newHashMap();
 }
diff --git a/scm-test/src/main/java/sonia/scm/util/MockUtil.java b/scm-test/src/main/java/sonia/scm/util/MockUtil.java
index 26cc4f8a66..756b2632be 100644
--- a/scm-test/src/main/java/sonia/scm/util/MockUtil.java
+++ b/scm-test/src/main/java/sonia/scm/util/MockUtil.java
@@ -89,6 +89,7 @@ public final class MockUtil
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   public static Subject createAdminSubject()
   {
     Subject subject = mock(Subject.class);
diff --git a/scm-webapp/src/main/java/sonia/scm/ClassOverrides.java b/scm-webapp/src/main/java/sonia/scm/ClassOverrides.java
index 946911bed0..3cc8ce47ef 100644
--- a/scm-webapp/src/main/java/sonia/scm/ClassOverrides.java
+++ b/scm-webapp/src/main/java/sonia/scm/ClassOverrides.java
@@ -219,9 +219,10 @@ public class ClassOverrides implements Iterable<ClassOverride>
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   public List<? extends Module> getModules()
   {
-    List<? extends Module> modules = null;
+    List<? extends Module> modules;
 
     if (Util.isNotEmpty(moduleClasses))
     {
@@ -265,6 +266,7 @@ public class ClassOverrides implements Iterable<ClassOverride>
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   public <T> Class<T> getOverride(Class<T> clazz)
   {
     Class<T> implementation = null;
diff --git a/scm-webapp/src/main/java/sonia/scm/ScmSecurityModule.java b/scm-webapp/src/main/java/sonia/scm/ScmSecurityModule.java
index 68c1c5eefe..4821d4baf9 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmSecurityModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmSecurityModule.java
@@ -72,6 +72,7 @@ public class ScmSecurityModule extends ShiroWebModule
    *
    */
   @Override
+  @SuppressWarnings("unchecked")
   protected void configureShiroWeb()
   {
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java
index 375776472f..599e1dcb30 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java
@@ -538,9 +538,10 @@ public abstract class AbstractManagerResource<T extends ModelObject,
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   private Comparator<T> createComparator(String sortby, boolean desc)
   {
-    Comparator comparator = null;
+    Comparator comparator;
 
     if (desc)
     {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
index 55ba98663b..507ab86b1f 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
@@ -355,6 +355,7 @@ public class AuthenticationResource
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   private ScmState createAnonymousState()
   {
     return createState(SCMContext.ANONYMOUS, Collections.EMPTY_LIST,
@@ -371,6 +372,7 @@ public class AuthenticationResource
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   private ScmState createState(Subject subject)
   {
     PrincipalCollection collection = subject.getPrincipals();
diff --git a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapUtil.java b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapUtil.java
index 5944afda51..7ff693e64e 100644
--- a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapUtil.java
+++ b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapUtil.java
@@ -135,6 +135,7 @@ public final class BootstrapUtil
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   public static <T> T loadClass(ClassLoader classLoader, Class<T> clazz)
   {
     T instance = null;
@@ -162,6 +163,7 @@ public final class BootstrapUtil
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   public static <T> T loadClass(ClassLoader classLoader, Class<T> clazz,
     String className)
   {
@@ -190,6 +192,7 @@ public final class BootstrapUtil
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   public static <T> T loadClass(Class<T> clazz, String className)
   {
     T instance = null;
diff --git a/scm-webapp/src/main/java/sonia/scm/cache/GuavaCache.java b/scm-webapp/src/main/java/sonia/scm/cache/GuavaCache.java
index db700bc344..c3108ab406 100644
--- a/scm-webapp/src/main/java/sonia/scm/cache/GuavaCache.java
+++ b/scm-webapp/src/main/java/sonia/scm/cache/GuavaCache.java
@@ -81,6 +81,7 @@ public class GuavaCache<K, V> implements Cache<K, V>
    * @param configuration
    * @param name
    */
+  @SuppressWarnings("unchecked")
   public GuavaCache(GuavaCacheConfiguration configuration, String name)
   {
     this(GuavaCaches.create(configuration, name),
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 a40c1ed7e7..1c75ea0830 100644
--- a/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManager.java
@@ -125,6 +125,7 @@ public class GuavaCacheManager implements CacheManager
    * @return
    */
   @Override
+  @SuppressWarnings("unchecked")
   public synchronized <K, V> GuavaCache<K, V> getCache(String name)
   {
     logger.trace("try to retrieve cache {}", name);
diff --git a/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManagerConfiguration.java b/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManagerConfiguration.java
index 21f5b9caa9..372dcd7204 100644
--- a/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManagerConfiguration.java
+++ b/scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheManagerConfiguration.java
@@ -79,6 +79,7 @@ public class GuavaCacheManagerConfiguration
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   public List<GuavaNamedCacheConfiguration> getCaches()
   {
     if (caches == null)
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
index 3b299e6623..b379837b49 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
@@ -421,6 +421,7 @@ public class DefaultPluginLoader implements PluginLoader
    *
    * @throws MalformedURLException
    */
+  @SuppressWarnings("unchecked")
   private void locateCoreFile() throws MalformedURLException
   {
     Set<String> paths = servletContext.getResourcePaths(PATH_WEBINFLIB);
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/ext/DefaultAnnotationScanner.java b/scm-webapp/src/main/java/sonia/scm/plugin/ext/DefaultAnnotationScanner.java
index aa71bd297c..ac504bfcae 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/ext/DefaultAnnotationScanner.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/ext/DefaultAnnotationScanner.java
@@ -189,6 +189,7 @@ public class DefaultAnnotationScanner implements AnnotationScanner
    * @param annotation
    * @param managedClass
    */
+  @SuppressWarnings("unchecked")
   private void processAnnotation(Class<?> annotationClass,
     Annotation annotation, Class<?> managedClass)
   {
@@ -317,6 +318,7 @@ public class DefaultAnnotationScanner implements AnnotationScanner
    * @param extensionObjects
    * @param managedClass
    */
+  @SuppressWarnings("unchecked")
   private void processManagedClass(Class<?> managedClass)
   {
     logger.trace("check managed class {} for annotations", managedClass);
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/ext/ExtensionBinder.java b/scm-webapp/src/main/java/sonia/scm/plugin/ext/ExtensionBinder.java
index c485db89cd..57b3a69457 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/ext/ExtensionBinder.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/ext/ExtensionBinder.java
@@ -143,6 +143,7 @@ public class ExtensionBinder
    * @param extensionPointClass
    * @param extensions
    */
+  @SuppressWarnings("unchecked")
   private void bindExtensionPoint(Set<AnnotatedClass<Extension>> found,
     Class extensionPointClass, Set<AnnotatedClass<Extension>> extensions)
   {
@@ -169,6 +170,7 @@ public class ExtensionBinder
    * @param extensionPointClass
    * @param extensions
    */
+  @SuppressWarnings("unchecked")
   private void bindMultiExtensionPoint(Set<AnnotatedClass<Extension>> found,
     Class extensionPointClass, Set<AnnotatedClass<Extension>> extensions)
   {
@@ -221,6 +223,7 @@ public class ExtensionBinder
    * @param extensionPointClass
    * @param extensionClass
    */
+  @SuppressWarnings("unchecked")
   private void bindSingleInstance(Class extensionPointClass,
     Class extensionClass)
   {
diff --git a/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java b/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java
index ded60c79c4..1788c6d76d 100644
--- a/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java
@@ -87,6 +87,7 @@ public class DevelopmentResourceManager extends AbstractResourceManager
    * @param resourceMap
    */
   @Override
+  @SuppressWarnings("unchecked")
   protected void collectResources(Map<ResourceKey, Resource> resourceMap)
   {
     List<String> scripts = getScriptResources();
diff --git a/scm-webapp/src/main/java/sonia/scm/security/DefaultSecuritySystem.java b/scm-webapp/src/main/java/sonia/scm/security/DefaultSecuritySystem.java
index 9987bc0919..8dce05f083 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/DefaultSecuritySystem.java
+++ b/scm-webapp/src/main/java/sonia/scm/security/DefaultSecuritySystem.java
@@ -361,6 +361,7 @@ public class DefaultSecuritySystem implements SecuritySystem
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   private List<PermissionDescriptor> parsePermissionDescriptor(
     JAXBContext context, URL descriptorUrl)
   {
@@ -474,6 +475,7 @@ public class DefaultSecuritySystem implements SecuritySystem
      *
      * @return
      */
+    @SuppressWarnings("unchecked")
     public List<PermissionDescriptor> getPermissions()
     {
       if (permissions == null)
diff --git a/scm-webapp/src/main/java/sonia/scm/util/DebugServlet.java b/scm-webapp/src/main/java/sonia/scm/util/DebugServlet.java
index 80fd563cce..2d934a97df 100644
--- a/scm-webapp/src/main/java/sonia/scm/util/DebugServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/util/DebugServlet.java
@@ -133,6 +133,7 @@ public class DebugServlet extends HttpServlet
    *
    * @param writer
    */
+  @SuppressWarnings("unchecked")
   private void appendContextAttributes(PrintWriter writer)
   {
     writer.append("<h2>ServletContext Attributes</h2>");
@@ -161,6 +162,7 @@ public class DebugServlet extends HttpServlet
    * @param writer
    * @param session
    */
+  @SuppressWarnings("unchecked")
   private void appendSessionAttributes(PrintWriter writer,
     final HttpSession session)
   {
diff --git a/scm-webapp/src/test/java/sonia/scm/cache/CacheManagerTestBase.java b/scm-webapp/src/test/java/sonia/scm/cache/CacheManagerTestBase.java
index 65826b7cee..d2e1ec2213 100644
--- a/scm-webapp/src/test/java/sonia/scm/cache/CacheManagerTestBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/cache/CacheManagerTestBase.java
@@ -103,6 +103,7 @@ public abstract class CacheManagerTestBase<C extends Cache>
    * @throws InterruptedException
    */
   @Test
+  @SuppressWarnings("unchecked")
   public void testSameReferenceMultiThreaded()
     throws InterruptedException, ExecutionException
   {
diff --git a/scm-webapp/src/test/java/sonia/scm/cache/CacheTestUtil.java b/scm-webapp/src/test/java/sonia/scm/cache/CacheTestUtil.java
index 042bcac112..4692d4cd16 100644
--- a/scm-webapp/src/test/java/sonia/scm/cache/CacheTestUtil.java
+++ b/scm-webapp/src/test/java/sonia/scm/cache/CacheTestUtil.java
@@ -57,6 +57,7 @@ public final class CacheTestUtil
    *
    * @return
    */
+  @SuppressWarnings("unchecked")
   public static GuavaCacheManager createDefaultGuavaCacheManager()
   {
     GuavaCacheConfiguration config = new GuavaCacheConfiguration();
diff --git a/scm-webapp/src/test/java/sonia/scm/cache/GuavaCacheCopyTest.java b/scm-webapp/src/test/java/sonia/scm/cache/GuavaCacheCopyTest.java
index f5051d2be4..7323ee22fc 100644
--- a/scm-webapp/src/test/java/sonia/scm/cache/GuavaCacheCopyTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/cache/GuavaCacheCopyTest.java
@@ -52,6 +52,7 @@ public class GuavaCacheCopyTest extends CacheCopyTestBase
    * @return
    */
   @Override
+  @SuppressWarnings("unchecked")
   protected Cache<String, MutableObject> createCache(CopyStrategy strategy)
   {
     return new GuavaCache(CacheBuilder.newBuilder().build(), strategy, "ka");
diff --git a/scm-webapp/src/test/java/sonia/scm/security/ScmRealmTest.java b/scm-webapp/src/test/java/sonia/scm/security/ScmRealmTest.java
index f8c7efbe3e..c1534aff48 100644
--- a/scm-webapp/src/test/java/sonia/scm/security/ScmRealmTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/security/ScmRealmTest.java
@@ -378,6 +378,7 @@ public class ScmRealmTest
    * @param repositories
    * @return
    */
+  @SuppressWarnings("unchecked")
   private ScmRealm createRealm(User user,
     Collection<String> authenticationGroups, Collection<Group> dbGroups,
     Collection<Repository> repositories)