From 80543877bef009dad9ed1dc4a3171616890a55b3 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 11 Apr 2017 16:18:28 +0200 Subject: [PATCH] (wip) upgrade Orchestrator --- it/it-tests/src/test/java/it/analysis/SSLTest.java | 6 ++++-- pom.xml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/it/it-tests/src/test/java/it/analysis/SSLTest.java b/it/it-tests/src/test/java/it/analysis/SSLTest.java index 8ee76c6653df..c4c93c1f2472 100644 --- a/it/it-tests/src/test/java/it/analysis/SSLTest.java +++ b/it/it-tests/src/test/java/it/analysis/SSLTest.java @@ -24,6 +24,7 @@ import com.sonar.orchestrator.build.SonarScanner; import com.sonar.orchestrator.util.NetworkUtils; import it.Category3Suite; +import java.net.InetAddress; import java.nio.file.Path; import java.nio.file.Paths; import org.eclipse.jetty.http.HttpVersion; @@ -69,8 +70,8 @@ public void deleteData() { } public static void startSSLTransparentReverseProxy(boolean requireClientAuth) throws Exception { - int httpPort = NetworkUtils.getNextAvailablePort(); - httpsPort = NetworkUtils.getNextAvailablePort(); + int httpPort = NetworkUtils.getNextAvailablePort(InetAddress.getLoopbackAddress()); + httpsPort = NetworkUtils.getNextAvailablePort(InetAddress.getLoopbackAddress()); // Setup Threadpool QueuedThreadPool threadPool = new QueuedThreadPool(); @@ -92,6 +93,7 @@ public static void startSSLTransparentReverseProxy(boolean requireClientAuth) th ServerConnector http = new ServerConnector(server, new HttpConnectionFactory(httpConfig)); http.setPort(httpPort); + http.setHost(InetAddress.getLoopbackAddress().getHostAddress()); server.addConnector(http); Path serverKeyStore = Paths.get(SSLTest.class.getResource("/analysis/SSLTest/serverkeystore.jks").toURI()).toAbsolutePath(); diff --git a/pom.xml b/pom.xml index 3a583205126e..a12d06e0d420 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 1.7.21 8.5.11 2.4.4 - 3.15.0.917 + 3.15-SNAPSHOT 3.3.1 2.6.6