From 7168c3a1750100ad65ef41d86edb3bcdf3d1d376 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Mon, 29 May 2017 14:06:58 +0200 Subject: [PATCH] Fixed problem with the initial build after project creation in maven tycho https://github.com/eclipse/xtext-eclipse/issues/272 Signed-off-by: Christian Dietrich --- .../org.xtext.example.full.parent/pom.xml | 1 + .../org.xtext.example.mavenTycho.parent/pom.xml | 1 + .../org.xtext.example.mavenTychoP2.parent/pom.xml | 1 + .../eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend | 1 + .../eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java | 4 ++++ 5 files changed, 8 insertions(+) diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml index 1b56495a4..84eea7df0 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml @@ -247,6 +247,7 @@ ${tycho-version} -err:-forbidden + false diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml index 03daf48e0..b0322f0e0 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml @@ -206,6 +206,7 @@ ${tycho-version} -err:-forbidden + false diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml index 9fd7cc4b9..8bc1a24e0 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml @@ -249,6 +249,7 @@ ${tycho-version} -err:-forbidden + false 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 a92aec6d7..f03113bf6 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 @@ -456,6 +456,7 @@ class ParentProjectDescriptor extends ProjectDescriptor { ${tycho-version} -err:-forbidden + false «ENDIF» 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 a663d0e0e..b5bd2073e 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 @@ -1495,6 +1495,10 @@ public class ParentProjectDescriptor extends ProjectDescriptor { _builder.append("-err:-forbidden"); _builder.newLine(); _builder.append("\t\t\t"); + _builder.append("\t\t"); + _builder.append("false"); + _builder.newLine(); + _builder.append("\t\t\t"); _builder.append("\t"); _builder.append(""); _builder.newLine();