Bug 502480: Pin build system to Papyrus Neon.1 release
Fix the nightly Core build with a temporary hack to build
it on the rt.included platform, which includes Tooling,
instead of just the core platform.
Change-Id: Ifbed01bfaff7eb0e389d84b852dec160aaba1f27
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.target
index b35c42d..b47fed7 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.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 Neon Nightly TP for Core" sequenceNumber="1475210107">
+<target name="Papyrus Neon Nightly TP for Core" sequenceNumber="1475156150">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -58,9 +58,5 @@
<unit id="org.eclipse.papyrus.infra.gmfdiag.elk.feature.feature.group" version="0.0.0"/>
<repository id="papyrus-neon" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/2.0/"/>
</location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
- <repository id="papyrus-rt-tooling" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Tooling/lastSuccessfulBuild/artifact/repository/"/>
- </location>
</locations>
</target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.tpd
index fed1ee6..9e772fe 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.tpd
@@ -9,7 +9,4 @@
include "../org.eclipse.papyrusrt.targetplatform.neon.papyrus/org.eclipse.papyrusrt.targetplatform.neon.papyrus.tpd"
-// FIXME: The Core tests should not require the Tooling bundles.
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Tooling/lastSuccessfulBuild/artifact/repository/" papyrus-rt-tooling {
- org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group lazy
-}
+
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.target
index cb04cf9..eba988f 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.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 Neon Nightly TP for Core" sequenceNumber="1475210107">
+<target name="Papyrus Neon Nightly TP for Core" sequenceNumber="1475156306">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -58,9 +58,5 @@
<unit id="org.eclipse.papyrus.infra.gmfdiag.elk.feature.feature.group" version="0.0.0"/>
<repository id="papyrus-neon" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/neon/"/>
</location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
- <repository id="papyrus-rt-tooling" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Tooling/lastSuccessfulBuild/artifact/repository/"/>
- </location>
</locations>
</target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.tpd
index fed1ee6..9e772fe 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.tpd
@@ -9,7 +9,4 @@
include "../org.eclipse.papyrusrt.targetplatform.neon.papyrus/org.eclipse.papyrusrt.targetplatform.neon.papyrus.tpd"
-// FIXME: The Core tests should not require the Tooling bundles.
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Tooling/lastSuccessfulBuild/artifact/repository/" papyrus-rt-tooling {
- org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group lazy
-}
+
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.target
index fc84ed7..df0c8ef 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.target
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Neon Nightly TP for Core" sequenceNumber="1475210107">
+<target name="Papyrus Neon Nightly TP for Core" sequenceNumber="1475158072">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
<repository id="eclipse-papyrus-developer-master" location="http://hudson.eclipse.org/papyrus/job/Papyrus-Neon-Developer/lastSuccessfulBuild/artifact/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.2.0.201602091803"/>
+ <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.2.0.201602091803"/>
+ <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.1.0.201602091803"/>
+ <unit id="org.eclipse.emf.compare.feature.group" version="3.2.0.201602091803"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.2.0.201602091803"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.2.0.201602091803"/>
+ <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.2.0.201602091803"/>
<repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.egit.feature.group" version="4.2.0.201510271050"/>
<repository location="http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/integration/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -58,9 +58,5 @@
<unit id="org.eclipse.papyrus.infra.gmfdiag.elk.feature.feature.group" version="0.1.0.201609141604"/>
<repository id="papyrus-neon" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon/"/>
</location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
- <repository id="papyrus-rt-tooling" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Tooling/lastSuccessfulBuild/artifact/repository/"/>
- </location>
</locations>
</target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.tpd
index 6717f74..9e772fe 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.neon.core/org.eclipse.papyrusrt.targetplatform.neon.core.tpd
@@ -9,7 +9,4 @@
include "../org.eclipse.papyrusrt.targetplatform.neon.papyrus/org.eclipse.papyrusrt.targetplatform.neon.papyrus.tpd"
-// FIXME: The Core tests should not require the Tooling bundles.
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Tooling/lastSuccessfulBuild/artifact/repository/" papyrus-rt-tooling {
- org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group
-}
+
diff --git a/pom.xml b/pom.xml
index bcebdc8..740fa31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -508,7 +508,11 @@
</modules>
<properties>
- <target.kind>core</target.kind>
+ <!--
+ FIXME: The Core tests must not require the Tooling bundles.
+ This target kind should just be 'core'.
+ -->
+ <target.kind>rt.included</target.kind>
</properties>
<activation>
<activeByDefault>false</activeByDefault>