Drop unused jetty-server in sonar-scanner-engine tests

diff --git a/sonar-scanner-engine/build.gradle b/sonar-scanner-engine/build.gradle
index 5c5b7165ceece8c3f64789275ad40c9cb5424d52..f93ec9111fbbf91a8a4d0395ae9bfe5a57870f56 100644 (file)
--- a/sonar-scanner-engine/build.gradle
+++ b/sonar-scanner-engine/build.gradle
@@ -38,14 +38,6 @@ dependencies {
   testCompile 'com.tngtech.java:junit-dataprovider'
   testCompile 'javax.servlet:javax.servlet-api'
   testCompile 'junit:junit'
-  // Workaround to resolve dependencies of eclipse specific packaging: https://issues.gradle.org/browse/GRADLE-2076
-  testCompile module('org.eclipse.jetty:jetty-server') {
-    dependencies(
-        "org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016@jar",
-        "org.eclipse.jetty:jetty-continuation:8.1.2.v20120308",
-        "org.eclipse.jetty:jetty-http:8.1.2.v20120308"
-    )
-  }
   testCompile 'net.javacrumbs.json-unit:json-unit-assertj:0.0.15'
   testCompile 'org.assertj:assertj-core'
   testCompile 'org.mockito:mockito-core'

diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/MockHttpServer.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/MockHttpServer.java
deleted file mode 100644 (file)
index bfd3ea4..0000000
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/MockHttpServer.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2018 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.scanner.bootstrap;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.io.IOUtils;
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-
-import static javax.servlet.http.HttpServletResponse.SC_OK;
-import static org.apache.commons.io.IOUtils.write;
-
-public class MockHttpServer {
-  private Server server;
-  private String responseBody;
-  private String requestBody;
-  private String mockResponseData;
-  private int mockResponseStatus = SC_OK;
-  private List<String> targets = new ArrayList<>();
-
-  public void start() throws Exception {
-    server = new Server(0);
-    server.setHandler(getMockHandler());
-    server.start();
-  }
-
-  public int getNumberRequests() {
-    return targets.size();
-  }
-
-  /**
-   * Creates an {@link org.mortbay.jetty.handler.AbstractHandler handler} returning an arbitrary String as a response.
-   *
-   * @return never <code>null</code>.
-   */
-  public Handler getMockHandler() {
-    Handler handler = new AbstractHandler() {
-
-      public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-        targets.add(target);
-        setResponseBody(getMockResponseData());
-        setRequestBody(IOUtils.toString(baseRequest.getInputStream()));
-        response.setStatus(mockResponseStatus);
-        response.setContentType("text/xml;charset=utf-8");
-        write(getResponseBody(), response.getOutputStream());
-        baseRequest.setHandled(true);
-      }
-    };
-    return handler;
-  }
-
-  public void stop() {
-    try {
-      if (server != null) {
-        server.stop();
-      }
-    } catch (Exception e) {
-      throw new IllegalStateException("Fail to stop HTTP server", e);
-    }
-  }
-
-  public String getResponseBody() {
-    return responseBody;
-  }
-
-  public void setResponseBody(String responseBody) {
-    this.responseBody = responseBody;
-  }
-
-  public String getRequestBody() {
-    return requestBody;
-  }
-
-  public void setRequestBody(String requestBody) {
-    this.requestBody = requestBody;
-  }
-
-  public void setMockResponseStatus(int status) {
-    this.mockResponseStatus = status;
-  }
-
-  public String getMockResponseData() {
-    return mockResponseData;
-  }
-
-  public void setMockResponseData(String mockResponseData) {
-    this.mockResponseData = mockResponseData;
-  }
-
-  public int getPort() {
-    return server.getConnectors()[0].getLocalPort();
-  }
-
-}