[579108] Accommodate changed Xtext 2.27 packaging.
diff --git a/releng/org.eclipse.qvtd.oomph/setups/qvtd.setup b/releng/org.eclipse.qvtd.oomph/setups/qvtd.setup
index 2f04530..3a29f6d 100644
--- a/releng/org.eclipse.qvtd.oomph/setups/qvtd.setup
+++ b/releng/org.eclipse.qvtd.oomph/setups/qvtd.setup
@@ -56,7 +56,7 @@
<setupTask
xsi:type="setup:VariableTask"
name="eclipse.target.platform"
- defaultValue="2021-12"
+ defaultValue="2022-03"
storageURI="scope://Workspace"/>
<setupTask
xsi:type="setup.p2:P2Task">
@@ -107,6 +107,8 @@
name="org.eclipse.uml2.sdk.feature.group"/>
<requirement
name="org.eclipse.xtext.sdk.feature.group"/>
+ <requirement
+ name="org.eclipse.xtext.generator"/>
<sourceLocator
rootFolder="${git.clone.qvtd.git.location}"
locateNestedProjects="true"/>
@@ -142,7 +144,7 @@
<repository
url="https://download.eclipse.org/modeling/mdt/ocl/updates/nightly/latest"/>
<repository
- url="https://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+ url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/>
<repository
url="https://download.eclipse.org/epsilon/updates/2.1"/>
</repositoryList>
@@ -651,6 +653,14 @@
value="master"/>
</stream>
<stream
+ name="0.28.1"
+ label="0.28.1 (2022-03)">
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="ocl.branch"
+ value="6.17.1"/>
+ </stream>
+ <stream
name="0.28.0"
label="0.28.0 (2021-12)">
<setupTask
@@ -895,6 +905,8 @@
label="Build Tools">
<requirement
name="org.eclipse.xtext.sdk.feature.group"/>
+ <requirement
+ name="org.eclipse.xtext.generator"/>
</setupTask>
<stream
name="master"
@@ -905,6 +917,14 @@
value="master"/>
</stream>
<stream
+ name="0.28.1"
+ label="0.28.1 (2022-03)">
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="ocl.branch"
+ value="6.17.1"/>
+ </stream>
+ <stream
name="0.28.0"
label="0.28.0 (2021-12)">
<setupTask
@@ -1183,6 +1203,14 @@
value="master"/>
</stream>
<stream
+ name="0.28.1"
+ label="0.28.1 (2022-03)">
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="ocl.branch"
+ value="6.17.1"/>
+ </stream>
+ <stream
name="0.28.0"
label="0.28.0 (2021-12)">
<setupTask
diff --git a/releng/org.eclipse.qvtd.releng.tycho/targetPlatforms/interim.target b/releng/org.eclipse.qvtd.releng.tycho/targetPlatforms/interim.target
index c8fb77c..e8736e6 100644
--- a/releng/org.eclipse.qvtd.releng.tycho/targetPlatforms/interim.target
+++ b/releng/org.eclipse.qvtd.releng.tycho/targetPlatforms/interim.target
@@ -14,11 +14,11 @@
<unit id="org.eclipse.m2m.atl.emftvm.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/mmt/atl/updates/releases/latest"/>
</location>
- <!--location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.examples.library" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
- <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone"/>
- </location-->
+ <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
+ </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.transaction.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201706061339"/>
@@ -74,10 +74,9 @@
<repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315"/>
</location-->
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.examples.library" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.xtext.generator" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/milestones"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/latest"/>
<!--repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.15.0"/-->
diff --git a/releng/org.eclipse.qvtd.releng.tycho/targetPlatforms/nightly.target b/releng/org.eclipse.qvtd.releng.tycho/targetPlatforms/nightly.target
index b2a59be..eebeab6 100644
--- a/releng/org.eclipse.qvtd.releng.tycho/targetPlatforms/nightly.target
+++ b/releng/org.eclipse.qvtd.releng.tycho/targetPlatforms/nightly.target
@@ -15,12 +15,12 @@
<repository location="https://download.eclipse.org/mmt/atl/updates/nightly/latest"/>
<repository location="https://download.eclipse.org/mmt/atl/updates/releases/latest"/>
</location>
- <!--location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.examples.library" version="0.0.0"/>
- <repository location="https://download.eclipse.org/modeling/emf/emf/builds/nightly"/>
- <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone"/>
- </location-->
+ <repository location="https://download.eclipse.org/modeling/emf/emf/builds/nightly/latest"/>
+ <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
+ </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.transaction" version="0.0.0"/>
<!--repository location="https://download.eclipse.org/modeling/emf/validation/updates/interim"/-->
@@ -83,10 +83,9 @@
<repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315"/>
</location-->
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.examples.library" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.xtext.generator" version="0.0.0"/>
<!--repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/nightly/head"/-->
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/nightly"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/milestones"/>
diff --git a/releng/org.eclipse.qvtd.releng.tycho/targetPlatforms/stable.target b/releng/org.eclipse.qvtd.releng.tycho/targetPlatforms/stable.target
index ec9ac33..6c065f2 100644
--- a/releng/org.eclipse.qvtd.releng.tycho/targetPlatforms/stable.target
+++ b/releng/org.eclipse.qvtd.releng.tycho/targetPlatforms/stable.target
@@ -10,19 +10,20 @@
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.xtext.generator" version="0.0.0"/>
<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/latest"/>
<repository location="https://download.eclipse.org/mmt/atl/updates/milestones/4.0"/>
- <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone"/>
+ <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
<repository location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/latest"/>
<repository location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/latest"/>
- <repository location="https://download.eclipse.org/mmt/qvto/updates/milestones"/>
+ <repository location="https://download.eclipse.org/mmt/qvto/updates/milestones/latest"/>
<!--repository location="https://download.eclipse.org/modeling/mdt/uml2/updates/milestones"/-->
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.examples.library" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.14"/>
- <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone"/>
+ <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.epsilon.core.feature.feature.group" version="0.0.0"/>
