Repository: maven-indexer Updated Branches: refs/heads/master 2c916cbda -> 8769a2d20
MINDEXER-89: Use a more uncommon port for Jetty in the DefaultIndexUpdaterEmbeddingIT to avoid "Address already in use" Applied fix suggested by Tamas. Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/8769a2d2 Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/8769a2d2 Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/8769a2d2 Branch: refs/heads/master Commit: 8769a2d20bea6d8f8a8aecb61c5f4e6d76943cae Parents: 2c916cb Author: Martin Todorov <[email protected]> Authored: Fri Aug 29 11:55:23 2014 +0100 Committer: Martin Todorov <[email protected]> Committed: Fri Aug 29 11:55:23 2014 +0100 ---------------------------------------------------------------------- indexer-core/pom.xml | 1 - .../updater/DefaultIndexUpdaterEmbeddingIT.java | 16 +++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/8769a2d2/indexer-core/pom.xml ---------------------------------------------------------------------- diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml index ca90740..c2e1454 100644 --- a/indexer-core/pom.xml +++ b/indexer-core/pom.xml @@ -193,7 +193,6 @@ under the License. <systemPropertyVariables> <java.io.tmpdir>${project.build.directory}</java.io.tmpdir> <indexerJar>${project.build.directory}/${project.artifactId}-${project.version}-cli.jar</indexerJar> - <index-server>${index-server}</index-server> </systemPropertyVariables> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/8769a2d2/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java b/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java index 602758c..c9e948c 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java +++ b/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java @@ -21,6 +21,7 @@ package org.apache.maven.index.updater; import java.io.File; import java.io.IOException; +import java.net.ServerSocket; import java.util.ArrayList; import java.util.List; @@ -58,18 +59,11 @@ public class DefaultIndexUpdaterEmbeddingIT public void setUp() throws Exception { - // FIXME: Try to detect the port from the system environment. - int port = -1; - String portStr = System.getProperty( "index-server" ); - if ( portStr != null ) + int port; + try ( final ServerSocket ss = new ServerSocket( 0 ) ) { - port = Integer.parseInt( portStr ); - } - - if ( port < 1024 ) - { - System.out.println( "Using default port: 8080" ); - port = 8080; + ss.setReuseAddress( true ); + port = ss.getLocalPort(); } baseUrl = "http://127.0.0.1:"; + port + "/";
