diff options
| author | Matthias Sohn | 2016-03-23 08:25:07 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2016-05-03 16:09:01 +0000 |
| commit | f85ed11017ffa6c10d5362e2eb9b293f7521aec2 (patch) | |
| tree | a43c206479454a11b8cf79f38f689cf495c88b7e /pom.xml | |
| parent | 59629220c97854b9b480916d8522a340dc8de978 (diff) | |
| download | egit-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 'pom.xml')
| -rw-r--r-- | pom.xml | 14 |
1 files changed, 1 insertions, 13 deletions
@@ -67,12 +67,11 @@ <tycho-extras-version>${tycho-version}</tycho-extras-version> <jboss-tycho-plugins-version>0.22.0</jboss-tycho-plugins-version> <mockito-version>1.8.4</mockito-version> - <junit-version>4.11</junit-version> <jgit-site>file:/${basedir}/../../jgit/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/target/repository</jgit-site> <license-site>http://download.eclipse.org/cbi/updates/license</license-site> <signer-input-directory>/home/data/httpd/download-staging.priv/egit</signer-input-directory> <download-publish-path>/home/data/httpd/download.eclipse.org/egit/updates-nightly</download-publish-path> - <target-platform>egit-4.5</target-platform> + <target-platform>egit-4.6-staging</target-platform> <tycho.scmUrl>scm:git:https://git.eclipse.org/r/egit/egit.git</tycho.scmUrl> <test.vmparams></test.vmparams> <coretest.vmparams></coretest.vmparams> @@ -510,17 +509,6 @@ </dependency> </dependencies> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit-version}</version> - <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> - <distributionManagement> <repository> <id>repo.eclipse.org</id> |