From 5bee596d5ef6e23754fbe1b4b4ecc372250485e2 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Mon, 30 Mar 2026 18:12:38 +0200 Subject: [PATCH] Clean-up and format target files (#3662) Leverage omitted version specification to get the latest version available in locations. Use version ranges where versions are necessary, because not always the latest version is intended. Remove unused sequenceNumber attribute. Additionally format file content. --- .../full.target/full.target.target | 36 ++++---- .../lsMavenTychoApp.target.target | 36 ++++---- .../lsMavenTychoFatjar.target.target | 36 ++++---- .../mavenTycho.target.target | 36 ++++---- .../mavenTychoJUnit6.target.target | 40 ++++----- .../mavenTychoP2.target.target | 36 ++++---- .../mavenTychoP2J25.target.target | 36 ++++---- .../tp/domainmodel.target | 12 +-- .../xtext/wizard/TargetPlatformProject.xtend | 42 +++++----- .../xtext/wizard/TargetPlatformProject.java | 40 ++++----- xtext-latest.target | 83 +++++++++---------- xtext-r202512.target | 79 +++++++++--------- xtext-r202603.target | 79 +++++++++--------- 13 files changed, 294 insertions(+), 297 deletions(-) diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target index 3b2bb3340b7..109cef9cfe6 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target @@ -1,35 +1,35 @@ - + - - - - - + + + + + - + - + - - - - - - - - - - + + + + + + + + + + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target index cf65984dbe0..0cb55cbfc57 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target @@ -1,35 +1,35 @@ - + - - - - - + + + + + - + - + - - - - - - - - - - + + + + + + + + + + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target index 41490f101ab..fbd6c2d9299 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target @@ -1,35 +1,35 @@ - + - - - - - + + + + + - + - + - - - - - - - - - - + + + + + + + + + + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target index e479c967f73..69400792f1c 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target @@ -1,35 +1,35 @@ - + - - - - - + + + + + - + - + - - - - - - - - - - + + + + + + + + + + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.target/mavenTychoJUnit6.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.target/mavenTychoJUnit6.target.target index c999e3f01dd..5178923da90 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.target/mavenTychoJUnit6.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit6/mavenTychoJUnit6.parent/mavenTychoJUnit6.target/mavenTychoJUnit6.target.target @@ -1,34 +1,34 @@ - + - - - - - + + + + + - + - + - - - - - - - - - + + + + + + + + + @@ -38,9 +38,9 @@ - - - + + + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target index a64f08321f3..eaf61154c85 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target @@ -1,35 +1,35 @@ - + - - - - - + + + + + - + - + - - - - - - - - - - + + + + + + + + + + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J25/mavenTychoP2J25.parent/mavenTychoP2J25.target/mavenTychoP2J25.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J25/mavenTychoP2J25.parent/mavenTychoP2J25.target/mavenTychoP2J25.target.target index 0e1ff7d456d..f917e53f835 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J25/mavenTychoP2J25.parent/mavenTychoP2J25.target/mavenTychoP2J25.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J25/mavenTychoP2J25.parent/mavenTychoP2J25.target/mavenTychoP2J25.target.target @@ -1,35 +1,35 @@ - + - - - - - + + + + + - + - + - - - - - - - - - - + + + + + + + + + + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target index 14625724014..6b6f970ab6c 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target @@ -4,19 +4,19 @@ - - - - + + + + - + - + 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 cc3412ccee1..ca506425c07 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 @@ -49,11 +49,11 @@ class TargetPlatformProject extends ProjectDescriptor { override getSourceFolders() { #{} } - + def target() ''' - + «IF config.javaVersion.isAtLeast(JavaVersion.JAVA25)» «ELSE» @@ -61,15 +61,15 @@ class TargetPlatformProject extends ProjectDescriptor { «ENDIF» - - - - - + + + + + - + «IF config.xtextVersion.mweVersion.matches("\\d+\\.\\d+(\\.\\d+)+")» «ELSE» @@ -77,7 +77,7 @@ class TargetPlatformProject extends ProjectDescriptor { «ENDIF» - + «IF config.xtextVersion.isSnapshot» «ELSEIF config.xtextVersion.isStable» @@ -87,16 +87,16 @@ class TargetPlatformProject extends ProjectDescriptor { «ENDIF» - - - - - - - - + + + + + + + + «IF config.junitVersion == JUnitVersion.JUNIT_6» - + @@ -106,10 +106,10 @@ class TargetPlatformProject extends ProjectDescriptor { - + «ENDIF» - - + + 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 83f7ce9e0d3..6d5706863f9 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 @@ -85,7 +85,7 @@ public CharSequence target() { _builder.append(""); + _builder.append("\">"); _builder.newLineIfNotEmpty(); { boolean _isAtLeast = this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA25); @@ -106,19 +106,19 @@ public CharSequence target() { _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); _builder.append(""); @@ -130,7 +130,7 @@ public CharSequence target() { _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); { boolean _matches = this.getConfig().getXtextVersion().getMweVersion().matches("\\d+\\.\\d+(\\.\\d+)+"); @@ -157,7 +157,7 @@ public CharSequence target() { _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); { boolean _isSnapshot = this.getConfig().getXtextVersion().isSnapshot(); @@ -188,35 +188,35 @@ public CharSequence target() { _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); { JUnitVersion _junitVersion = this.getConfig().getJunitVersion(); boolean _equals = Objects.equals(_junitVersion, JUnitVersion.JUNIT_6); if (_equals) { _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); _builder.append(""); @@ -246,15 +246,15 @@ public CharSequence target() { _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); } } _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); _builder.append(""); diff --git a/xtext-latest.target b/xtext-latest.target index 72f8b5b4640..69ad6e41dfc 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -1,69 +1,68 @@ - + - - + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -75,7 +74,7 @@ - + diff --git a/xtext-r202512.target b/xtext-r202512.target index 65acb01dc7e..99383fddf96 100644 --- a/xtext-r202512.target +++ b/xtext-r202512.target @@ -1,66 +1,65 @@ - + - + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -72,7 +71,7 @@ - + diff --git a/xtext-r202603.target b/xtext-r202603.target index ce927dfac82..282dbce0944 100644 --- a/xtext-r202603.target +++ b/xtext-r202603.target @@ -1,66 +1,65 @@ - + - + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -72,7 +71,7 @@ - +