From a08820b6afa31c23065d2c60f34840c5db7b4b6e Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Mon, 27 Mar 2017 13:29:35 +0200 Subject: [PATCH] update to tycho 1.0.0 Signed-off-by: Christian Dietrich --- .../org.xtext.example.full.parent/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../wizard/ParentProjectDescriptor.xtend | 20 +++++++++---------- .../xtext/wizard/ParentProjectDescriptor.java | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) 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 95021a279..1b56495a4 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 @@ -7,7 +7,7 @@ pom - 0.25.0 + 1.0.0 unspecified UTF-8 1.8 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 060f6c1ec..03daf48e0 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 @@ -7,7 +7,7 @@ pom - 0.25.0 + 1.0.0 unspecified UTF-8 1.8 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 e56ea462c..9fd7cc4b9 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 @@ -7,7 +7,7 @@ pom - 0.25.0 + 1.0.0 unspecified UTF-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 141b11be5..a92aec6d7 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 @@ -171,18 +171,18 @@ class ParentProjectDescriptor extends ProjectDescriptor { } «ENDIF» - jar { - from('model') { - into('model') + jar { + from('model') { + into('model') } «IF config.sourceLayout != SourceLayout.PLAIN» from(sourceSets.main.allSource) { include '**/*.xtext' } - «ENDIF» - manifest { - attributes 'Bundle-SymbolicName': project.name - } + «ENDIF» + manifest { + attributes 'Bundle-SymbolicName': project.name + } } plugins.withId('war') { @@ -214,7 +214,7 @@ class ParentProjectDescriptor extends ProjectDescriptor { buildSection = ''' «IF config.needsTychoBuild» - 0.25.0 + 1.0.0 «ENDIF» «config.xtextVersion» «config.encoding» @@ -341,8 +341,8 @@ class ParentProjectDescriptor extends ProjectDescriptor { «FOR dir : #[Outlet.MAIN_XTEND_GEN, Outlet.TEST_XTEND_GEN].toSet.map[sourceFolder]» ${basedir}/«dir» - - **/* + + **/* «ENDFOR» 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 197daecfa..a663d0e0e 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 @@ -577,7 +577,7 @@ public class ParentProjectDescriptor extends ProjectDescriptor { boolean _needsTychoBuild = this.getConfig().needsTychoBuild(); if (_needsTychoBuild) { _builder.append("\t"); - _builder.append("0.25.0"); + _builder.append("1.0.0"); _builder.newLine(); } }