Revert "Temporary fix for EMF codegen bug"
This reverts commit 88faf1246dc4f85708ca3914a6e1b002f25fa955.
diff --git a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
index fd762b1..2928f50 100644
--- a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
+++ b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
@@ -584,8 +584,6 @@
url="https://dl.bintray.com/lorenzobettini/xtext-xdoc/updates/"/>
<repository
url="${orbit.site}"/>
- <repository
- url="http://download.eclipse.org/modeling/emf/emf/builds/nightly/latest/"/>
</repositoryList>
</targlet>
</setupTask>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/photon-staging.target b/devtools/org.eclipse.emf.parsley.targetplatform/photon-staging.target
index f39fc27..b1ae2f5 100644
--- a/devtools/org.eclipse.emf.parsley.targetplatform/photon-staging.target
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/photon-staging.target
@@ -11,6 +11,7 @@
<unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.query.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
@@ -29,10 +30,6 @@
<repository location="http://download.eclipse.org/staging/photon/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/emf/emf/builds/nightly/latest/"/>
-</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/R-builds/R20170516192513/repository"/>