diff --git a/scm-core/src/main/java/sonia/scm/api/v2/resources/ChangesetDto.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/ChangesetDto.java
index 6721aa215c..823df43582 100644
--- a/scm-core/src/main/java/sonia/scm/api/v2/resources/ChangesetDto.java
+++ b/scm-core/src/main/java/sonia/scm/api/v2/resources/ChangesetDto.java
@@ -30,7 +30,6 @@ import de.otto.edison.hal.Links;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import sonia.scm.repository.Signature;
 
 import java.time.Instant;
 import java.util.List;
diff --git a/scm-core/src/main/java/sonia/scm/api/v2/resources/SignatureDto.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/SignatureDto.java
index 1ba2fdc1f0..e25943e025 100644
--- a/scm-core/src/main/java/sonia/scm/api/v2/resources/SignatureDto.java
+++ b/scm-core/src/main/java/sonia/scm/api/v2/resources/SignatureDto.java
@@ -38,6 +38,7 @@ import java.util.Set;
 @Getter
 @Setter
 @NoArgsConstructor
+@SuppressWarnings("squid:S2160")
 public class SignatureDto extends HalRepresentation {
 
   private String keyId;
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
index e954c8088f..d7074b7f4b 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
@@ -135,7 +135,7 @@ public final class RepositoryServiceFactory {
   public RepositoryServiceFactory(ScmConfiguration configuration,
                                   CacheManager cacheManager, RepositoryManager repositoryManager,
                                   Set<RepositoryServiceResolver> resolvers, PreProcessorUtil preProcessorUtil,
-                                  Set<ScmProtocolProvider> protocolProviders, WorkdirProvider workdirProvider) {
+                                  @SuppressWarnings("rawtypes") Set<ScmProtocolProvider> protocolProviders, WorkdirProvider workdirProvider) {
     this(
       configuration, cacheManager, repositoryManager, resolvers,
       preProcessorUtil, protocolProviders, workdirProvider, ScmEventBus.getInstance()
@@ -348,9 +348,7 @@ public final class RepositoryServiceFactory {
       }
 
       RepositoryCacheKeyPredicate predicate = new RepositoryCacheKeyPredicate(repositoryId);
-      caches.forEach((cache) -> {
-        cache.removeAll(predicate);
-      });
+      caches.forEach(cache -> cache.removeAll(predicate));
     }
   }
 
diff --git a/scm-core/src/main/java/sonia/scm/security/NotPublicKeyException.java b/scm-core/src/main/java/sonia/scm/security/NotPublicKeyException.java
index 2433b31429..48a68b17bc 100644
--- a/scm-core/src/main/java/sonia/scm/security/NotPublicKeyException.java
+++ b/scm-core/src/main/java/sonia/scm/security/NotPublicKeyException.java
@@ -29,6 +29,7 @@ import sonia.scm.ContextEntry;
 
 import java.util.List;
 
+@SuppressWarnings("squid:S110")
 public class NotPublicKeyException extends BadRequestException {
   public NotPublicKeyException(List<ContextEntry> context, String message) {
     super(context, message);
diff --git a/scm-webapp/src/main/java/sonia/scm/security/gpg/DeletingReadonlyKeyNotAllowedException.java b/scm-webapp/src/main/java/sonia/scm/security/gpg/DeletingReadonlyKeyNotAllowedException.java
index 9f52ed20f3..4b1d37c35a 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/gpg/DeletingReadonlyKeyNotAllowedException.java
+++ b/scm-webapp/src/main/java/sonia/scm/security/gpg/DeletingReadonlyKeyNotAllowedException.java
@@ -27,6 +27,7 @@ package sonia.scm.security.gpg;
 import sonia.scm.BadRequestException;
 import sonia.scm.ContextEntry;
 
+@SuppressWarnings("squid:S110")
 public final class DeletingReadonlyKeyNotAllowedException extends BadRequestException {
 
   public DeletingReadonlyKeyNotAllowedException(String keyId) {
diff --git a/scm-webapp/src/test/java/sonia/scm/security/gpg/GPGKeyPairGeneratorTest.java b/scm-webapp/src/test/java/sonia/scm/security/gpg/GPGKeyPairGeneratorTest.java
index e7485efc19..e535dc26e9 100644
--- a/scm-webapp/src/test/java/sonia/scm/security/gpg/GPGKeyPairGeneratorTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/security/gpg/GPGKeyPairGeneratorTest.java
@@ -41,7 +41,7 @@ import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.Security;
 
-public class GPGKeyPairGeneratorTest {
+class GPGKeyPairGeneratorTest {
 
   private static void registerBouncyCastleProviderIfNecessary() {
     if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) {