diff options
| author | nickboldt | 2017-10-30 20:59:46 +0000 |
|---|---|---|
| committer | nickboldt | 2017-10-30 20:59:50 +0000 |
| commit | b6b2948ff1bb49c7b4c3f3b095582524aa0e0352 (patch) | |
| tree | 64499e9bacba52800a8540233a009eb3c5ecc17c | |
| parent | 08392bc522d2a8016d858998c547f11a95686237 (diff) | |
| download | webtools.webservices-b6b2948ff1bb49c7b4c3f3b095582524aa0e0352.tar.gz webtools.webservices-b6b2948ff1bb49c7b4c3f3b095582524aa0e0352.tar.xz webtools.webservices-b6b2948ff1bb49c7b4c3f3b095582524aa0e0352.zip | |
replace maven-to-p2 deps with proper p2 ones in manifest.mf. update to java 8 BREE, because why the heck not? comment out the non-working proxy.eclipse.org thing for now, since it prevents building locally outside Eclipse.org domain. Add process timeout so we don't wait 30 mins for a test to fail
Signed-off-by: nickboldt <nboldt@redhat.com>
| -rw-r--r-- | tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF | 4 | ||||
| -rw-r--r-- | tests/org.eclipse.wst.wsi.tests/pom.xml | 16 |
2 files changed, 6 insertions, 14 deletions
diff --git a/tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF index 9c2ed6ca8..7a88c929a 100644 --- a/tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF @@ -12,9 +12,11 @@ Require-Bundle: org.eclipse.wst.wsi, org.junit;bundle-version="3.8.0", javax.wsdl;bundle-version="[1.5.0,1.6.0)", org.eclipse.osgi, + com.ibm.icu, org.eclipse.core.runtime, + org.eclipse.wst.standard.schemas, org.eclipse.wst.command.env, org.eclipse.wst.command.env.core Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.wst.wsi.tests.internal -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/org.eclipse.wst.wsi.tests/pom.xml b/tests/org.eclipse.wst.wsi.tests/pom.xml index 61cc5a518..9e102adaf 100644 --- a/tests/org.eclipse.wst.wsi.tests/pom.xml +++ b/tests/org.eclipse.wst.wsi.tests/pom.xml @@ -41,19 +41,9 @@ <include>**/*Bucket.java</include> <include>**/*Test.java</include> </includes> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>com.ibm.icu</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.standard.schemas</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> - <argLine>-Dhttp.proxyHost=proxy.eclipse.org -Dhttp.proxyPort=9898</argLine> + <!-- <argLine>-Dhttp.proxyHost=proxy.eclipse.org -Dhttp.proxyPort=9898</argLine> --> + <!-- override with -Dsurefire.timeout=... --> + <forkedProcessTimeoutInSeconds>120</forkedProcessTimeoutInSeconds> </configuration> </plugin> </plugins> |