Bug 535208: papyrus for information modeling build failure on oxygen
https://bugs.eclipse.org/bugs/show_bug.cgi?id=535208
- Use a fixed version of EGit (4.9.2) so that we don't break again on
future EGit Updates (EGit doesn't provide any update site with more than
1 version)
Change-Id: I265acbe88e9f718e299e2ff5e8ca24a9f8c19b4b
Signed-off-by: Camille Letavernier <cletavernier@eclipsesource.com>
diff --git a/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.oxygen/org.eclipse.papyrus.information.modeling.targetplatform.oxygen.target b/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.oxygen/org.eclipse.papyrus.information.modeling.targetplatform.oxygen.target
index 03e24b3..8d52a19 100755
--- a/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.oxygen/org.eclipse.papyrus.information.modeling.targetplatform.oxygen.target
+++ b/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.oxygen/org.eclipse.papyrus.information.modeling.targetplatform.oxygen.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="Papyrus Oxygen" sequenceNumber="1515074670">
+<target name="Papyrus Oxygen" sequenceNumber="1527577068">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.draw2d.feature.group" version="3.10.100.201606061308"/>
@@ -15,7 +15,7 @@
<unit id="org.eclipse.equinox.executable.feature.group" version="3.7.2.v20171108-1834"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.1.1.v20170906-1259"/>
<unit id="org.eclipse.gmf.feature.group" version="1.11.0.201706061437"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.13.2.v20171130-0906"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.13.4.v20180330-0919"/>
<unit id="org.eclipse.m2m.qvt.oml.feature.group" version="3.7.0.v20170604-1316"/>
<unit id="org.eclipse.m2m.qvt.oml.project" version="3.7.0.v20170604-1316"/>
<unit id="org.eclipse.ocl.all.feature.group" version="5.3.0.v20170522-1736"/>
@@ -23,13 +23,13 @@
<unit id="org.eclipse.ocl.core.sdk.feature.group" version="5.3.0.v20170522-1736"/>
<unit id="org.eclipse.ocl.examples.feature.group" version="6.3.0.v20170613-1432"/>
<unit id="org.eclipse.ocl.uml.feature.group" version="5.3.0.v20170522-1736"/>
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.2.0.201712060842"/>
- <unit id="org.eclipse.pde.feature.group" version="3.13.2.v20171130-0510"/>
- <unit id="org.eclipse.platform.feature.group" version="4.7.2.v20171130-0510"/>
- <unit id="org.eclipse.rcp.feature.group" version="4.7.2.v20171130-0510"/>
+ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.3.0.201803070847"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.13.4.v20180330-0640"/>
+ <unit id="org.eclipse.platform.feature.group" version="4.7.3.v20180330-0640"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.7.3.v20180330-0640"/>
<unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
- <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.9.1.v201707201954"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.9.1.v201707042225"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.9.1.v201803221834"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.9.2.v201711080222"/>
<unit id="org.eclipse.xpand.feature.group" version="2.2.0.v201605260315"/>
<unit id="org.eclipse.xsd.feature.group" version="2.13.0.v20170609-0928"/>
<unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201605260315"/>
@@ -51,8 +51,8 @@
<repository location="https://hudson.eclipse.org/papyrus/job/Papyrus-Compare-Oxygen-Integration/lastSuccessfulBuild/artifact/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="4.10.0.201712302008-r"/>
- <repository location="http://download.eclipse.org/egit/updates"/>
+ <unit id="org.eclipse.egit.feature.group" version="4.9.2.201712150930-r"/>
+ <repository location="http://download.eclipse.org/egit/updates-4.9.2"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
diff --git a/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.oxygen/org.eclipse.papyrus.information.modeling.targetplatform.oxygen.tpd b/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.oxygen/org.eclipse.papyrus.information.modeling.targetplatform.oxygen.tpd
index 2f6720b..6b8d043 100755
--- a/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.oxygen/org.eclipse.papyrus.information.modeling.targetplatform.oxygen.tpd
+++ b/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.oxygen/org.eclipse.papyrus.information.modeling.targetplatform.oxygen.tpd
@@ -51,7 +51,11 @@
org.eclipse.papyrus.compare.feature.feature.group lazy
}
-location "http://download.eclipse.org/egit/updates" {
+location "http://download.eclipse.org/egit/updates-4.9.2" {
+ // Use a fixed version, because EGit doesn't provide any update site with
+ // more than one version. EGit is moving to 5.0.0 soon, and I'm not sure
+ // EMF Compare Oxygen would be compatible with that; so Lazy is really not an option
+ // either
org.eclipse.egit.feature.group [4.9.0,5.0.0)
}
