diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/org.xtext.example.lsMavenTychoApp.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/org.xtext.example.lsMavenTychoApp.ide/pom.xml index 1f5c427b5..8c48ca9c9 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/org.xtext.example.lsMavenTychoApp.ide/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/org.xtext.example.lsMavenTychoApp.ide/pom.xml @@ -89,8 +89,6 @@ org.eclipse.jdt.debug, org.eclipse.jdt.launching, org.eclipse.text, - org.eclipse.xtend.typesystem.emf, - org.eclipse.xtend, diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.ide/pom.xml index e76943b5e..141da0257 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.ide/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.ide/pom.xml @@ -89,8 +89,6 @@ org.eclipse.jdt.debug, org.eclipse.jdt.launching, org.eclipse.text, - org.eclipse.xtend.typesystem.emf, - org.eclipse.xtend, diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend index c0d8b77b9..3927f6512 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend @@ -173,8 +173,6 @@ class IdeProjectDescriptor extends ProjectDescriptor { org.eclipse.jdt.debug, org.eclipse.jdt.launching, org.eclipse.text, - org.eclipse.xtend.typesystem.emf, - org.eclipse.xtend, diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend index 044d0e74c..e29d34787 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend @@ -122,7 +122,6 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor { if (config.ecore2Xtext.EPackageInfos.exists[genmodelURI.fileExtension == "xcore"]) { result.add("org.eclipse.emf.ecore.xcore") } - result.add('org.eclipse.xtext.generator') } return result } @@ -296,11 +295,6 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor { mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}" mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}" mwe2 'org.eclipse.xtext:xtext-antlr-generator' - «IF fromExistingEcoreModels» - mwe2 "org.eclipse.xtext:org.eclipse.xtext.generator:${xtextVersion}" - mwe2 "org.eclipse.xpand:org.eclipse.xpand:2.0.0" - mwe2 "org.eclipse.xpand:org.eclipse.xtend:2.0.0" - «ENDIF» } task generateXtextLanguage(type: JavaExec) { diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend index 888eee0e0..9311c9733 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend @@ -60,11 +60,6 @@ class TargetPlatformProject extends ProjectDescriptor { - «IF isFromExistingEcoreModels» - - - - «ENDIF» diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java index 5b0065e6d..7d55f7326 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java @@ -550,14 +550,6 @@ public class IdeProjectDescriptor extends ProjectDescriptor { _builder.append("org.eclipse.text,"); _builder.newLine(); _builder.append("\t\t"); - _builder.append("\t\t\t\t\t"); - _builder.append("org.eclipse.xtend.typesystem.emf,"); - _builder.newLine(); - _builder.append("\t\t"); - _builder.append("\t\t\t\t\t"); - _builder.append("org.eclipse.xtend,"); - _builder.newLine(); - _builder.append("\t\t"); _builder.append("\t\t\t\t"); _builder.append(""); _builder.newLine(); diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java index 3e9a33c62..66f25e9ed 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java @@ -193,7 +193,6 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor { if (_exists) { result.add("org.eclipse.emf.ecore.xcore"); } - result.add("org.eclipse.xtext.generator"); } return result; } @@ -626,20 +625,6 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor { _builder.append("\t"); _builder.append("mwe2 \'org.eclipse.xtext:xtext-antlr-generator\'"); _builder.newLine(); - { - boolean _isFromExistingEcoreModels = this.isFromExistingEcoreModels(); - if (_isFromExistingEcoreModels) { - _builder.append("\t"); - _builder.append("mwe2 \"org.eclipse.xtext:org.eclipse.xtext.generator:${xtextVersion}\""); - _builder.newLine(); - _builder.append("\t"); - _builder.append("mwe2 \"org.eclipse.xpand:org.eclipse.xpand:2.0.0\""); - _builder.newLine(); - _builder.append("\t"); - _builder.append("mwe2 \"org.eclipse.xpand:org.eclipse.xtend:2.0.0\""); - _builder.newLine(); - } - } _builder.append("}"); _builder.newLine(); _builder.newLine(); diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java index 5af24ed8a..ae23e2e16 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java @@ -115,20 +115,6 @@ public class TargetPlatformProject extends ProjectDescriptor { _builder.append("\t\t\t"); _builder.append(""); _builder.newLine(); - { - boolean _isFromExistingEcoreModels = this.isFromExistingEcoreModels(); - if (_isFromExistingEcoreModels) { - _builder.append("\t\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append(""); - _builder.newLine(); - } - } _builder.append("\t\t\t"); _builder.append(""); _builder.newLine();