Repository: maven-integration-testing Updated Branches: refs/heads/MNG-6202 [created] 416175933
[MNG-6202] Cannot pass nonProxyHosts to ITs making remote tests lock up when proxy rejects to proxy internal hosts Set default value 'localhost' of 'proxy.nonProxyHosts' and allow users to override if necessary. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/41617593 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/41617593 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/41617593 Branch: refs/heads/MNG-6202 Commit: 416175933fc0bc0c57e233aa0f6c48bd7c070ec0 Parents: 0e1fc36 Author: Michael Osipov <micha...@apache.org> Authored: Sat Apr 1 22:10:35 2017 +0200 Committer: Michael Osipov <micha...@apache.org> Committed: Sat Apr 1 22:10:35 2017 +0200 ---------------------------------------------------------------------- core-it-suite/pom.xml | 8 +++++--- core-it-suite/src/site/apt/index.apt.vm | 7 ++++--- .../src/test/resources-filtered/settings-remote.xml | 2 +- run-its.bat | 4 ++-- run-its.sh | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/41617593/core-it-suite/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/pom.xml b/core-it-suite/pom.xml index bf03ace..8cfb3cb 100644 --- a/core-it-suite/pom.xml +++ b/core-it-suite/pom.xml @@ -58,9 +58,10 @@ under the License. ITs that don't require to fork Maven can also be run from the IDE using the Maven projects from the workspace if the Maven dependencies are added to the test class path. - If you're behind a proxy, use the system properties proxy.host, proxy.port, proxy.user and proxy.pass to specify the - required proxy setup for the ITs. Alternatively, set the system property maven.it.central to a URL of a local - repository manager that proxies the required artifacts. + If you're behind a proxy, use the system properties proxy.host, proxy.port, proxy.user, proxy.pass and + proxy.nonProxyHosts to specify the required proxy setup for the ITs. Alternatively, set the system property + maven.it.central to a URL of a local repository manager (anonymous authentication only) that proxies the + required artifacts. --> <properties> @@ -78,6 +79,7 @@ under the License. <proxy.type>none</proxy.type> <proxy.user></proxy.user> <proxy.pass></proxy.pass> + <proxy.nonProxyHosts>localhost</proxy.nonProxyHosts> <slf4jVersion>1.6.1</slf4jVersion> <jetty9Version>9.0.4.v20130625</jetty9Version> </properties> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/41617593/core-it-suite/src/site/apt/index.apt.vm ---------------------------------------------------------------------- diff --git a/core-it-suite/src/site/apt/index.apt.vm b/core-it-suite/src/site/apt/index.apt.vm index cdbf980..ce57d20 100644 --- a/core-it-suite/src/site/apt/index.apt.vm +++ b/core-it-suite/src/site/apt/index.apt.vm @@ -59,9 +59,10 @@ mvn clean test -Prun-its -DmavenVersion=2.2.1 ITs that don't require to fork Maven can also be run from the IDE using the Maven projects from the workspace if the Maven dependencies are added to the test class path. - If you're behind a proxy, use the <<<proxy.host>>>, <<<proxy.port>>>, <<<proxy.user>>> and <<<proxy.pass>>> system properties - to specify the required proxy setup for the ITs. Alternatively, set the <<<maven.it.central>>> system property to a URL of a local - repository manager that proxies the required artifacts. + If you're behind a proxy, use the system properties <<<proxy.host>>>, <<<proxy.port>>>, <<<proxy.user>>>, <<<proxy.pass>>> + and <<<proxy.nonProxyHosts>>> to specify the required proxy setup for the ITs. Alternatively, set the system property + <<<maven.it.central>>> to a URL of a local repository manager (anonymous authentication only) that proxies the required + artifacts. * Results http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/41617593/core-it-suite/src/test/resources-filtered/settings-remote.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources-filtered/settings-remote.xml b/core-it-suite/src/test/resources-filtered/settings-remote.xml index 6cac118..d0d696e 100644 --- a/core-it-suite/src/test/resources-filtered/settings-remote.xml +++ b/core-it-suite/src/test/resources-filtered/settings-remote.xml @@ -34,7 +34,7 @@ plugins/artifacts from test repos so use of these settings should be the excepti <port>${proxy.port}</port> <username>${proxy.user}</username> <password>${proxy.pass}</password> - <nonProxyHosts>localhost</nonProxyHosts> + <nonProxyHosts>${proxy.nonProxyHosts}</nonProxyHosts> </proxy> </proxies> <profiles> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/41617593/run-its.bat ---------------------------------------------------------------------- diff --git a/run-its.bat b/run-its.bat index 8bb9faf..e4b4deb 100644 --- a/run-its.bat +++ b/run-its.bat @@ -19,8 +19,8 @@ @REM How JvZ runs the ITs from a clean slate if it would be on Windows -mvn clean install -Prun-its,embedded -Dmaven.repo.local=%cd%/repo +mvn clean install -Prun-its,embedded -Dmaven.repo.local=%cd%\repo @REM If behind a proxy try this.. -@REM mvn clean install -Prun-its,embedded -Dmaven.repo.local=%cd%/repo -Dproxy.active=true -Dproxy.type=http -Dproxy.host=<host> -Dproxy.port=<port> -Dproxy.user= -Dproxy.pass= +@REM mvn clean install -Prun-its,embedded -Dmaven.repo.local=%cd%\repo -Dproxy.host=<host> -Dproxy.port=<port> -Dproxy.user= -Dproxy.pass= -Dproxy.nonProxyHosts<hosts> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/41617593/run-its.sh ---------------------------------------------------------------------- diff --git a/run-its.sh b/run-its.sh index 76de23d..d13fce6 100755 --- a/run-its.sh +++ b/run-its.sh @@ -25,4 +25,4 @@ mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo # If behind a proxy try this -# mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo -Dproxy.active=true -Dproxy.type=http -Dproxy.host=<host> -Dproxy.port=<port> -Dproxy.user= -Dproxy.pass= +# mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo -Dproxy.host=<host> -Dproxy.port=<port> -Dproxy.user= -Dproxy.pass= -Dproxy.nonProxyHosts=<hosts>
