diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenApp/org.xtext.example.lsMavenApp.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenApp/org.xtext.example.lsMavenApp.parent/pom.xml index b246730fa..353e02c3a 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenApp/org.xtext.example.lsMavenApp.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenApp/org.xtext.example.lsMavenApp.parent/pom.xml @@ -8,7 +8,6 @@ unspecified - 2.11.1 UTF-8 1.8 1.8 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenFatjar/org.xtext.example.lsMavenFatjar.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenFatjar/org.xtext.example.lsMavenFatjar.parent/pom.xml index d7d1b8122..c405e1a40 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenFatjar/org.xtext.example.lsMavenFatjar.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenFatjar/org.xtext.example.lsMavenFatjar.parent/pom.xml @@ -8,7 +8,6 @@ unspecified - 2.11.1 UTF-8 1.8 1.8 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/pom.xml index 8e0a5b7a5..4bb1e0150 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/pom.xml @@ -8,7 +8,6 @@ unspecified - 2.11.1 UTF-8 1.8 1.8 diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend index 5fe4c5c76..ccc1579cf 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend @@ -203,7 +203,9 @@ class ParentProjectDescriptor extends ProjectDescriptor { buildSection = ''' «config.xtextVersion» + «IF config.needsTychoBuild» «config.xtextVersion.mweVersion» + «ENDIF» «config.encoding» «javaVersion» «javaVersion» diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java index d8ca4cfd1..4ba4c94f1 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java @@ -538,12 +538,17 @@ public class ParentProjectDescriptor extends ProjectDescriptor { _builder.append(_xtextVersion, "\t"); _builder.append(""); _builder.newLineIfNotEmpty(); - _builder.append("\t"); - _builder.append(""); - String _mweVersion = this.getConfig().getXtextVersion().getMweVersion(); - _builder.append(_mweVersion, "\t"); - _builder.append(""); - _builder.newLineIfNotEmpty(); + { + boolean _needsTychoBuild = this.getConfig().needsTychoBuild(); + if (_needsTychoBuild) { + _builder.append("\t"); + _builder.append(""); + String _mweVersion = this.getConfig().getXtextVersion().getMweVersion(); + _builder.append(_mweVersion, "\t"); + _builder.append(""); + _builder.newLineIfNotEmpty(); + } + } _builder.append("\t"); _builder.append(""); Charset _encoding = this.getConfig().getEncoding(); @@ -563,8 +568,8 @@ public class ParentProjectDescriptor extends ProjectDescriptor { _builder.append(""); _builder.newLineIfNotEmpty(); { - boolean _needsTychoBuild = this.getConfig().needsTychoBuild(); - if (_needsTychoBuild) { + boolean _needsTychoBuild_1 = this.getConfig().needsTychoBuild(); + if (_needsTychoBuild_1) { _builder.append("\t"); _builder.append(""); _builder.newLine(); @@ -652,8 +657,8 @@ public class ParentProjectDescriptor extends ProjectDescriptor { _builder.append(""); _builder.newLine(); { - boolean _needsTychoBuild_1 = this.getConfig().needsTychoBuild(); - if (_needsTychoBuild_1) { + boolean _needsTychoBuild_2 = this.getConfig().needsTychoBuild(); + if (_needsTychoBuild_2) { _builder.append("\t"); _builder.append(""); _builder.newLine(); @@ -1217,8 +1222,8 @@ public class ParentProjectDescriptor extends ProjectDescriptor { _builder.append(""); _builder.newLine(); { - boolean _needsTychoBuild_2 = this.getConfig().needsTychoBuild(); - boolean _not = (!_needsTychoBuild_2); + boolean _needsTychoBuild_3 = this.getConfig().needsTychoBuild(); + boolean _not = (!_needsTychoBuild_3); if (_not) { _builder.append("\t\t\t"); _builder.append(""); @@ -1404,8 +1409,8 @@ public class ParentProjectDescriptor extends ProjectDescriptor { _builder.append(""); _builder.newLine(); { - boolean _needsTychoBuild_3 = this.getConfig().needsTychoBuild(); - if (_needsTychoBuild_3) { + boolean _needsTychoBuild_4 = this.getConfig().needsTychoBuild(); + if (_needsTychoBuild_4) { _builder.append("\t\t\t\t\t\t\t"); _builder.append(""); _builder.newLine(); @@ -1581,8 +1586,8 @@ public class ParentProjectDescriptor extends ProjectDescriptor { _builder.append(""); _builder.newLine(); { - boolean _needsTychoBuild_4 = this.getConfig().needsTychoBuild(); - if (_needsTychoBuild_4) { + boolean _needsTychoBuild_5 = this.getConfig().needsTychoBuild(); + if (_needsTychoBuild_5) { _builder.append("\t\t\t"); _builder.append(""); _builder.newLine();