Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2016-03-23 08:25:07 +0000
committerMatthias Sohn2016-05-03 16:09:01 +0000
commitf85ed11017ffa6c10d5362e2eb9b293f7521aec2 (patch)
treea43c206479454a11b8cf79f38f689cf495c88b7e
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>
-rw-r--r--org.eclipse.egit.core.test/pom.xml21
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ResourceUtilTest.java4
-rw-r--r--org.eclipse.egit.mylyn.ui.test/pom.xml8
-rw-r--r--org.eclipse.egit.target/egit-4.6-staging.target (renamed from org.eclipse.egit.target/egit-4.5-staging.target)16
-rw-r--r--org.eclipse.egit.target/egit-4.6-staging.tpd (renamed from org.eclipse.egit.target/egit-4.5-staging.tpd)4
-rw-r--r--org.eclipse.egit.target/egit-4.6.target14
-rw-r--r--org.eclipse.egit.target/egit-4.6.tpd4
-rw-r--r--org.eclipse.egit.target/orbit/S20160501200945-Neon.tpd (renamed from org.eclipse.egit.target/orbit/S20151204220443-Neon.tpd)12
-rw-r--r--org.eclipse.egit.target/releasetrain/4.6-neon.tpd14
-rw-r--r--org.eclipse.egit.ui.test/pom.xml1
-rw-r--r--pom.xml14
11 files changed, 65 insertions, 47 deletions
diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml
index 2fc38272a4..0cd8f8117e 100644
--- a/org.eclipse.egit.core.test/pom.xml
+++ b/org.eclipse.egit.core.test/pom.xml
@@ -28,6 +28,27 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>org.eclipse.jgit</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.egit.core</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<excludes>
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ResourceUtilTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ResourceUtilTest.java
index 810b1723b8..21ebb63eba 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ResourceUtilTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ResourceUtilTest.java
@@ -29,6 +29,7 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -73,6 +74,7 @@ public class ResourceUtilTest extends GitTestCase {
assertThat(resource, nullValue());
}
+ @Ignore
@Test
public void getFileForLocationShouldReturnExistingFileInCaseOfNestedProject()
throws Exception {
@@ -92,6 +94,7 @@ public class ResourceUtilTest extends GitTestCase {
assertThat(result.getProject(), is(nested.getProject()));
}
+ @Ignore
@Test
public void getFileForLocationShouldReturnExistingFileInCaseOfNestedNotClosedProject()
throws Exception {
@@ -114,6 +117,7 @@ public class ResourceUtilTest extends GitTestCase {
assertThat(result.getProject(), is(nested.getProject()));
}
+ @Ignore
@Test
public void getFileForLocationShouldNotUseFilesWithoutRepositoryMapping()
throws Exception {
diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml
index 0b4e512cff..eb43832d85 100644
--- a/org.eclipse.egit.mylyn.ui.test/pom.xml
+++ b/org.eclipse.egit.mylyn.ui.test/pom.xml
@@ -94,18 +94,10 @@
</includes>
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
- <product>org.eclipse.sdk.ide</product>
<argLine>${ui.test.vmargs}</argLine>
<application>org.eclipse.ui.ide.workbench</application>
</configuration>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
diff --git a/org.eclipse.egit.target/egit-4.5-staging.target b/org.eclipse.egit.target/egit-4.6-staging.target
index 8504457db3..d4af3e3d63 100644
--- a/org.eclipse.egit.target/egit-4.5-staging.target
+++ b/org.eclipse.egit.target/egit-4.6-staging.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="egit-4.5-staging" sequenceNumber="1456522945">
+<target name="egit-4.6-staging" sequenceNumber="1462141739">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.2.13.v20150730"/>
@@ -48,16 +48,16 @@
<unit id="javaewah.source" version="0.7.9.v201401101600"/>
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
- <unit id="org.apache.ant" version="1.9.4.v201504302020"/>
- <unit id="org.apache.ant.source" version="1.9.4.v201504302020"/>
+ <unit id="org.apache.ant" version="1.9.6.v201510161327"/>
+ <unit id="org.apache.ant.source" version="1.9.6.v201510161327"/>
<unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
<unit id="org.apache.commons.compress.source" version="1.6.0.v201310281400"/>
<unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
<unit id="org.apache.commons.logging.source" version="1.1.1.v201101211721"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.3.3.v201411290715"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.3.3.v201411290715"/>
- <unit id="org.apache.httpcomponents.httpclient" version="4.3.6.v201411290715B"/>
- <unit id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201411290715B"/>
+ <unit id="org.apache.httpcomponents.httpclient" version="4.3.6.v201511171540"/>
+ <unit id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201511171540"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
@@ -73,8 +73,8 @@
<unit id="org.hamcrest.library.source" version="1.3.0.v201505072020"/>
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
- <unit id="org.junit" version="4.11.0.v201303080030"/>
- <unit id="org.junit.source" version="4.11.0.v201303080030"/>
+ <unit id="org.junit" version="4.12.0.v201504281640"/>
+ <unit id="org.junit.source" version="4.12.0.v201504281640"/>
<unit id="org.mockito" version="1.8.4.v201303031500"/>
<unit id="org.mockito.source" version="1.8.4.v201303031500"/>
<unit id="org.objenesis" version="1.0.0.v201505121915"/>
@@ -85,7 +85,7 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
<unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20160501200945/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
diff --git a/org.eclipse.egit.target/egit-4.5-staging.tpd b/org.eclipse.egit.target/egit-4.6-staging.tpd
index deb6a0402b..c13171e919 100644
--- a/org.eclipse.egit.target/egit-4.5-staging.tpd
+++ b/org.eclipse.egit.target/egit-4.6-staging.tpd
@@ -1,8 +1,8 @@
-target "egit-4.5-staging" with source configurePhase
+target "egit-4.6-staging" with source configurePhase
include "projects/jetty-9.2.13.tpd"
include "projects/swtbot-2.3.0.tpd"
include "projects/mylyn-latest.tpd"
-include "orbit/R20160221192158-Mars.tpd"
+include "orbit/S20160501200945-Neon.tpd"
include "releasetrain/staging.tpd"
include "projects/easymport.tpd"
diff --git a/org.eclipse.egit.target/egit-4.6.target b/org.eclipse.egit.target/egit-4.6.target
index 6e4c46d037..4c4c313ad8 100644
--- a/org.eclipse.egit.target/egit-4.6.target
+++ b/org.eclipse.egit.target/egit-4.6.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="egit-4.6" sequenceNumber="1455835644">
+<target name="egit-4.6" sequenceNumber="1462141679">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.2.13.v20150730"/>
@@ -48,8 +48,8 @@
<unit id="javaewah.source" version="0.7.9.v201401101600"/>
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
- <unit id="org.apache.ant" version="1.9.4.v201504302020"/>
- <unit id="org.apache.ant.source" version="1.9.4.v201504302020"/>
+ <unit id="org.apache.ant" version="1.9.6.v201510161327"/>
+ <unit id="org.apache.ant.source" version="1.9.6.v201510161327"/>
<unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
<unit id="org.apache.commons.compress.source" version="1.6.0.v201310281400"/>
<unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
@@ -73,8 +73,8 @@
<unit id="org.hamcrest.library.source" version="1.3.0.v201505072020"/>
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
- <unit id="org.junit" version="4.11.0.v201303080030"/>
- <unit id="org.junit.source" version="4.11.0.v201303080030"/>
+ <unit id="org.junit" version="4.12.0.v201504281640"/>
+ <unit id="org.junit.source" version="4.12.0.v201504281640"/>
<unit id="org.mockito" version="1.8.4.v201303031500"/>
<unit id="org.mockito.source" version="1.8.4.v201303031500"/>
<unit id="org.objenesis" version="1.0.0.v201505121915"/>
@@ -85,7 +85,7 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
<unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20151204220443/repository/"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20160501200945/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
@@ -98,7 +98,7 @@
<unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.mylyn.sdk_feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/mars/"/>
+ <repository location="http://download.eclipse.org/releases/neon/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.e4.ui.importer" version="0.0.0"/>
diff --git a/org.eclipse.egit.target/egit-4.6.tpd b/org.eclipse.egit.target/egit-4.6.tpd
index e142200154..7ca96976b4 100644
--- a/org.eclipse.egit.target/egit-4.6.tpd
+++ b/org.eclipse.egit.target/egit-4.6.tpd
@@ -3,6 +3,6 @@ target "egit-4.6" with source configurePhase
include "projects/jetty-9.2.13.tpd"
include "projects/swtbot-snapshot.tpd"
include "projects/mylyn-latest.tpd"
-include "orbit/S20151204220443-Neon.tpd"
-include "releasetrain/4.5-mars.tpd"
+include "orbit/S20160501200945-Neon.tpd"
+include "releasetrain/4.6-neon.tpd"
include "projects/easymport.tpd"
diff --git a/org.eclipse.egit.target/orbit/S20151204220443-Neon.tpd b/org.eclipse.egit.target/orbit/S20160501200945-Neon.tpd
index 45f1bc86ef..4e0f329a76 100644
--- a/org.eclipse.egit.target/orbit/S20151204220443-Neon.tpd
+++ b/org.eclipse.egit.target/orbit/S20160501200945-Neon.tpd
@@ -1,7 +1,7 @@
-target "S20151204220443-Neon" with source configurePhase
+target "S20160501200945-Neon" with source configurePhase
// see http://download.eclipse.org/tools/orbit/downloads/
-location "http://download.eclipse.org/tools/orbit/downloads/drops/S20151204220443/repository/" {
+location "http://download.eclipse.org/tools/orbit/downloads/drops/S20160501200945/repository/" {
com.google.gson [2.2.4.v201311231704,2.2.4.v201311231704]
com.google.gson.source [2.2.4.v201311231704,2.2.4.v201311231704]
com.jcraft.jsch [0.1.53.v201508180515,0.1.53.v201508180515]
@@ -10,8 +10,8 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/S2015120422044
javaewah.source [0.7.9.v201401101600,0.7.9.v201401101600]
javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800]
javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800]
- org.apache.ant [1.9.4.v201504302020,1.9.4.v201504302020]
- org.apache.ant.source [1.9.4.v201504302020,1.9.4.v201504302020]
+ org.apache.ant [1.9.6.v201510161327,1.9.6.v201510161327]
+ org.apache.ant.source [1.9.6.v201510161327,1.9.6.v201510161327]
org.apache.commons.compress [1.6.0.v201310281400,1.6.0.v201310281400]
org.apache.commons.compress.source [1.6.0.v201310281400,1.6.0.v201310281400]
org.apache.commons.logging [1.1.1.v201101211721,1.1.1.v201101211721]
@@ -35,8 +35,8 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/S2015120422044
org.hamcrest.library.source [1.3.0.v201505072020,1.3.0.v201505072020]
org.hamcrest.text [1.1.0.v20090501071000,1.1.0.v20090501071000]
org.hamcrest.text.source [1.1.0.v20090501071000,1.1.0.v20090501071000]
- org.junit [4.11.0.v201303080030,4.11.0.v201303080030]
- org.junit.source [4.11.0.v201303080030,4.11.0.v201303080030]
+ org.junit [4.12.0.v201504281640,4.12.0.v201504281640]
+ org.junit.source [4.12.0.v201504281640,4.12.0.v201504281640]
org.mockito [1.8.4.v201303031500,1.8.4.v201303031500]
org.mockito.source [1.8.4.v201303031500,1.8.4.v201303031500]
org.objenesis [1.0.0.v201505121915,1.0.0.v201505121915]
diff --git a/org.eclipse.egit.target/releasetrain/4.6-neon.tpd b/org.eclipse.egit.target/releasetrain/4.6-neon.tpd
new file mode 100644
index 0000000000..d61e012812
--- /dev/null
+++ b/org.eclipse.egit.target/releasetrain/4.6-neon.tpd
@@ -0,0 +1,14 @@
+target "4.6-neon" with source configurePhase
+
+location "http://download.eclipse.org/releases/neon/" {
+ org.eclipse.sdk.ide lazy
+ org.eclipse.emf.sdk.feature.group lazy
+ org.eclipse.mylyn.commons.sdk.feature.group lazy
+ org.eclipse.mylyn.ide_feature.feature.group lazy
+ org.eclipse.mylyn.team_feature.feature.group lazy
+ org.eclipse.mylyn.context.sdk.feature.group lazy
+ org.eclipse.mylyn_feature.feature.group lazy
+ org.eclipse.mylyn.context_feature.feature.group lazy
+ org.eclipse.mylyn.sdk_feature.feature.group lazy
+ org.eclipse.mylyn.wikitext_feature.feature.group lazy
+}
diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml
index 2d4a4db154..0ed13a22f7 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>
diff --git a/pom.xml b/pom.xml
index 9704e1fc27..ea2652d5c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>

Back to the top