Merged in feature/dependency_updates_and_lifecycle (pull request #172)

Update vulnerable dependencies

Jenkinsfile

@@ -50,6 +50,11 @@ node('docker') {
       def dockerImageTag = "2.0.0-dev-${commitHash.substring(0,7)}-${BUILD_NUMBER}"
 
       if (isMainBranch()) {
+
+        stage('Lifecycle') {
+          nexusPolicyEvaluation iqApplication: selectedApplication('scm'), iqScanPatterns: [[scanPattern: 'scm-server/target/scm-server-app.zip']], iqStage: 'build'
+        }
+
         stage('Archive') {
           archiveArtifacts 'scm-webapp/target/scm-webapp.war'
           archiveArtifacts 'scm-server/target/scm-server-app.*'

pom.xml

@@ -351,21 +351,6 @@
         <scope>test</scope>
       </dependency>
 
-
-      <!-- utils -->
-
-      <dependency>
-        <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils</artifactId>
-        <version>1.9.3</version>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>3.2.2</version>
-      </dependency>
-
       <!-- http -->
 
       <dependency>
@@ -825,11 +810,11 @@
     <logback.version>1.2.3</logback.version>
     <servlet.version>3.0.1</servlet.version>
 
-    <jaxrs.version>2.0.1</jaxrs.version>
-    <resteasy.version>3.1.3.Final</resteasy.version>
+    <jaxrs.version>2.1.1</jaxrs.version>
+    <resteasy.version>3.6.2.Final</resteasy.version>
     <jersey-client.version>1.19.4</jersey-client.version>
     <enunciate.version>2.11.1</enunciate.version>
-    <jackson.version>2.8.6</jackson.version>
+    <jackson.version>2.9.8</jackson.version>
     <guice.version>4.0</guice.version>
     <jaxb.version>2.3.0</jaxb.version>
 

scm-core/pom.xml

@@ -93,6 +93,7 @@
     <dependency>
       <groupId>javax.ws.rs</groupId>
       <artifactId>javax.ws.rs-api</artifactId>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -235,7 +236,6 @@
           <links>
             <link>http://download.oracle.com/javase/6/docs/api/</link>
             <link>http://download.oracle.com/docs/cd/E17802_01/products/products/servlet/2.5/docs/servlet-2_5-mr2/</link>
-            <link>http://jersey.java.net/nonav/apidocs/${jersey.version}/jersey/</link>
             <link>https://google.github.io/guice/api-docs/${guice.version}/javadoc</link>
             <link>http://www.slf4j.org/api/</link>
             <link>http://shiro.apache.org/static/${shiro.version}/apidocs/</link>

scm-core/src/main/java/sonia/scm/HandlerBase.java

@@ -36,7 +36,6 @@ package sonia.scm;
 //~--- JDK imports ------------------------------------------------------------
 
 import java.io.Closeable;
-import java.io.IOException;
 
 /**
  * The base class of all handlers.

scm-core/src/main/java/sonia/scm/filter/GZipResponseFilter.java

@@ -1,24 +1,59 @@
 package sonia.scm.filter;
 
-import lombok.extern.slf4j.Slf4j;
-import sonia.scm.util.WebUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.ext.Provider;
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.ext.WriterInterceptor;
+import javax.ws.rs.ext.WriterInterceptorContext;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Locale;
 import java.util.zip.GZIPOutputStream;
 
-@Provider
-@Slf4j
-public class GZipResponseFilter implements ContainerResponseFilter {
-  public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
-    if (WebUtil.isGzipSupported(requestContext::getHeaderString)) {
-      log.trace("compress output with gzip");
-      GZIPOutputStream wrappedResponse = new GZIPOutputStream(responseContext.getEntityStream());
-      responseContext.getHeaders().add("Content-Encoding", "gzip");
-      responseContext.setEntityStream(wrappedResponse);
+@javax.ws.rs.ext.Provider
+public class GZipResponseFilter implements WriterInterceptor {
+
+  private static final Logger LOG = LoggerFactory.getLogger(GZipResponseFilter.class);
+
+  private final Provider<HttpServletRequest> requestProvider;
+
+  @Inject
+  public GZipResponseFilter(Provider<HttpServletRequest> requestProvider) {
+    this.requestProvider = requestProvider;
+  }
+
+  @Override
+  public void aroundWriteTo(WriterInterceptorContext context) throws IOException, WebApplicationException {
+    if (isGZipSupported()) {
+      LOG.trace("compress output with gzip");
+      encodeWithGZip(context);
+    } else {
+      context.proceed();
     }
   }
+
+  private void encodeWithGZip(WriterInterceptorContext context) throws IOException {
+    context.getHeaders().remove(HttpHeaders.CONTENT_LENGTH);
+    context.getHeaders().add(HttpHeaders.CONTENT_ENCODING, "gzip");
+
+    OutputStream outputStream = context.getOutputStream();
+    GZIPOutputStream compressedOutputStream = new GZIPOutputStream(outputStream);
+    context.setOutputStream(compressedOutputStream);
+    try {
+      context.proceed();
+    } finally {
+      compressedOutputStream.finish();
+      context.setOutputStream(outputStream);
+    }
+  }
+
+  private boolean isGZipSupported() {
+    Object encoding = requestProvider.get().getHeader(HttpHeaders.ACCEPT_ENCODING);
+    return encoding != null && encoding.toString().toLowerCase(Locale.ENGLISH).contains("gzip");
+  }
 }

scm-core/src/main/java/sonia/scm/net/ahc/BaseHttpRequest.java

@@ -35,7 +35,6 @@ package sonia.scm.net.ahc;
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Strings;
-import com.google.common.collect.HashMultimap;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 

scm-core/src/main/java/sonia/scm/plugin/PluginLoader.java

@@ -35,8 +35,6 @@ package sonia.scm.plugin;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import com.google.inject.Module;
-
 //~--- JDK imports ------------------------------------------------------------
 
 import java.util.Collection;

scm-core/src/main/java/sonia/scm/repository/RepositoryPermission.java

@@ -37,7 +37,6 @@ package sonia.scm.repository;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
-import org.apache.commons.collections.CollectionUtils;
 import sonia.scm.security.PermissionObject;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -47,9 +46,10 @@ import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.LinkedHashSet;
+import java.util.Set;
 
 import static java.util.Collections.emptyList;
-import static java.util.Collections.unmodifiableCollection;
+import static java.util.Collections.unmodifiableSet;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -68,7 +68,7 @@ public class RepositoryPermission implements PermissionObject, Serializable
   private boolean groupPermission = false;
   private String name;
   @XmlElement(name = "verb")
-  private Collection<String> verbs;
+  private Set<String> verbs;
 
   /**
    * Constructs a new {@link RepositoryPermission}.
@@ -79,7 +79,7 @@ public class RepositoryPermission implements PermissionObject, Serializable
   public RepositoryPermission(String name, Collection<String> verbs, boolean groupPermission)
   {
     this.name = name;
-    this.verbs = unmodifiableCollection(new LinkedHashSet<>(verbs));
+    this.verbs = unmodifiableSet(new LinkedHashSet<>(verbs));
     this.groupPermission = groupPermission;
   }
 
@@ -109,7 +109,8 @@ public class RepositoryPermission implements PermissionObject, Serializable
     final RepositoryPermission other = (RepositoryPermission) obj;
 
     return Objects.equal(name, other.name)
-      && CollectionUtils.isEqualCollection(verbs, other.verbs)
+      && verbs.containsAll(other.verbs)
+      && verbs.size() == other.verbs.size()
       && Objects.equal(groupPermission, other.groupPermission);
   }
 
@@ -209,6 +210,6 @@ public class RepositoryPermission implements PermissionObject, Serializable
    */
   public void setVerbs(Collection<String> verbs)
   {
-    this.verbs = verbs;
+    this.verbs = unmodifiableSet(new LinkedHashSet<>(verbs));
   }
 }

scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java

@@ -5,7 +5,6 @@ import com.google.common.base.Objects;
 import com.google.common.base.Strings;
 import sonia.scm.Validateable;
 import sonia.scm.repository.Person;
-import sonia.scm.util.Util;
 
 import java.io.Serializable;
 

scm-core/src/main/java/sonia/scm/security/PermissionDescriptor.java

@@ -39,7 +39,6 @@ import com.google.common.base.Objects;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
 

scm-core/src/main/java/sonia/scm/security/StoredAssignedPermission.java

@@ -34,8 +34,6 @@ package sonia.scm.security;
 
 //~--- JDK imports ------------------------------------------------------------
 
-import com.google.common.base.Objects;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;

scm-core/src/main/java/sonia/scm/util/Comparables.java

@@ -0,0 +1,88 @@
+package sonia.scm.util;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+public final class Comparables {
+
+  private static final CacheLoader<Class, BeanInfo> beanInfoCacheLoader = new CacheLoader<Class, BeanInfo>() {
+    @Override
+    public BeanInfo load(Class type) throws IntrospectionException {
+      return Introspector.getBeanInfo(type);
+    }
+  };
+
+  private static final LoadingCache<Class, BeanInfo> beanInfoCache = CacheBuilder.newBuilder()
+    .maximumSize(50) // limit the cache to avoid consuming to much memory on miss usage
+    .build(beanInfoCacheLoader);
+
+  private Comparables() {
+  }
+
+  public static <T> Comparator<T> comparator(Class<T> type, String sortBy) {
+    BeanInfo info = createBeanInfo(type);
+    PropertyDescriptor propertyDescriptor = findPropertyDescriptor(sortBy, info);
+
+    Method readMethod = propertyDescriptor.getReadMethod();
+    checkIfPropertyIsComparable(readMethod, sortBy);
+
+    return new MethodComparator<>(readMethod);
+  }
+
+  private static void checkIfPropertyIsComparable(Method readMethod, String sortBy) {
+    checkArgument(isReturnTypeComparable(readMethod), "property %s is not comparable", sortBy);
+  }
+
+  private static boolean isReturnTypeComparable(Method readMethod) {
+    return Comparable.class.isAssignableFrom(readMethod.getReturnType());
+  }
+
+  private static PropertyDescriptor findPropertyDescriptor(String sortBy, BeanInfo info) {
+    PropertyDescriptor[] propertyDescriptors = info.getPropertyDescriptors();
+
+    Optional<PropertyDescriptor> sortByPropertyDescriptor = Arrays.stream(propertyDescriptors)
+      .filter(p -> p.getName().equals(sortBy))
+      .findFirst();
+
+    return sortByPropertyDescriptor.orElseThrow(() -> new IllegalArgumentException("could not find property " + sortBy));
+  }
+
+  private static <T> BeanInfo createBeanInfo(Class<T> type) {
+    return beanInfoCache.getUnchecked(type);
+  }
+
+  private static class MethodComparator<T> implements Comparator<T> {
+
+    private final Method readMethod;
+
+    private MethodComparator(Method readMethod) {
+      this.readMethod = readMethod;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public int compare(T left, T right) {
+      try {
+        Comparable leftResult = (Comparable) readMethod.invoke(left);
+        Comparable rightResult = (Comparable) readMethod.invoke(right);
+        return leftResult.compareTo(rightResult);
+      } catch (IllegalAccessException | InvocationTargetException ex) {
+        throw new IllegalArgumentException("failed to invoke read method", ex);
+      }
+    }
+  }
+
+}

scm-core/src/test/java/sonia/scm/filter/GZipResponseFilterTest.java

@@ -0,0 +1,87 @@
+package sonia.scm.filter;
+
+import com.google.inject.util.Providers;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.WriterInterceptorContext;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.zip.GZIPOutputStream;
+
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class GZipResponseFilterTest {
+
+  @Mock
+  private HttpServletRequest request;
+
+  @Mock
+  private WriterInterceptorContext context;
+
+  @Mock
+  private MultivaluedMap<String,Object> headers;
+
+  private GZipResponseFilter filter;
+
+  @BeforeEach
+  void setupObjectUnderTest() {
+    filter = new GZipResponseFilter(Providers.of(request));
+  }
+
+  @Test
+  void shouldSkipGZipCompression() throws IOException {
+    when(request.getHeader(HttpHeaders.ACCEPT_ENCODING)).thenReturn("deflate, br");
+
+    filter.aroundWriteTo(context);
+
+    verifySkipped();
+  }
+
+  @Test
+  void shouldSkipGZipCompressionWithoutAcceptEncodingHeader() throws IOException {
+    filter.aroundWriteTo(context);
+
+    verifySkipped();
+  }
+
+  private void verifySkipped() throws IOException {
+    verify(context, never()).getOutputStream();
+    verify(context).proceed();
+  }
+
+
+  @Nested
+  class AcceptGZipEncoding {
+
+    @BeforeEach
+    void setUpContext() {
+      when(request.getHeader(HttpHeaders.ACCEPT_ENCODING)).thenReturn("gzip, deflate, br");
+      when(context.getHeaders()).thenReturn(headers);
+      when(context.getOutputStream()).thenReturn(new ByteArrayOutputStream());
+    }
+
+    @Test
+    void shouldEncode() throws IOException {
+      filter.aroundWriteTo(context);
+
+      verify(headers).remove(HttpHeaders.CONTENT_LENGTH);
+      verify(headers).add(HttpHeaders.CONTENT_ENCODING, "gzip");
+
+      verify(context).setOutputStream(any(GZIPOutputStream.class));
+      verify(context, times(2)).setOutputStream(any(OutputStream.class));
+    }
+
+  }
+
+
+}

scm-core/src/test/java/sonia/scm/net/ahc/AdvancedHttpRequestWithBodyTest.java

@@ -36,7 +36,7 @@ import com.google.common.io.ByteSource;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+
 import org.junit.Test;
 import static org.junit.Assert.*;
 import static org.hamcrest.Matchers.*;

scm-core/src/test/java/sonia/scm/repository/RepositoryPermissionTest.java

@@ -46,4 +46,13 @@ class RepositoryPermissionTest {
 
     assertThat(permission1).isNotEqualTo(permission2);
   }
+
+  @Test
+  void shouldBeEqualWithRedundantVerbs() {
+    RepositoryPermission permission1 = new RepositoryPermission("name1", asList("one", "two"), false);
+    RepositoryPermission permission2 = new RepositoryPermission("name1", asList("one", "two"), false);
+    permission2.setVerbs(asList("one", "two", "two"));
+
+    assertThat(permission1).isEqualTo(permission2);
+  }
 }

scm-core/src/test/java/sonia/scm/security/DAORealmHelperTest.java

@@ -1,7 +1,6 @@
 package sonia.scm.security;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.DisabledAccountException;
 import org.apache.shiro.authc.UnknownAccountException;

scm-core/src/test/java/sonia/scm/util/ComparablesTest.java

@@ -0,0 +1,57 @@
+package sonia.scm.util;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Comparator;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class ComparablesTest {
+
+  @Test
+  void shouldCompare() {
+    One a = new One("a");
+    One b = new One("b");
+
+    Comparator<One> comparable = Comparables.comparator(One.class, "value");
+    assertThat(comparable.compare(a, b)).isEqualTo(-1);
+  }
+
+  @Test
+  void shouldThrowAnExceptionForNonExistingField() {
+    assertThrows(IllegalArgumentException.class, () -> Comparables.comparator(One.class, "awesome"));
+  }
+
+  @Test
+  void shouldThrowAnExceptionForNonComparableField() {
+    assertThrows(IllegalArgumentException.class, () -> Comparables.comparator(One.class, "nonComparable"));
+  }
+
+  @Test
+  void shouldThrowAnExceptionIfTheFieldHasNoGetter() {
+    assertThrows(IllegalArgumentException.class, () -> Comparables.comparator(One.class, "incredible"));
+  }
+
+  private static class One {
+
+    private String value;
+    private String incredible;
+    private NonComparable nonComparable;
+
+    One(String value) {
+      this.value = value;
+    }
+
+    public String getValue() {
+      return value;
+    }
+
+    public NonComparable getNonComparable() {
+      return nonComparable;
+    }
+  }
+
+  private static class NonComparable {}
+
+}

scm-dao-xml/src/main/java/sonia/scm/store/JAXBDataStoreFactory.java

@@ -37,9 +37,6 @@ package sonia.scm.store;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import sonia.scm.SCMContextProvider;
 import sonia.scm.repository.RepositoryLocationResolver;
 import sonia.scm.security.KeyGenerator;

scm-dao-xml/src/main/java/sonia/scm/xml/AbstractXmlDAO.java

@@ -38,7 +38,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.GenericDAO;
 import sonia.scm.ModelObject;
-import sonia.scm.group.xml.XmlGroupDAO;
 import sonia.scm.store.ConfigurationStore;
 
 import java.util.Collection;

scm-dao-xml/src/main/java/sonia/scm/xml/XmlStreams.java

@@ -1,6 +1,5 @@
 package sonia.scm.xml;
 
-import com.google.common.base.Charsets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java

@@ -36,7 +36,6 @@ package sonia.scm.it;
 import org.apache.http.HttpStatus;
 import org.assertj.core.api.Assertions;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;

scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java

@@ -5,10 +5,8 @@ import io.restassured.response.Response;
 import org.junit.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.user.User;
 import sonia.scm.web.VndMediaType;
 
-import java.net.ConnectException;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigResource.java

@@ -18,8 +18,6 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 
-import static sonia.scm.ContextEntry.ContextBuilder.entity;
-
 /**
  * RESTful Web Service Resource to manage the configuration of the git plugin.
  */

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryResolver.java

@@ -35,7 +35,6 @@ package sonia.scm.web;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.inject.Inject;
 import org.eclipse.jgit.errors.RepositoryNotFoundException;

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigDtoToGitConfigMapperTest.java

@@ -3,7 +3,7 @@ package sonia.scm.api.v2.resources;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.repository.GitConfig;
 
 import static org.junit.Assert.*;

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java

@@ -17,7 +17,7 @@ import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.repository.GitConfig;
 import sonia.scm.repository.GitRepositoryConfig;
 import sonia.scm.repository.GitRepositoryHandler;
@@ -29,6 +29,7 @@ import sonia.scm.store.ConfigurationStoreFactory;
 import sonia.scm.web.GitVndMediaType;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -100,7 +101,7 @@ public class GitConfigResourceTest {
 
   @Test
   @SubjectAware(username = "readWrite")
-  public void shouldGetGitConfig() throws URISyntaxException {
+  public void shouldGetGitConfig() throws URISyntaxException, UnsupportedEncodingException {
     MockHttpResponse response = get();
 
     assertEquals(HttpServletResponse.SC_OK, response.getStatus());
@@ -115,7 +116,7 @@ public class GitConfigResourceTest {
 
   @Test
   @SubjectAware(username = "readWrite")
-  public void shouldGetGitConfigEvenWhenItsEmpty() throws URISyntaxException {
+  public void shouldGetGitConfigEvenWhenItsEmpty() throws URISyntaxException, UnsupportedEncodingException {
     when(repositoryHandler.getConfig()).thenReturn(null);
 
     MockHttpResponse response = get();
@@ -126,7 +127,7 @@ public class GitConfigResourceTest {
 
   @Test
   @SubjectAware(username = "readOnly")
-  public void shouldGetGitConfigWithoutUpdateLink() throws URISyntaxException {
+  public void shouldGetGitConfigWithoutUpdateLink() throws URISyntaxException, UnsupportedEncodingException {
     MockHttpResponse response = get();
 
     assertEquals(HttpServletResponse.SC_OK, response.getStatus());
@@ -159,7 +160,7 @@ public class GitConfigResourceTest {
 
   @Test
   @SubjectAware(username = "writeOnly")
-  public void shouldReadDefaultRepositoryConfig() throws URISyntaxException {
+  public void shouldReadDefaultRepositoryConfig() throws URISyntaxException, UnsupportedEncodingException {
     when(repositoryManager.get(new NamespaceAndName("space", "X"))).thenReturn(new Repository("id", "git", "space", "X"));
 
     MockHttpRequest request = MockHttpRequest.get("/" + GitConfigResource.GIT_CONFIG_PATH_V2 + "/space/X");
@@ -176,7 +177,7 @@ public class GitConfigResourceTest {
 
   @Test
   @SubjectAware(username = "readOnly")
-  public void shouldNotHaveUpdateLinkForReadOnlyUser() throws URISyntaxException {
+  public void shouldNotHaveUpdateLinkForReadOnlyUser() throws URISyntaxException, UnsupportedEncodingException {
     when(repositoryManager.get(new NamespaceAndName("space", "X"))).thenReturn(new Repository("id", "git", "space", "X"));
 
     MockHttpRequest request = MockHttpRequest.get("/" + GitConfigResource.GIT_CONFIG_PATH_V2 + "/space/X");
@@ -193,7 +194,7 @@ public class GitConfigResourceTest {
 
   @Test
   @SubjectAware(username = "writeOnly")
-  public void shouldReadStoredRepositoryConfig() throws URISyntaxException {
+  public void shouldReadStoredRepositoryConfig() throws URISyntaxException, UnsupportedEncodingException {
     when(repositoryManager.get(new NamespaceAndName("space", "X"))).thenReturn(new Repository("id", "git", "space", "X"));
     GitRepositoryConfig gitRepositoryConfig = new GitRepositoryConfig();
     gitRepositoryConfig.setDefaultBranch("test");

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigToGitConfigDtoMapperTest.java

@@ -11,10 +11,9 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.repository.GitConfig;
 
-import java.io.File;
 import java.net.URI;
 
 import static org.junit.Assert.assertEquals;

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitRepositoryConfigEnricherTest.java

@@ -14,9 +14,6 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryManager;
-import sonia.scm.repository.api.Command;
-import sonia.scm.repository.api.RepositoryService;
-import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.web.JsonEnricherContext;
 import sonia.scm.web.VndMediaType;
 

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitHeadModifierTest.java

@@ -40,7 +40,7 @@ import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.io.File;
 import java.io.IOException;

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractGitCommandTestBase.java

@@ -35,10 +35,8 @@ package sonia.scm.repository.spi;
 //~--- non-JDK imports --------------------------------------------------------
 
 import org.junit.After;
-import org.junit.Before;
 import sonia.scm.api.v2.resources.GitRepositoryConfigStoreProvider;
 import sonia.scm.repository.GitRepositoryConfig;
-import sonia.scm.store.InMemoryConfigurationStore;
 import sonia.scm.store.InMemoryConfigurationStoreFactory;
 
 /**

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBlameCommandTest.java

@@ -35,11 +35,9 @@ package sonia.scm.repository.spi;
 //~--- non-JDK imports --------------------------------------------------------
 
 import org.junit.Test;
-import sonia.scm.api.v2.resources.GitRepositoryConfigStoreProvider;
 import sonia.scm.repository.BlameLine;
 import sonia.scm.repository.BlameResult;
 import sonia.scm.repository.GitRepositoryConfig;
-import sonia.scm.store.InMemoryConfigurationStoreFactory;
 
 import java.io.IOException;
 

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java

@@ -32,11 +32,9 @@
 package sonia.scm.repository.spi;
 
 import org.junit.Test;
-import sonia.scm.api.v2.resources.GitRepositoryConfigStoreProvider;
 import sonia.scm.repository.BrowserResult;
 import sonia.scm.repository.FileObject;
 import sonia.scm.repository.GitRepositoryConfig;
-import sonia.scm.store.InMemoryConfigurationStoreFactory;
 
 import java.io.IOException;
 import java.util.Collection;

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java

@@ -36,10 +36,8 @@ package sonia.scm.repository.spi;
 
 import com.google.common.io.Files;
 import org.junit.Test;
-import sonia.scm.event.ScmEventBus;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
-import sonia.scm.repository.ClearRepositoryCacheEvent;
 import sonia.scm.repository.GitRepositoryConfig;
 import sonia.scm.repository.Modifications;
 

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/web/GitReceivePackFactoryTest.java

@@ -42,7 +42,7 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.repository.GitConfig;
 import sonia.scm.repository.GitRepositoryHandler;
 

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/AbstractHgInstaller.java

@@ -35,14 +35,12 @@ package sonia.scm.installer;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import sonia.scm.repository.HgConfig;
 import sonia.scm.repository.HgRepositoryHandler;
-import sonia.scm.util.IOUtil;
 
 //~--- JDK imports ------------------------------------------------------------
 
 import java.io.File;
-import java.io.IOException;
+
 import sonia.scm.net.ahc.AdvancedHttpClient;
 
 /**

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgImportHandler.java

@@ -39,7 +39,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.io.INIConfiguration;
 import sonia.scm.io.INIConfigurationReader;
-import sonia.scm.io.INIConfigurationWriter;
 import sonia.scm.io.INISection;
 import sonia.scm.util.ValidationUtil;
 

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgFileviewCommand.java

@@ -41,7 +41,6 @@ import com.aragost.javahg.internals.AbstractCommand;
 import com.aragost.javahg.internals.HgInputStream;
 
 import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
 
 import sonia.scm.repository.FileObject;
 import sonia.scm.repository.SubRepository;
@@ -52,7 +51,6 @@ import java.io.IOException;
 
 import java.util.Deque;
 import java.util.LinkedList;
-import java.util.List;
 
 /**
  * Mercurial command to list files of a repository.

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgPermissionFilter.java

@@ -44,7 +44,6 @@ import sonia.scm.web.filter.PermissionFilter;
 
 import sonia.scm.repository.HgRepositoryHandler;
 
-import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Set;

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigAutoConfigurationResourceTest.java

@@ -14,7 +14,7 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.repository.HgConfig;
 import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.web.HgVndMediaType;

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigDtoToHgConfigMapperTest.java

@@ -3,11 +3,9 @@ package sonia.scm.api.v2.resources;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.repository.HgConfig;
 
-import java.io.File;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInstallationsResourceTest.java

@@ -14,7 +14,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import javax.inject.Provider;
 import javax.servlet.http.HttpServletResponse;

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInstallationsToDtoMapperTest.java

@@ -6,7 +6,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.net.URI;
 import java.util.Arrays;

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackageResourceTest.java

@@ -17,7 +17,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.installer.HgPackage;
 import sonia.scm.installer.HgPackageReader;
 import sonia.scm.net.ahc.AdvancedHttpClient;

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackagesToDtoMapperTest.java

@@ -6,7 +6,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.installer.HgPackage;
 import sonia.scm.installer.HgPackages;
 

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigResourceTest.java

@@ -16,15 +16,15 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.repository.HgConfig;
 import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.web.HgVndMediaType;
 
 import javax.inject.Provider;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -99,7 +99,7 @@ public class HgConfigResourceTest {
 
   @Test
   @SubjectAware(username = "readWrite")
-  public void shouldGetHgConfigEvenWhenItsEmpty() throws URISyntaxException {
+  public void shouldGetHgConfigEvenWhenItsEmpty() throws URISyntaxException, UnsupportedEncodingException {
     when(repositoryHandler.getConfig()).thenReturn(null);
 
     MockHttpResponse response = get();
@@ -110,7 +110,7 @@ public class HgConfigResourceTest {
 
   @Test
   @SubjectAware(username = "readOnly")
-  public void shouldGetHgConfigWithoutUpdateLink() throws URISyntaxException {
+  public void shouldGetHgConfigWithoutUpdateLink() throws URISyntaxException, UnsupportedEncodingException {
     MockHttpResponse response = get();
 
     assertEquals(HttpServletResponse.SC_OK, response.getStatus());

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigTests.java

@@ -3,8 +3,6 @@ package sonia.scm.api.v2.resources;
 import sonia.scm.installer.HgPackage;
 import sonia.scm.repository.HgConfig;
 
-import java.io.File;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapperTest.java

@@ -11,7 +11,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.repository.HgConfig;
 
 import java.net.URI;

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/web/HgHookCallbackServletTest.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/web/HgPermissionFilterTest.java

@@ -48,8 +48,6 @@ import javax.servlet.http.HttpServletRequest;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 import static sonia.scm.web.WireProtocolRequestMockFactory.CMDS_HEADS_KNOWN_NODES;
 import static sonia.scm.web.WireProtocolRequestMockFactory.Namespace.BOOKMARKS;
 import static sonia.scm.web.WireProtocolRequestMockFactory.Namespace.PHASES;

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/web/WireProtocolTest.java

@@ -37,7 +37,7 @@ import com.google.common.collect.Lists;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;

scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java

@@ -55,7 +55,6 @@ import sonia.scm.logging.SVNKitLogger;
 import sonia.scm.plugin.Extension;
 import sonia.scm.repository.spi.HookEventFacade;
 import sonia.scm.repository.spi.SvnRepositoryServiceProvider;
-import sonia.scm.store.ConfigurationStore;
 import sonia.scm.store.ConfigurationStoreFactory;
 import sonia.scm.util.Util;
 

scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java

@@ -36,7 +36,6 @@ package sonia.scm.repository.spi;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tmatesoft.svn.core.SVNDirEntry;
@@ -53,7 +52,6 @@ import sonia.scm.repository.SvnUtil;
 import sonia.scm.util.Util;
 
 import java.util.Collection;
-import java.util.List;
 
 //~--- JDK imports ------------------------------------------------------------
 

scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigDtoToSvnConfigMapperTest.java

@@ -3,7 +3,7 @@ package sonia.scm.api.v2.resources;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.repository.Compatibility;
 import sonia.scm.repository.SvnConfig;
 

scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigResourceTest.java

@@ -16,14 +16,14 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.repository.SvnConfig;
 import sonia.scm.repository.SvnRepositoryHandler;
 import sonia.scm.web.SvnVndMediaType;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -98,7 +98,7 @@ public class SvnConfigResourceTest {
 
   @Test
   @SubjectAware(username = "readOnly")
-  public void shouldGetSvnConfigWithoutUpdateLink() throws URISyntaxException {
+  public void shouldGetSvnConfigWithoutUpdateLink() throws URISyntaxException, UnsupportedEncodingException {
     MockHttpResponse response = get();
 
     assertEquals(HttpServletResponse.SC_OK, response.getStatus());

scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/api/v2/resources/SvnConfigToSvnConfigDtoMapperTest.java

@@ -11,11 +11,10 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.repository.Compatibility;
 import sonia.scm.repository.SvnConfig;
 
-import java.io.File;
 import java.net.URI;
 
 import static org.junit.Assert.assertEquals;

scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java

@@ -32,14 +32,10 @@
 package sonia.scm.repository;
 
 
-import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.repository.api.HookContextFactory;
 import sonia.scm.repository.spi.HookEventFacade;
-import sonia.scm.store.ConfigurationStore;
 import sonia.scm.store.ConfigurationStoreFactory;
 
 import java.io.File;
@@ -47,7 +43,7 @@ import java.io.IOException;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;

scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnLogCommandTest.java

@@ -39,8 +39,6 @@ import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.Modifications;
 
-import java.io.IOException;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;

scm-webapp/pom.xml

@@ -115,9 +115,9 @@
     </dependency>
 
     <dependency>
-      <groupId>javax</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>7.0</version>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
+      <version>${jackson.version}</version>
     </dependency>
 
     <!-- rest api -->
@@ -158,6 +158,24 @@
       <version>${resteasy.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>5.3.6.Final</version>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.el</groupId>
+      <artifactId>javax.el-api</artifactId>
+      <version>2.2.4</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.glassfish.web</groupId>
+      <artifactId>javax.el</artifactId>
+      <version>2.2.4</version>
+    </dependency>
+
     <!-- injection -->
 
     <dependency>
@@ -203,18 +221,6 @@
       <version>1.4.01</version>
     </dependency>
 
-    <!-- only for BeanComparator, replace with own implementation -->
-    
-    <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-
     <!--
       fix installation of httpasswd-plugin
       https://groups.google.com/d/topic/scmmanager/eN7UtG8TwW8/discussion
@@ -255,19 +261,19 @@
     <dependency>
       <groupId>com.github.sdorra</groupId>
       <artifactId>web-resources</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.4</version>
     </dependency>
 
     <dependency>
       <groupId>com.github.sdorra</groupId>
       <artifactId>spotter-core</artifactId>
-      <version>1.1.0</version>
+      <version>1.2.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.tika</groupId>
       <artifactId>tika-core</artifactId>
-      <version>1.18</version>
+      <version>1.20</version>
     </dependency>
 
     <!-- test scope -->
@@ -561,8 +567,6 @@
     <selenium.version>2.53.1</selenium.version>
     <wagon.version>1.0</wagon.version>
     <mustache.version>0.8.17</mustache.version>
-    <resteasy.version>3.1.4.Final</resteasy.version>
-    <jackson.version>2.8.9</jackson.version>
     <netbeans.hint.deploy.server>Tomcat</netbeans.hint.deploy.server>
     <sonar.issue.ignore.multicriteria>e1</sonar.issue.ignore.multicriteria>
     <sonar.issue.ignore.multicriteria.e1.ruleKey>javascript:S3827</sonar.issue.ignore.multicriteria.e1.ruleKey>

scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java

@@ -37,7 +37,6 @@ package sonia.scm.api.rest.resources;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.net.UrlEscapers;
-import org.apache.commons.beanutils.BeanComparator;
 import org.apache.shiro.authz.AuthorizationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,6 +46,7 @@ import sonia.scm.ModelObject;
 import sonia.scm.PageResult;
 import sonia.scm.api.rest.RestExceptionResult;
 import sonia.scm.util.AssertUtil;
+import sonia.scm.util.Comparables;
 import sonia.scm.util.Util;
 
 import javax.ws.rs.core.CacheControl;
@@ -56,15 +56,10 @@ import javax.ws.rs.core.Request;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.util.Arrays;
+import java.net.URI;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.Date;
-import java.net.URI;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -510,21 +505,11 @@ public abstract class AbstractManagerResource<T extends ModelObject> {
     return builder.build();
   }
 
-  @SuppressWarnings("unchecked")
-  private Comparator<T> createComparator(String sortBy, boolean desc)
-  {
-    checkSortByField(sortBy);
-    Comparator comparator;
-
-    if (desc)
-    {
-      comparator = new BeanReverseComparator(sortBy);
+  private Comparator<T> createComparator(String sortBy, boolean desc) {
+    Comparator<T> comparator = Comparables.comparator(type, sortBy);
+    if (desc) {
+      comparator = comparator.reversed();
     }
-    else
-    {
-      comparator = new BeanComparator(sortBy);
-    }
-
     return comparator;
   }
 
@@ -558,21 +543,6 @@ public abstract class AbstractManagerResource<T extends ModelObject> {
     return items;
   }
 
-  // We have to handle IntrospectionException here, because it's a checked exception
-  // It shouldn't occur really - so creating a new unchecked exception would be over-engineered here
-  @SuppressWarnings("squid:S00112")
-  private void checkSortByField(String sortBy) {
-    try {
-      BeanInfo info = Introspector.getBeanInfo(type);
-      PropertyDescriptor[] pds = info.getPropertyDescriptors();
-      if (Arrays.stream(pds).noneMatch(p -> p.getName().equals(sortBy))) {
-        throw new IllegalArgumentException("sortBy");
-      }
-    } catch (IntrospectionException e) {
-      throw new RuntimeException("error introspecting model type " + type.getName(), e);
-    }
-  }
-
   protected PageResult<T> fetchPage(String sortBy, boolean desc, int pageNumber,
     int pageSize) {
     AssertUtil.assertPositive(pageNumber);
@@ -608,51 +578,4 @@ public abstract class AbstractManagerResource<T extends ModelObject> {
 
     return lastModified;
   }
-
-  //~--- inner classes --------------------------------------------------------
-
-  /**
-   * Class description
-   *
-   *
-   * @version        Enter version here..., 11/06/09
-   * @author         Enter your name here...
-   */
-  private static class BeanReverseComparator extends BeanComparator
-  {
-
-    /** Field description */
-    private static final long serialVersionUID = -8535047820348790009L;
-
-    //~--- constructors -------------------------------------------------------
-
-    /**
-     * Constructs ...
-     *
-     *
-     * @param sortby
-     */
-    private BeanReverseComparator(String sortby)
-    {
-      super(sortby);
-    }
-
-    //~--- methods ------------------------------------------------------------
-
-    /**
-     * Method description
-     *
-     *
-     * @param o1
-     * @param o2
-     *
-     * @return
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public int compare(Object o1, Object o2)
-    {
-      return super.compare(o1, o2) * -1;
-    }
-  }
 }

scm-webapp/src/main/java/sonia/scm/api/rest/resources/BrowserStreamingOutput.java

@@ -6,8 +6,6 @@ import sonia.scm.repository.api.CatCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.util.IOUtil;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
 import java.io.IOException;
 import java.io.OutputStream;

scm-webapp/src/main/java/sonia/scm/api/rest/resources/DiffStreamingOutput.java

@@ -42,7 +42,6 @@ import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.util.IOUtil;
 
 import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
 import java.io.IOException;
 import java.io.OutputStream;

scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java

@@ -26,7 +26,6 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
-import java.util.List;
 
 import static sonia.scm.ContextEntry.ContextBuilder.entity;
 import static sonia.scm.NotFoundException.notFound;

scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java

@@ -5,7 +5,6 @@ import lombok.Getter;
 import lombok.Setter;
 import sonia.scm.ContextEntry;
 
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.List;

scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java

@@ -10,7 +10,6 @@ import sonia.scm.group.GroupManager;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DefaultValue;

scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java

@@ -7,7 +7,6 @@ import de.otto.edison.hal.Links;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.hibernate.validator.constraints.NotEmpty;
 
 import javax.validation.constraints.Pattern;
 import java.time.Instant;

scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDtoToGroupMapper.java

@@ -4,8 +4,6 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import sonia.scm.group.Group;
 
-import java.time.Instant;
-
 
 @Mapper
 public abstract class GroupDtoToGroupMapper extends BaseDtoMapper {

scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionCollectionToDtoMapper.java

@@ -1,7 +1,6 @@
 package sonia.scm.api.v2.resources;
 
 import de.otto.edison.hal.Links;
-import org.mapstruct.Context;
 import sonia.scm.security.PermissionDescriptor;
 import sonia.scm.security.PermissionPermissions;
 

scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java

@@ -23,7 +23,6 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 
-import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 
 public class RepositoryCollectionResource {

scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryPermissionDto.java

@@ -1,6 +1,5 @@
 package sonia.scm.api.v2.resources;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Links;
 import lombok.Getter;
@@ -9,7 +8,6 @@ import lombok.Setter;
 import lombok.ToString;
 import org.hibernate.validator.constraints.NotEmpty;
 
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 
 import java.util.Collection;

scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java

@@ -11,7 +11,6 @@ import sonia.scm.user.UserManager;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DefaultValue;

scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java

@@ -33,12 +33,9 @@ package sonia.scm.boot;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import com.github.legman.Subscribe;
-
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Files;
-import com.google.inject.servlet.GuiceFilter;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java

@@ -42,7 +42,6 @@ import org.slf4j.MDC;
 
 import sonia.scm.SCMContext;
 import sonia.scm.security.DefaultKeyGenerator;
-import sonia.scm.security.KeyGenerator;
 import sonia.scm.web.filter.HttpFilter;
 
 //~--- JDK imports ------------------------------------------------------------

scm-webapp/src/main/java/sonia/scm/filter/PropagatePrincipleFilter.java

@@ -51,8 +51,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-import static sonia.scm.api.v2.resources.ScmPathInfo.REST_API_PATH;
-
 //~--- JDK imports ------------------------------------------------------------
 
 /**

scm-webapp/src/main/java/sonia/scm/security/JwtAccessToken.java

@@ -35,7 +35,6 @@ import io.jsonwebtoken.Claims;
 
 import java.util.Collections;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;

scm-webapp/src/main/java/sonia/scm/security/RepositoryRole.java

@@ -1,7 +1,5 @@
 package sonia.scm.security;
 
-import org.apache.commons.collections.CollectionUtils;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Objects;
@@ -33,8 +31,9 @@ public class RepositoryRole {
     if (this == o) return true;
     if (!(o instanceof RepositoryRole)) return false;
     RepositoryRole that = (RepositoryRole) o;
-    return name.equals(that.name) &&
-      CollectionUtils.isEqualCollection(this.verbs, that.verbs);
+    return name.equals(that.name)
+      && this.verbs.containsAll(that.verbs)
+      && this.verbs.size() == that.verbs.size();
   }
 
   @Override

scm-webapp/src/main/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilter.java

@@ -17,9 +17,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Set;
 
-import static sonia.scm.util.HttpUtil.AUTHENTICATION_REALM;
-import static sonia.scm.util.HttpUtil.HEADER_WWW_AUTHENTICATE;
-
 @Priority(Filters.PRIORITY_AUTHENTICATION)
 @WebElement(value = HttpProtocolServlet.PATTERN)
 public class HttpProtocolServletAuthenticationFilter extends AuthenticationFilter {

scm-webapp/src/test/java/sonia/scm/api/rest/resources/AbstractManagerResourceTest.java

@@ -21,7 +21,7 @@ import java.util.Comparator;
 import static java.util.Collections.emptyList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)

scm-webapp/src/test/java/sonia/scm/api/v2/JsonFiltersTest.java

@@ -3,7 +3,6 @@ package sonia.scm.api.v2;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
 import org.junit.Test;
 

scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigResourceTest.java

@@ -18,6 +18,7 @@ import sonia.scm.web.VndMediaType;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -68,7 +69,7 @@ public class ConfigResourceTest {
 
   @Test
   @SubjectAware(username = "readOnly")
-  public void shouldGetGlobalConfig() throws URISyntaxException {
+  public void shouldGetGlobalConfig() throws URISyntaxException, UnsupportedEncodingException {
     MockHttpRequest request = MockHttpRequest.get("/" + ConfigResource.CONFIG_PATH_V2);
     MockHttpResponse response = new MockHttpResponse();
     dispatcher.invoke(request, response);

scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java

@@ -24,6 +24,7 @@ import sonia.scm.web.VndMediaType;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -100,7 +101,7 @@ public class GroupRootResourceTest {
   }
 
   @Test
-  public void shouldGetGroup() throws URISyntaxException {
+  public void shouldGetGroup() throws URISyntaxException, UnsupportedEncodingException {
     Group group = createDummyGroup();
     when(groupManager.get("admin")).thenReturn(group);
 
@@ -305,7 +306,7 @@ public class GroupRootResourceTest {
   }
 
   @Test
-  public void shouldGetAll() throws URISyntaxException {
+  public void shouldGetAll() throws URISyntaxException, UnsupportedEncodingException {
     MockHttpRequest request = MockHttpRequest.get("/" + GroupRootResource.GROUPS_PATH_V2);
     MockHttpResponse response = new MockHttpResponse();
 
@@ -317,7 +318,7 @@ public class GroupRootResourceTest {
   }
 
   @Test
-  public void shouldGetPermissionLink() throws URISyntaxException {
+  public void shouldGetPermissionLink() throws URISyntaxException, UnsupportedEncodingException {
     MockHttpRequest request = MockHttpRequest.get("/" + GroupRootResource.GROUPS_PATH_V2 + "admin");
     MockHttpResponse response = new MockHttpResponse();
 
@@ -329,7 +330,7 @@ public class GroupRootResourceTest {
   }
 
   @Test
-  public void shouldGetPermissions() throws URISyntaxException {
+  public void shouldGetPermissions() throws URISyntaxException, UnsupportedEncodingException {
     when(permissionAssigner.readPermissionsForGroup("admin")).thenReturn(singletonList(new PermissionDescriptor("something:*")));
     MockHttpRequest request = MockHttpRequest.get("/" + GroupRootResource.GROUPS_PATH_V2 + "admin/permissions");
     MockHttpResponse response = new MockHttpResponse();

scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java

@@ -22,12 +22,12 @@ import sonia.scm.user.UserManager;
 import sonia.scm.web.VndMediaType;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.initMocks;
 import static sonia.scm.api.v2.resources.DispatcherMock.createDispatcher;
@@ -78,7 +78,7 @@ public class MeResourceTest {
   }
 
   @Test
-  public void shouldReturnCurrentlyAuthenticatedUser() throws URISyntaxException {
+  public void shouldReturnCurrentlyAuthenticatedUser() throws URISyntaxException, UnsupportedEncodingException {
     applyUserToSubject(originalUser);
 
     MockHttpRequest request = MockHttpRequest.get("/" + MeResource.ME_PATH_V2);

scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryPermissionRootResourceTest.java

@@ -36,6 +36,7 @@ import sonia.scm.repository.RepositoryPermission;
 import sonia.scm.web.VndMediaType;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -53,7 +54,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
@@ -214,7 +215,12 @@ public class RepositoryPermissionRootResourceTest extends RepositoryTestBase {
       .expectedResponseStatus(200)
       .path(PATH_OF_ALL_PERMISSIONS + expectedPermission.getName())
       .responseValidator((response) -> {
-        String body = response.getContentAsString();
+        String body = null;
+        try {
+          body = response.getContentAsString();
+        } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+        }
         ObjectMapper mapper = new ObjectMapper();
         try {
           RepositoryPermissionDto actualRepositoryPermissionDto = mapper.readValue(body, RepositoryPermissionDto.class);
@@ -268,13 +274,21 @@ public class RepositoryPermissionRootResourceTest extends RepositoryTestBase {
     assertExpectedRequest(requestPOSTPermission
       .content("{\"name\" : \"" + newPermission.getName() + "\" , \"verbs\" : [\"read\",\"pull\",\"push\"], \"groupPermission\" : true}")
       .expectedResponseStatus(201)
-      .responseValidator(response -> assertThat(response.getContentAsString())
+      .responseValidator(response -> assertThat(getContentAsString(response))
         .as("POST response has no body")
         .isBlank())
     );
     assertGettingExpectedPermissions(expectedPermissions, PERMISSION_WRITE);
   }
 
+  private String getContentAsString(MockHttpResponse response) {
+    try {
+      return response.getContentAsString();
+    } catch (UnsupportedEncodingException e) {
+      throw new RuntimeException("could not get content from response", e);
+    }
+  }
+
   @Test
   public void shouldNotAddExistingPermission() throws URISyntaxException {
     createUserWithRepositoryAndPermissions(TEST_PERMISSIONS, PERMISSION_WRITE);
@@ -296,7 +310,7 @@ public class RepositoryPermissionRootResourceTest extends RepositoryTestBase {
       .content("{\"name\" : \"" + modifiedPermission.getName() + "\" , \"verbs\" : [\"*\"], \"groupPermission\" : false}")
       .path(PATH_OF_ALL_PERMISSIONS + modifiedPermission.getName())
       .expectedResponseStatus(204)
-      .responseValidator(response -> assertThat(response.getContentAsString())
+      .responseValidator(response -> assertThat(getContentAsString(response))
         .as("PUT response has no body")
         .isBlank())
     );
@@ -312,7 +326,7 @@ public class RepositoryPermissionRootResourceTest extends RepositoryTestBase {
     assertExpectedRequest(requestDELETEPermission
       .path(PATH_OF_ALL_PERMISSIONS + deletedPermission.getName())
       .expectedResponseStatus(204)
-      .responseValidator(response -> assertThat(response.getContentAsString())
+      .responseValidator(response -> assertThat(getContentAsString(response))
         .as("DELETE response has no body")
         .isBlank())
     );
@@ -327,7 +341,7 @@ public class RepositoryPermissionRootResourceTest extends RepositoryTestBase {
     assertExpectedRequest(requestDELETEPermission
       .path(PATH_OF_ALL_PERMISSIONS + deletedPermission.getName())
       .expectedResponseStatus(204)
-      .responseValidator(response -> assertThat(response.getContentAsString())
+      .responseValidator(response -> assertThat(getContentAsString(response))
         .as("DELETE response has no body")
         .isBlank())
     );
@@ -335,7 +349,7 @@ public class RepositoryPermissionRootResourceTest extends RepositoryTestBase {
     assertExpectedRequest(requestDELETEPermission
       .path(PATH_OF_ALL_PERMISSIONS + deletedPermission.getName())
       .expectedResponseStatus(204)
-      .responseValidator(response -> assertThat(response.getContentAsString())
+      .responseValidator(response -> assertThat(getContentAsString(response))
         .as("DELETE response has no body")
         .isBlank())
     );
@@ -346,7 +360,7 @@ public class RepositoryPermissionRootResourceTest extends RepositoryTestBase {
     assertExpectedRequest(requestGETAllPermissions
       .expectedResponseStatus(200)
       .responseValidator((response) -> {
-        String body = response.getContentAsString();
+        String body = getContentAsString(response);
         ObjectMapper mapper = new ObjectMapper();
         try {
           HalRepresentation halRepresentation = mapper.readValue(body, HalRepresentation.class);

scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java

@@ -27,6 +27,7 @@ import sonia.scm.web.VndMediaType;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -41,9 +42,9 @@ import static javax.servlet.http.HttpServletResponse.SC_PRECONDITION_FAILED;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -120,7 +121,7 @@ public class RepositoryRootResourceTest extends RepositoryTestBase {
   }
 
   @Test
-  public void shouldFindExistingRepository() throws URISyntaxException {
+  public void shouldFindExistingRepository() throws URISyntaxException, UnsupportedEncodingException {
     mockRepository("space", "repo");
 
     MockHttpRequest request = MockHttpRequest.get("/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + "space/repo");
@@ -133,7 +134,7 @@ public class RepositoryRootResourceTest extends RepositoryTestBase {
   }
 
   @Test
-  public void shouldMapProperties() throws URISyntaxException {
+  public void shouldMapProperties() throws URISyntaxException, UnsupportedEncodingException {
     Repository repository = mockRepository("space", "repo");
     repository.setProperty("testKey", "testValue");
 
@@ -146,7 +147,7 @@ public class RepositoryRootResourceTest extends RepositoryTestBase {
   }
 
   @Test
-  public void shouldGetAll() throws URISyntaxException {
+  public void shouldGetAll() throws URISyntaxException, UnsupportedEncodingException {
     PageResult<Repository> singletonPageResult = createSingletonPageResult(mockRepository("space", "repo"));
     when(repositoryManager.getPage(any(), eq(0), eq(10))).thenReturn(singletonPageResult);
 

scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java

@@ -23,7 +23,7 @@ import static java.util.stream.Stream.of;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 

scm-webapp/src/test/java/sonia/scm/api/v2/resources/UIRootResourceTest.java

@@ -16,6 +16,7 @@ import sonia.scm.plugin.*;
 import sonia.scm.web.VndMediaType;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.HashSet;
@@ -87,7 +88,7 @@ public class UIRootResourceTest {
   }
 
   @Test
-  public void shouldReturnPlugin() throws URISyntaxException {
+  public void shouldReturnPlugin() throws URISyntaxException, UnsupportedEncodingException {
     mockPlugins(mockPlugin("awesome", "Awesome", createPluginResources("my/awesome.bundle.js")));
 
     MockHttpRequest request = MockHttpRequest.get("/v2/ui/plugins/awesome");
@@ -101,7 +102,7 @@ public class UIRootResourceTest {
   }
 
   @Test
-  public void shouldReturnPlugins() throws URISyntaxException {
+  public void shouldReturnPlugins() throws URISyntaxException, UnsupportedEncodingException {
     mockPlugins(
       mockPlugin("awesome", "Awesome", createPluginResources("my/awesome.bundle.js")),
       mockPlugin("special", "Special", createPluginResources("my/special.bundle.js"))
@@ -120,7 +121,7 @@ public class UIRootResourceTest {
   }
 
   @Test
-  public void shouldNotReturnPluginsWithoutResources() throws URISyntaxException {
+  public void shouldNotReturnPluginsWithoutResources() throws URISyntaxException, UnsupportedEncodingException {
     mockPlugins(
       mockPlugin("awesome", "Awesome", createPluginResources("my/awesome.bundle.js")),
       mockPlugin("special")

scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserDtoToUserMapperTest.java

@@ -10,7 +10,6 @@ import sonia.scm.user.User;
 import java.time.Instant;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
 public class UserDtoToUserMapperTest {

scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java

@@ -14,7 +14,6 @@ import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.Spy;
 import sonia.scm.ContextEntry;
 import sonia.scm.NotFoundException;
 import sonia.scm.PageResult;
@@ -26,6 +25,7 @@ import sonia.scm.user.UserManager;
 import sonia.scm.web.VndMediaType;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -35,8 +35,8 @@ import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.never;
@@ -76,7 +76,7 @@ public class UserRootResourceTest {
   private User originalUser;
 
   @Before
-  public void prepareEnvironment() throws Exception {
+  public void prepareEnvironment() {
     initMocks(this);
     originalUser = createDummyUser("Neo");
     when(userManager.create(userCaptor.capture())).thenAnswer(invocation -> invocation.getArguments()[0]);
@@ -97,7 +97,7 @@ public class UserRootResourceTest {
   }
 
   @Test
-  public void shouldCreateFullResponseForAdmin() throws URISyntaxException {
+  public void shouldCreateFullResponseForAdmin() throws URISyntaxException, UnsupportedEncodingException {
     MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2 + "Neo");
     MockHttpResponse response = new MockHttpResponse();
 
@@ -137,7 +137,7 @@ public class UserRootResourceTest {
 
   @Test
   @SubjectAware(username = "unpriv")
-  public void shouldCreateLimitedResponseForSimpleUser() throws URISyntaxException {
+  public void shouldCreateLimitedResponseForSimpleUser() throws URISyntaxException, UnsupportedEncodingException {
     MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2 + "Neo");
     MockHttpResponse response = new MockHttpResponse();
 
@@ -331,7 +331,7 @@ public class UserRootResourceTest {
   }
 
   @Test
-  public void shouldCreatePageForOnePageOnly() throws URISyntaxException {
+  public void shouldCreatePageForOnePageOnly() throws URISyntaxException, UnsupportedEncodingException {
     PageResult<User> singletonPageResult = createSingletonPageResult(1);
     when(userManager.getPage(any(), eq(0), eq(10))).thenReturn(singletonPageResult);
     MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2);
@@ -347,7 +347,7 @@ public class UserRootResourceTest {
   }
 
   @Test
-  public void shouldCreatePageForMultiplePages() throws URISyntaxException {
+  public void shouldCreatePageForMultiplePages() throws URISyntaxException, UnsupportedEncodingException {
     PageResult<User> singletonPageResult = createSingletonPageResult(3);
     when(userManager.getPage(any(), eq(1), eq(1))).thenReturn(singletonPageResult);
     MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2 + "?page=1&pageSize=1");
@@ -365,7 +365,7 @@ public class UserRootResourceTest {
   }
 
   @Test
-  public void shouldGetPermissionLink() throws URISyntaxException {
+  public void shouldGetPermissionLink() throws URISyntaxException, UnsupportedEncodingException {
     MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2 + "Neo");
     MockHttpResponse response = new MockHttpResponse();
 
@@ -377,7 +377,7 @@ public class UserRootResourceTest {
   }
 
   @Test
-  public void shouldGetPermissions() throws URISyntaxException {
+  public void shouldGetPermissions() throws URISyntaxException, UnsupportedEncodingException {
     when(permissionAssigner.readPermissionsForUser("Neo")).thenReturn(singletonList(new PermissionDescriptor("something:*")));
     MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2 + "Neo/permissions");
     MockHttpResponse response = new MockHttpResponse();

scm-webapp/src/test/java/sonia/scm/boot/RestartServletTest.java

@@ -2,7 +2,6 @@ package sonia.scm.boot;
 
 import com.github.legman.Subscribe;
 import com.google.common.base.Charsets;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;

scm-webapp/src/test/java/sonia/scm/boot/ServletContextCleanerTest.java

@@ -13,7 +13,6 @@ import java.util.Enumeration;
 import java.util.Set;
 import java.util.Vector;
 
-import static org.junit.Assert.*;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

scm-webapp/src/test/java/sonia/scm/net/ahc/DefaultAdvancedHttpResponseTest.java

@@ -41,6 +41,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.io.ByteSource;
 
+import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -49,8 +50,6 @@ import org.mockito.junit.MockitoJUnitRunner;
 
 import sonia.scm.config.ScmConfiguration;
 
-import static org.hamcrest.Matchers.*;
-
 import static org.junit.Assert.*;
 
 import static org.mockito.Mockito.*;
@@ -136,7 +135,7 @@ public class DefaultAdvancedHttpResponseTest
                                       connection, 200, "OK");
     Multimap<String, String> headers = response.getHeaders();
 
-    assertThat(headers.get("Test"), contains("One", "Two"));
+    assertThat(headers.get("Test"), Matchers.contains("One", "Two"));
     assertTrue(headers.get("Test-2").isEmpty());
   }
 
@@ -144,8 +143,7 @@ public class DefaultAdvancedHttpResponseTest
 
   /** Field description */
   private final DefaultAdvancedHttpClient client =
-    new DefaultAdvancedHttpClient(new ScmConfiguration(),
-      new HashSet<ContentTransformer>(), new SSLContextProvider());
+    new DefaultAdvancedHttpClient(new ScmConfiguration(), new HashSet<>(), new SSLContextProvider());
 
   /** Field description */
   @Mock

scm-webapp/src/test/java/sonia/scm/plugin/MultiParentClassLoaderTest.java

@@ -29,9 +29,6 @@
 
 package sonia.scm.plugin;
 
-import com.google.common.base.Enums;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Arrays;

scm-webapp/src/test/java/sonia/scm/schedule/QuartzTaskTest.java

@@ -32,12 +32,11 @@
 package sonia.scm.schedule;
 
 import org.junit.Test;
-import static org.junit.Assert.*;
+
 import static org.mockito.Mockito.*;
-import static org.hamcrest.Matchers.*;
+
 import org.junit.Before;
 import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.quartz.JobKey;

scm-webapp/src/test/java/sonia/scm/security/BearerRealmTest.java

@@ -33,18 +33,13 @@ package sonia.scm.security;
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.SimpleAuthenticationInfo;
 import org.apache.shiro.authc.UsernamePasswordToken;
-import org.junit.Ignore;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Answers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.stubbing.Answer;
 
 import java.util.HashMap;
 import java.util.Set;
@@ -52,7 +47,6 @@ import java.util.Set;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

scm-webapp/src/test/java/sonia/scm/security/SecureKeyResolverTest.java

@@ -47,7 +47,6 @@ import sonia.scm.store.ConfigurationEntryStoreFactory;
 import java.util.Random;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.in;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;

scm-webapp/src/test/java/sonia/scm/user/DefaultUserManagerTest.java

@@ -45,9 +45,6 @@ import org.junit.Test;
 
 import org.mockito.ArgumentCaptor;
 import sonia.scm.NotFoundException;
-import sonia.scm.repository.InitialRepositoryLocationResolver;
-import sonia.scm.repository.RepositoryDAO;
-import sonia.scm.repository.RepositoryLocationResolver;
 import sonia.scm.store.JAXBConfigurationStoreFactory;
 import sonia.scm.user.xml.XmlUserDAO;
 

scm-webapp/src/test/java/sonia/scm/web/cgi/DefaultCGIExecutorTest.java

@@ -3,7 +3,7 @@ package sonia.scm.web.cgi;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import javax.servlet.http.HttpServletRequest;
 

scm-webapp/src/test/java/sonia/scm/web/i18n/I18nServletTest.java

@@ -35,8 +35,6 @@ import java.util.Enumeration;
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
 @RunWith(MockitoJUnitRunner.Silent.class)