use released Xtext 2.12.0
Change-Id: Iee9d9d19dd9c799afbb2962cdd48a00aada21905
diff --git a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
index cf3091d..0e0d4ea 100644
--- a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
+++ b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
@@ -778,11 +778,15 @@
<setupTask
xsi:type="setup:VariableTask"
name="mwe2.site"
- value="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.0"/>
+ value="http://download.eclipse.org/staging/oxygen/"/>
<setupTask
xsi:type="setup:VariableTask"
name="xtext.site"
- value="http://download.eclipse.org/modeling/tmf/xtext/updates/nightly/"/>
+ value="http://download.eclipse.org/staging/oxygen/"/>
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="orbit.site"
+ value="http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository"/>
<description>Branch for Simrel for Oxygen</description>
</stream>
<description>EMF Parsley version for RCP</description>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/oxygen-staging.target b/devtools/org.eclipse.emf.parsley.targetplatform/oxygen-staging.target
index 0dacdfa..785f6f1 100644
--- a/devtools/org.eclipse.emf.parsley.targetplatform/oxygen-staging.target
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/oxygen-staging.target
@@ -26,16 +26,13 @@
<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.generator.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/staging/oxygen/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.mockito" version="0.0.0"/>
<unit id="org.hamcrest" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/nightly/"/>
+<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository"/>
</location>
</locations>
</target>
diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
index a0220d9..904a4d3 100644
--- a/releng/org.eclipse.emf.parsley.parent/pom.xml
+++ b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -66,7 +66,7 @@
<findbugs-version>3.0.1</findbugs-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <xtext-version>2.12.0-SNAPSHOT</xtext-version>
+ <xtext-version>2.12.0</xtext-version>
<xtextVersion>${xtext-version}</xtextVersion>
<mwe2Version>[2.9.0,2.10)</mwe2Version>
<emf.version>(2.8,3.0)</emf.version>