From 8e0af3354f0ff907e582d0ed9e5a429d8aeecc32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 9 Aug 2018 09:17:07 +0200
Subject: [PATCH] Backed out changeset e5f1c37895b4

---
 pom.xml                                                   | 6 +++---
 scm-webapp/pom.xml                                        | 2 +-
 .../sonia/scm/api/v2/resources/ConfigResourceTest.java    | 2 +-
 .../sonia/scm/api/v2/resources/GroupRootResourceTest.java | 4 ++--
 .../java/sonia/scm/api/v2/resources/MeResourceTest.java   | 2 +-
 .../scm/api/v2/resources/RepositoryRootResourceTest.java  | 6 +++---
 .../sonia/scm/api/v2/resources/UserRootResourceTest.java  | 8 ++++----
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 319bb62784..a16ff50415 100644
--- a/pom.xml
+++ b/pom.xml
@@ -553,7 +553,7 @@
     <logback.version>1.1.10</logback.version>
     <servlet.version>3.0.1</servlet.version>
     
-    <jaxrs.version>2.1</jaxrs.version>
+    <jaxrs.version>2.0.1</jaxrs.version>
     <jersey-client.version>1.19.4</jersey-client.version>
     <jackson.version>2.8.6</jackson.version>
     <guice.version>4.0</guice.version>
@@ -562,8 +562,8 @@
     <legman.version>1.3.0</legman.version>
     
     <!-- webserver -->
-    <jetty.version>9.4.11.v20180605</jetty.version>
-    <jetty.maven.version>9.4.11.v20180605</jetty.maven.version>
+    <jetty.version>9.2.10.v20150310</jetty.version>
+    <jetty.maven.version>9.2.10.v20150310</jetty.maven.version>
 
     <!-- security libraries -->
     <ssp.version>967c8fd521</ssp.version>
diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 67e9c0a43c..054ce3d445 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -560,7 +560,7 @@
     <enunciate.version>2.9.1</enunciate.version>
     <wagon.version>1.0</wagon.version>
     <mustache.version>0.8.17</mustache.version>
-    <resteasy.version>3.5.1.Final</resteasy.version>
+    <resteasy.version>3.1.3.Final</resteasy.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>
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigResourceTest.java
index ed509c727d..5365e9fbde 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigResourceTest.java
@@ -60,7 +60,7 @@ public class ConfigResourceTest {
 
   @Test
   @SubjectAware(username = "readOnly")
-  public void shouldGetGlobalConfig() throws Exception {
+  public void shouldGetGlobalConfig() throws URISyntaxException {
     MockHttpRequest request = MockHttpRequest.get("/" + ConfigResource.CONFIG_PATH_V2);
     MockHttpResponse response = new MockHttpResponse();
     dispatcher.invoke(request, response);
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java
index d964e57624..dff9e7e99b 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java
@@ -86,7 +86,7 @@ public class GroupRootResourceTest {
   }
 
   @Test
-  public void shouldGetGroup() throws Exception {
+  public void shouldGetGroup() throws URISyntaxException {
     Group group = createDummyGroup();
     when(groupManager.get("admin")).thenReturn(group);
 
@@ -199,7 +199,7 @@ public class GroupRootResourceTest {
   }
 
   @Test
-  public void shouldGetAll() throws Exception {
+  public void shouldGetAll() throws URISyntaxException {
     MockHttpRequest request = MockHttpRequest.get("/" + GroupRootResource.GROUPS_PATH_V2);
     MockHttpResponse response = new MockHttpResponse();
 
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
index 60b89ae708..56c60098fb 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
@@ -79,7 +79,7 @@ public class MeResourceTest {
 
   @Test
   @SubjectAware(username = "trillian", password = "secret")
-  public void shouldReturnCurrentlyAuthenticatedUser() throws Exception {
+  public void shouldReturnCurrentlyAuthenticatedUser() throws URISyntaxException {
     MockHttpRequest request = MockHttpRequest.get("/" + MeResource.ME_PATH_V2);
     request.accept(VndMediaType.USER);
     MockHttpResponse response = new MockHttpResponse();
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
index 28a908566b..888d4d6f25 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
@@ -90,7 +90,7 @@ public class RepositoryRootResourceTest {
   }
 
   @Test
-  public void shouldFindExistingRepository() throws Exception {
+  public void shouldFindExistingRepository() throws URISyntaxException {
     mockRepository("space", "repo");
 
     MockHttpRequest request = MockHttpRequest.get("/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + "space/repo");
@@ -103,7 +103,7 @@ public class RepositoryRootResourceTest {
   }
 
   @Test
-  public void shouldMapProperties() throws Exception {
+  public void shouldMapProperties() throws URISyntaxException {
     Repository repository = mockRepository("space", "repo");
     repository.setProperty("testKey", "testValue");
 
@@ -116,7 +116,7 @@ public class RepositoryRootResourceTest {
   }
 
   @Test
-  public void shouldGetAll() throws Exception {
+  public void shouldGetAll() throws URISyntaxException {
     PageResult<Repository> singletonPageResult = createSingletonPageResult(mockRepository("space", "repo"));
     when(repositoryManager.getPage(any(), eq(0), eq(10))).thenReturn(singletonPageResult);
 
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
index 342957520d..1eee9b2270 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
@@ -77,7 +77,7 @@ public class UserRootResourceTest {
   }
 
   @Test
-  public void shouldCreateFullResponseForAdmin() throws Exception {
+  public void shouldCreateFullResponseForAdmin() throws URISyntaxException {
     MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2 + "Neo");
     MockHttpResponse response = new MockHttpResponse();
 
@@ -92,7 +92,7 @@ public class UserRootResourceTest {
 
   @Test
   @SubjectAware(username = "unpriv")
-  public void shouldCreateLimitedResponseForSimpleUser() throws Exception {
+  public void shouldCreateLimitedResponseForSimpleUser() throws URISyntaxException {
     MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2 + "Neo");
     MockHttpResponse response = new MockHttpResponse();
 
@@ -217,7 +217,7 @@ public class UserRootResourceTest {
   }
 
   @Test
-  public void shouldCreatePageForOnePageOnly() throws Exception {
+  public void shouldCreatePageForOnePageOnly() throws URISyntaxException {
     PageResult<User> singletonPageResult = createSingletonPageResult(1);
     when(userManager.getPage(any(), eq(0), eq(10))).thenReturn(singletonPageResult);
     MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2);
@@ -235,7 +235,7 @@ public class UserRootResourceTest {
   }
 
   @Test
-  public void shouldCreatePageForMultiplePages() throws Exception {
+  public void shouldCreatePageForMultiplePages() throws URISyntaxException {
     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");