diff --git a/org.eclipse.xtend.maven.archetype/pom.xml b/org.eclipse.xtend.maven.archetype/pom.xml index 2433a846a86..191d830b26c 100644 --- a/org.eclipse.xtend.maven.archetype/pom.xml +++ b/org.eclipse.xtend.maven.archetype/pom.xml @@ -66,6 +66,7 @@ org.eclipse.xtext:xtext-dev-bom:${project.version}:pom ${localMavenRepositoryPath} + provided @@ -74,9 +75,6 @@ install - - test - @@ -105,7 +103,7 @@ org.eclipse.xtext xtend-maven-plugin ${project.version} - test + provided diff --git a/org.eclipse.xtend.tycho.tests.parent/pom.xml b/org.eclipse.xtend.tycho.tests.parent/pom.xml index edab46567f9..998f7cfd26c 100644 --- a/org.eclipse.xtend.tycho.tests.parent/pom.xml +++ b/org.eclipse.xtend.tycho.tests.parent/pom.xml @@ -126,6 +126,11 @@ **/*Test?.java -pluginCustomization ${basedir}/../releng/org.eclipse.xtend.tycho.tests.parent/pluginCustomization.ini + + false diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml index 41694d765a4..a97f30378f6 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml @@ -13,7 +13,7 @@ 17 17 - 4.0.13 + 5.0.2 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml index b80d9c525b6..07683604c7c 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml @@ -13,7 +13,7 @@ 17 17 - 4.0.13 + 5.0.2 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml index f91e1e4528b..581f40644ac 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml @@ -13,7 +13,7 @@ 17 17 - 4.0.13 + 5.0.2 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml index 622382340bf..fa411420682 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml @@ -13,7 +13,7 @@ 17 17 - 4.0.13 + 5.0.2 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml index 03c661faaf4..0a29ae72b23 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml @@ -13,7 +13,7 @@ 17 17 - 4.0.13 + 5.0.2 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml index cf72da03862..4e1176da32e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml @@ -13,7 +13,7 @@ 17 17 - 4.0.13 + 5.0.2 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml index 3c1abba142f..cf57dee1b9c 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml @@ -13,7 +13,7 @@ 21 21 - 4.0.13 + 5.0.2 diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/pom.xml b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/pom.xml index 425021fb35b..d5ac37da90c 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/pom.xml +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/pom.xml @@ -19,12 +19,12 @@ UTF-8 + Java 17 you need to execute the Maven build with Java 21 as parts of Eclipse + 2024-03+ require Java 17 and Tycho requires Java 21. --> 17 17 - 4.0.13 + 5.0.2 ${project.groupId} ${project.groupId}.tp ${project.version} 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 971940a1441..13cd9716a23 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 @@ -69,7 +69,7 @@ class ParentProjectDescriptor extends ProjectDescriptor { } def String getTychoVersion() { - '4.0.13' + '5.0.2' } def private CharSequence loadResource(String resourcePath) { 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 41e95708717..02667459158 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 @@ -105,7 +105,7 @@ public String getJavaVersion() { } public String getTychoVersion() { - return "4.0.13"; + return "5.0.2"; } private CharSequence loadResource(final String resourcePath) { diff --git a/pom.xml b/pom.xml index e03b9dbb51e..9bca0cba405 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ ISO-8859-1 - 4.0.13 + 5.0.2 17 ${maven.compiler.release}