diff options
| author | Sam Davis | 2015-05-27 16:32:50 +0000 |
|---|---|---|
| committer | Sam Davis | 2015-05-27 16:32:50 +0000 |
| commit | d84a1f8292d65b5e6c14ffd34514ce1dda74fcb8 (patch) | |
| tree | a868bc2ef82da22b816bcf6da3575748787da5cd | |
| parent | 8aa2f10e919651992b50d9f5833f4ee9d743defb (diff) | |
| download | org.eclipse.mylyn-d84a1f8292d65b5e6c14ffd34514ce1dda74fcb8.tar.gz org.eclipse.mylyn-d84a1f8292d65b5e6c14ffd34514ce1dda74fcb8.tar.xz org.eclipse.mylyn-d84a1f8292d65b5e6c14ffd34514ce1dda74fcb8.zip | |
use Java 7 for packing
| -rw-r--r-- | org.eclipse.mylyn-parent/pom.xml | 4 | ||||
| -rw-r--r-- | org.eclipse.mylyn-site/pack-and-sign/sign-and-wait.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.mylyn-parent/pom.xml b/org.eclipse.mylyn-parent/pom.xml index 0597de19..f631b007 100644 --- a/org.eclipse.mylyn-parent/pom.xml +++ b/org.eclipse.mylyn-parent/pom.xml @@ -471,7 +471,7 @@ <id>sandbox.eclipse.org</id> <properties> <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> + <dist.pack200>/shared/common/jdk1.7.0-latest/bin</dist.pack200> <maven.test.error.ignore>true</maven.test.error.ignore> <maven.test.failure.ignore>true</maven.test.failure.ignore> </properties> @@ -490,7 +490,7 @@ <!-- <mylyn-test-append>@e${target-version}</mylyn-test-append> --> - <dist.pack200>/shared/common/jdk-1.5.0-22.x86_64/bin</dist.pack200> + <dist.pack200>/shared/common/jdk1.7.0-latest/bin</dist.pack200> <maven.test.error.ignore>true</maven.test.error.ignore> <maven.test.failure.ignore>true</maven.test.failure.ignore> </properties> diff --git a/org.eclipse.mylyn-site/pack-and-sign/sign-and-wait.sh b/org.eclipse.mylyn-site/pack-and-sign/sign-and-wait.sh index f33743a5..b1743a38 100644 --- a/org.eclipse.mylyn-site/pack-and-sign/sign-and-wait.sh +++ b/org.eclipse.mylyn-site/pack-and-sign/sign-and-wait.sh @@ -47,7 +47,7 @@ tail -f $LOG | grep -E \(Extracting\|Finished\) & I=0 while [ $I -lt 120 ] && [ ! -e $OUT/site.zip ]; do - echo Waiting for $OUT/site.zip... $1 / 120 + echo Waiting for $OUT/site.zip... $I / 120 sleep 30 let I=I+1 done |