Automatic merge from branch-6.4

* origin/branch-6.4:
  update sonarcloud terms url
  Revert "SONAR-9301 Support HTTP redirect on scanner side"

1 files changed, 0 insertions, 95 deletions

diff --git a/it/it-tests/src/test/java/it/analysis/RedirectTest.java b/it/it-tests/src/test/java/it/analysis/RedirectTest.java
deleted file mode 100644
index 6c4653625a3..00000000000
--- a/it/it-tests/src/test/java/it/analysis/RedirectTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2017 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 it.analysis;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.net.InetAddress;
-
-import org.eclipse.jetty.server.HttpConfiguration;
-import org.eclipse.jetty.server.HttpConnectionFactory;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.handler.MovedContextHandler;
-import org.eclipse.jetty.util.thread.QueuedThreadPool;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import com.sonar.orchestrator.Orchestrator;
-import com.sonar.orchestrator.build.BuildResult;
-import com.sonar.orchestrator.build.SonarScanner;
-import com.sonar.orchestrator.util.NetworkUtils;
-
-import it.Category3Suite;
-import util.ItUtils;
-
-public class RedirectTest {
-  @ClassRule
-  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
-
-  private static Server server;
-  private static int redirectPort;
-
-  @Before
-  public static void beforeClass() throws Exception {
-    orchestrator.resetData();
-    redirectPort = NetworkUtils.getNextAvailablePort(InetAddress.getLoopbackAddress());
-
-    QueuedThreadPool threadPool = new QueuedThreadPool();
-    threadPool.setMaxThreads(500);
-
-    server = new Server(threadPool);
-    // HTTP Configuration
-    HttpConfiguration httpConfig = new HttpConfiguration();
-    httpConfig.setSendServerVersion(true);
-    httpConfig.setSendDateHeader(false);
-
-    // Moved handler
-    MovedContextHandler movedContextHandler = new MovedContextHandler();
-    movedContextHandler.setPermanent(true);
-    movedContextHandler.setNewContextURL(orchestrator.getServer().getUrl());
-    server.setHandler(movedContextHandler);
-    
-    // http connector
-    ServerConnector http = new ServerConnector(server, new HttpConnectionFactory(httpConfig));
-    http.setPort(redirectPort);
-    server.addConnector(http);
-    server.start();
-  }
-  
-  @After
-  public static void after() throws Exception {
-    server.stop();
-  }
-  
-  @Test
-  public void testRedirect() {
-    SonarScanner sonarScanner = SonarScanner.create(ItUtils.projectDir("shared/xoo-sample"))
-      .setScannerVersion("2.7")
-      .setProperty("sonar.host.url", "http://localhost:" + redirectPort);
-    BuildResult buildResult = orchestrator.executeBuild(sonarScanner);
-    
-    // logs show original URL
-    assertThat(buildResult.getLogs()).contains("ANALYSIS SUCCESSFUL, you can browse " + "http://localhost:" + redirectPort);
-    
-  }
-}