Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2013-06-14 07:58:12 +0000
committerSteffen Pingel2013-06-14 07:58:12 +0000
commitcef0a4c10ee965afd23cdfb59e86949393949cba (patch)
tree58b09995e96a44f3e3f29bf24691c1a5c58fe4be
parent7f4aeb994e6e54d7e83ba242dc6fcc344cd2119b (diff)
downloadorg.eclipse.mylyn-cef0a4c10ee965afd23cdfb59e86949393949cba.tar.gz
org.eclipse.mylyn-cef0a4c10ee965afd23cdfb59e86949393949cba.tar.xz
org.eclipse.mylyn-cef0a4c10ee965afd23cdfb59e86949393949cba.zip
set https proxy properties for Eclipse.org
Change-Id: Iaefa0edc3fe4720b329207edb973d7dfda878c9b Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=410655
-rw-r--r--org.eclipse.mylyn-parent/pom.xml4
-rw-r--r--org.eclipse.mylyn.releng/vagrant/.gitignore2
2 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.mylyn-parent/pom.xml b/org.eclipse.mylyn-parent/pom.xml
index d194b8a..8fbd660 100644
--- a/org.eclipse.mylyn-parent/pom.xml
+++ b/org.eclipse.mylyn-parent/pom.xml
@@ -502,7 +502,7 @@
<profile>
<id>sandbox.eclipse.org</id>
<properties>
- <test.vmargs>-ea -Dorg.eclipse.mylyn.wikitext.tests.disableOutput=true -Dhttp.proxyHost=proxy.eclipse.org -Dhttp.proxyPort=9898 -DhttpnonProxyHosts=wiki.eclipse.org ${test.uservmargs}</test.vmargs>
+ <test.vmargs>-ea -Dorg.eclipse.mylyn.wikitext.tests.disableOutput=true -Dhttp.proxyHost=proxy.eclipse.org -Dhttp.proxyPort=9898 -Dhttps.proxyHost=proxy.eclipse.org -Dhttps.proxyPort=9898 -DhttpnonProxyHosts=*.eclipse.org ${test.uservmargs}</test.vmargs>
<dist.pack200>/shared/common/jdk-1.5.0-22.x86_64/bin</dist.pack200>
<maven.test.error.ignore>true</maven.test.error.ignore>
<maven.test.failure.ignore>true</maven.test.failure.ignore>
@@ -520,7 +520,7 @@
<mylyn-credentials>/shared/mylyn/.credentials.properties</mylyn-credentials>
<mylyn-keystore>/shared/mylyn/spingel/.keystore</mylyn-keystore>
<test.keyring.password>/shared/mylyn/spingel/.secret</test.keyring.password>
- <test.vmargs>-ea -Dmylyn.credentials=${mylyn-credentials} -Dorg.eclipse.mylyn.wikitext.tests.disableOutput=true -Dhttp.proxyHost=proxy.eclipse.org -Dhttp.proxyPort=9898 -DhttpnonProxyHosts=wiki.eclipse.org -Djavax.net.ssl.keyStore=${mylyn-keystore} -Djavax.net.ssl.keyStorePassword=mylyntest ${test.uservmargs}</test.vmargs>
+ <test.vmargs>-ea -Dmylyn.credentials=${mylyn-credentials} -Dorg.eclipse.mylyn.wikitext.tests.disableOutput=true -Dhttp.proxyHost=proxy.eclipse.org -Dhttp.proxyPort=9898 -Dhttps.proxyHost=proxy.eclipse.org -Dhttps.proxyPort=9898 -DhttpnonProxyHosts=*.eclipse.org -Djavax.net.ssl.keyStore=${mylyn-keystore} -Djavax.net.ssl.keyStorePassword=mylyntest ${test.uservmargs}</test.vmargs>
<!--
<mylyn-test-append>@e${target-version}</mylyn-test-append>
-->
diff --git a/org.eclipse.mylyn.releng/vagrant/.gitignore b/org.eclipse.mylyn.releng/vagrant/.gitignore
index 3d3a5e4..5ff90b6 100644
--- a/org.eclipse.mylyn.releng/vagrant/.gitignore
+++ b/org.eclipse.mylyn.releng/vagrant/.gitignore
@@ -1,2 +1,2 @@
/target
-/.vagrant
+/.vagrant*

Back to the top