Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2016-03-23 04:25:07 -0400
committerMatthias Sohn2016-05-03 12:09:01 -0400
commitf85ed11017ffa6c10d5362e2eb9b293f7521aec2 (patch)
treea43c206479454a11b8cf79f38f689cf495c88b7e /org.eclipse.egit.ui.test/pom.xml
parent59629220c97854b9b480916d8522a340dc8de978 (diff)
downloadegit-f85ed11017ffa6c10d5362e2eb9b293f7521aec2.tar.gz
egit-f85ed11017ffa6c10d5362e2eb9b293f7521aec2.tar.xz
egit-f85ed11017ffa6c10d5362e2eb9b293f7521aec2.zip
Prepare Neon target platform
Use the Neon target platform as the default target platform and explicitly set target platform for org.eclipse.egit.core.test. Update org.junit to 4.12 since 4.11 is not available in the Neon orbit version. Remove the unnecessary Maven dependency to junit declared in pom.xml, it is already declared in manifests and available in the EGit target platform. Neon Eclipse platform requires BREE 8 so we have to use Java 8 for the EGit build (for the compiler settings we still stick to source and target 1.7 since we want to still support Java 7) otherwise unpacking platform pack200 archives will fail since they have been built using Java 8 and hence cannot be unpacked using Java 7's unpack200 [1]. Ignore a couple of tests in ResourceUtilTest which now fail since bug 476585 was fixed in Neon M6. [1] Bug: 478749 CQ: 10693 Change-Id: I013e27c7d96910907604bf5aa729cb651f64620a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui.test/pom.xml')
-rw-r--r--org.eclipse.egit.ui.test/pom.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml
index 2d4a4db15..0ed13a22f 100644
--- a/org.eclipse.egit.ui.test/pom.xml
+++ b/org.eclipse.egit.ui.test/pom.xml
@@ -90,7 +90,6 @@
</includes>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
- <product>org.eclipse.sdk.ide</product>
<argLine>${ui.test.vmargs}</argLine>
<application>org.eclipse.ui.ide.workbench</application>
</configuration>

Back to the top