Skip to content

Commit

Permalink
(wip) upgrade Orchestrator
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Brandhof committed Apr 11, 2017
1 parent f4bb72a commit 8054387
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions it/it-tests/src/test/java/it/analysis/SSLTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<slf4j.version>1.7.21</slf4j.version>
<tomcat.version>8.5.11</tomcat.version>
<elasticsearch.version>2.4.4</elasticsearch.version>
<orchestrator.version>3.15.0.917</orchestrator.version>
<orchestrator.version>3.15-SNAPSHOT</orchestrator.version>
<okhttp.version>3.3.1</okhttp.version>
<jackson.version>2.6.6</jackson.version>

Expand Down

0 comments on commit 8054387

Please sign in to comment.