From 0ad885d4c3082225c0f9a6988037934c5aff840a Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Fri, 7 Oct 2022 07:29:04 +0200 Subject: [PATCH] [eclipse/xtext#1982] support for java 17 Signed-off-by: Christian Dietrich --- Jenkinsfile | 2 +- build.gradle | 2 +- gradle/java-compiler-settings.gradle | 2 +- org.eclipse.xtext.ide.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- org.eclipse.xtext.ide/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.testing/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.testlanguages/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../GenerateAllTestLanguages.mwe2.launch | 2 +- org.eclipse.xtext.tests/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF_gen | 2 +- .../eclipse/xtext/util/JavaVersionTest.java | 5 + .../xtext/wizard/WizardConfigurationTest.java | 22 +- .../wizard/cli/CliWizardIntegrationTest.java | 8 +- .../eclipsePlugin.ide/META-INF/MANIFEST.MF | 2 +- .../eclipsePlugin.tests/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../eclipsePlugin.ui/META-INF/MANIFEST.MF | 2 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../eclipsePlugin/META-INF/MANIFEST.MF | 2 +- .../eclipsePluginP2.ide/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../eclipsePluginP2.ui/META-INF/MANIFEST.MF | 2 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../eclipsePluginP2/META-INF/MANIFEST.MF | 2 +- .../full/full.parent/build.gradle | 4 +- .../full.parent/full.ide/META-INF/MANIFEST.MF | 2 +- .../full.target/full.target.target | 3 +- .../full.tests/META-INF/MANIFEST.MF | 2 +- .../full.ui.tests/META-INF/MANIFEST.MF | 2 +- .../full.parent/full.ui/META-INF/MANIFEST.MF | 2 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../full.parent/full/META-INF/MANIFEST.MF | 2 +- .../full/full.parent/full/pom.xml | 20 - .../full/full.parent/pom.xml | 79 +--- .../gradle/gradle.parent/build.gradle | 4 +- .../lsGradleApp.parent/build.gradle | 4 +- .../lsGradleFatjar.parent/build.gradle | 4 +- .../lsMavenApp/lsMavenApp.parent/pom.xml | 4 +- .../lsMavenFatjar.parent/pom.xml | 4 +- .../lsMavenTychoApp.ide/META-INF/MANIFEST.MF | 2 +- .../lsMavenTychoApp.target.target | 3 +- .../lsMavenTychoApp.ui/META-INF/MANIFEST.MF | 2 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../lsMavenTychoApp/META-INF/MANIFEST.MF | 2 +- .../lsMavenTychoApp/pom.xml | 20 - .../lsMavenTychoApp.parent/pom.xml | 67 +-- .../META-INF/MANIFEST.MF | 2 +- .../lsMavenTychoFatjar.target.target | 3 +- .../META-INF/MANIFEST.MF | 2 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../lsMavenTychoFatjar/META-INF/MANIFEST.MF | 2 +- .../lsMavenTychoFatjar/pom.xml | 20 - .../lsMavenTychoFatjar.parent/pom.xml | 67 +-- .../mavenTycho.ide/META-INF/MANIFEST.MF | 2 +- .../mavenTycho.target.target | 3 +- .../mavenTycho.tests/META-INF/MANIFEST.MF | 2 +- .../mavenTycho.ui.tests/META-INF/MANIFEST.MF | 2 +- .../mavenTycho.ui/META-INF/MANIFEST.MF | 2 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../mavenTycho/META-INF/MANIFEST.MF | 2 +- .../mavenTycho.parent/mavenTycho/pom.xml | 20 - .../mavenTycho/mavenTycho.parent/pom.xml | 67 +-- .../mavenTychoJ11.ide/META-INF/MANIFEST.MF | 12 - .../mavenTychoJ17.ide/META-INF/MANIFEST.MF | 12 + .../mavenTychoJ17.ide}/build.properties | 0 .../mavenTychoJ17.ide}/pom.xml | 6 +- .../mavenTychoJ17.target.target} | 2 +- .../mavenTychoJ17.target}/pom.xml | 6 +- .../mavenTychoJ17.tests}/META-INF/MANIFEST.MF | 10 +- .../mavenTychoJ17.tests}/build.properties | 0 .../mavenTychoJ17.tests}/pom.xml | 6 +- .../META-INF/MANIFEST.MF | 10 +- .../mavenTychoJ17.ui.tests}/build.properties | 0 .../mavenTychoJ17.ui.tests}/pom.xml | 6 +- .../mavenTychoJ17.ui}/META-INF/MANIFEST.MF | 12 +- .../mavenTychoJ17.ui}/build.properties | 0 .../mavenTychoJ17.ui}/pom.xml | 6 +- .../mavenTychoJ17.web}/pom.xml | 10 +- ...Dsl (mydsl) Language Infrastructure.launch | 6 +- .../.launch/Launch Runtime Eclipse.launch | 4 +- .../mavenTychoJ17}/META-INF/MANIFEST.MF | 8 +- .../mavenTychoJ17}/build.properties | 0 .../mavenTychoJ17}/pom.xml | 18 +- .../src/mydsl/GenerateMyDsl.mwe2 | 2 +- .../mavenTychoJ17}/src/mydsl/MyDsl.xtext | 0 .../mavenTychoJ17.parent}/pom.xml | 26 +- .../mavenTychoP2.ide/META-INF/MANIFEST.MF | 2 +- .../mavenTychoP2.target.target | 3 +- .../mavenTychoP2.tests/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../mavenTychoP2.ui/META-INF/MANIFEST.MF | 2 +- .../.launch/Launch Runtime Eclipse.launch | 2 +- .../mavenTychoP2/META-INF/MANIFEST.MF | 2 +- .../mavenTychoP2.parent/mavenTychoP2/pom.xml | 20 - .../mavenTychoP2/mavenTychoP2.parent/pom.xml | 79 +--- .../mavenTychoP2J11.ide/META-INF/MANIFEST.MF | 12 - .../mavenTychoP2J17.feature}/build.properties | 0 .../mavenTychoP2J17.feature}/feature.xml | 8 +- .../mavenTychoP2J17.feature}/pom.xml | 6 +- .../mavenTychoP2J17.ide/META-INF/MANIFEST.MF | 12 + .../mavenTychoP2J17.ide}/build.properties | 0 .../mavenTychoP2J17.ide}/pom.xml | 6 +- .../mavenTychoP2J17.repository}/category.xml | 4 +- .../mavenTychoP2J17.repository}/pom.xml | 6 +- .../mavenTychoP2J17.target.target} | 2 +- .../mavenTychoP2J17.target}/pom.xml | 6 +- .../META-INF/MANIFEST.MF | 10 +- .../mavenTychoP2J17.tests}/build.properties | 0 .../mavenTychoP2J17.tests}/pom.xml | 6 +- .../META-INF/MANIFEST.MF | 10 +- .../build.properties | 0 .../mavenTychoP2J17.ui.tests}/pom.xml | 6 +- .../mavenTychoP2J17.ui}/META-INF/MANIFEST.MF | 12 +- .../mavenTychoP2J17.ui}/build.properties | 0 .../mavenTychoP2J17.ui}/pom.xml | 6 +- .../mavenTychoP2J17.web}/pom.xml | 10 +- ...Dsl (mydsl) Language Infrastructure.launch | 6 +- .../.launch/Launch Runtime Eclipse.launch | 4 +- .../mavenTychoP2J17}/META-INF/MANIFEST.MF | 8 +- .../mavenTychoP2J17}/build.properties | 0 .../mavenTychoP2J17}/pom.xml | 18 +- .../src/mydsl/GenerateMyDsl.mwe2 | 2 +- .../mavenTychoP2J17}/src/mydsl/MyDsl.xtext | 0 .../mavenTychoP2J17.parent}/pom.xml | 30 +- .../plainMaven/plainMaven.parent/pom.xml | 4 +- org.eclipse.xtext.util/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- org.eclipse.xtext.util/META-INF/MANIFEST.MF | 2 +- .../org/eclipse/xtext/util/JavaVersion.java | 7 +- org.eclipse.xtext.xtext.bootstrap/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- org.eclipse.xtext.xtext.generator/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../META-INF/MANIFEST.MF | 2 +- .../generator/model/ManifestAccess.xtend | 4 +- .../xtext/generator/model/ManifestAccess.java | 4 +- org.eclipse.xtext.xtext.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xtext.wizard/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../META-INF/MANIFEST.MF | 2 +- .../wizard/ParentProjectDescriptor.xtend | 129 ++---- .../wizard/RuntimeProjectDescriptor.xtend | 23 - .../xtext/wizard/WizardConfiguration.java | 2 +- .../xtext/wizard/ParentProjectDescriptor.java | 406 ++---------------- .../wizard/RuntimeProjectDescriptor.java | 103 +---- org.eclipse.xtext/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- org.eclipse.xtext/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext/META-INF/MANIFEST.MF_gen | 2 +- releng/pom.xml | 2 +- releng/releng-target/xtext-core.target.target | 2 +- 167 files changed, 417 insertions(+), 1360 deletions(-) delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ide/META-INF/MANIFEST.MF create mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/META-INF/MANIFEST.MF rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ide => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ide => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide}/pom.xml (80%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.target/mavenTychoJ11.target.target => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target} (98%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.target => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target}/pom.xml (75%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.tests => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests}/META-INF/MANIFEST.MF (59%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.tests => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.tests => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests}/pom.xml (79%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui.tests => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests}/META-INF/MANIFEST.MF (60%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui.tests => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui.tests => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests}/pom.xml (84%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui}/META-INF/MANIFEST.MF (61%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui}/pom.xml (80%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.web => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web}/pom.xml (94%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11 => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17}/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch (63%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11 => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17}/.launch/Launch Runtime Eclipse.launch (94%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11 => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17}/META-INF/MANIFEST.MF (60%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11 => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11 => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17}/pom.xml (87%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11 => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17}/src/mydsl/GenerateMyDsl.mwe2 (97%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11 => mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17}/src/mydsl/MyDsl.xtext (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoJ11/mavenTychoJ11.parent => mavenTychoJ17/mavenTychoJ17.parent}/pom.xml (94%) delete mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ide/META-INF/MANIFEST.MF rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.feature => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.feature => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature}/feature.xml (75%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.feature => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature}/pom.xml (73%) create mode 100644 org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/META-INF/MANIFEST.MF rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ide => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ide => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide}/pom.xml (79%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.repository => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository}/category.xml (66%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.repository => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository}/pom.xml (90%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.target/mavenTychoP2J11.target.target => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target} (97%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.target => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target}/pom.xml (74%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.tests => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests}/META-INF/MANIFEST.MF (51%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.tests => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.tests => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests}/pom.xml (79%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui.tests => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests}/META-INF/MANIFEST.MF (55%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui.tests => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui.tests => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests}/pom.xml (83%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui}/META-INF/MANIFEST.MF (60%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui}/pom.xml (79%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.web => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web}/pom.xml (93%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11 => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17}/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch (60%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11 => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17}/.launch/Launch Runtime Eclipse.launch (97%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11 => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17}/META-INF/MANIFEST.MF (59%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11 => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17}/build.properties (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11 => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17}/pom.xml (86%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11 => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17}/src/mydsl/GenerateMyDsl.mwe2 (97%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11 => mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17}/src/mydsl/MyDsl.xtext (100%) rename org.eclipse.xtext.tests/testdata/wizard-expectations/{mavenTychoP2J11/mavenTychoP2J11.parent => mavenTychoP2J17/mavenTychoP2J17.parent}/pom.xml (93%) diff --git a/Jenkinsfile b/Jenkinsfile index bd509161e9..c4dcfccee6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { parameters { // see https://wiki.eclipse.org/Jenkins#JDK choice(name: 'JDK_VERSION', description: 'Which JDK should be used?', choices: [ - 'temurin-jdk8-latest', 'temurin-jdk11-latest', 'temurin-jdk17-latest' + 'temurin-jdk11-latest', 'temurin-jdk17-latest' ]) booleanParam( name: 'TRIGGER_DOWNSTREAM_BUILD', diff --git a/build.gradle b/build.gradle index 40ecb8f53c..a13e7381cb 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { } plugins { - id 'org.ajoberstar.grgit' version '4.1.1' + id 'org.ajoberstar.grgit' version '5.0.0' } apply from: "${rootDir}/gradle/versions.gradle" diff --git a/gradle/java-compiler-settings.gradle b/gradle/java-compiler-settings.gradle index 0779325b67..537bd408ae 100644 --- a/gradle/java-compiler-settings.gradle +++ b/gradle/java-compiler-settings.gradle @@ -2,7 +2,7 @@ * Configuration of Java compiler, Javadoc, additional archives, and additional dependency configurations. */ -sourceCompatibility = '1.8' +sourceCompatibility = '11' tasks.withType(JavaCompile) { options.encoding = 'ISO-8859-1' diff --git a/org.eclipse.xtext.ide.tests/.classpath b/org.eclipse.xtext.ide.tests/.classpath index 35c8861378..edc2f8d483 100644 --- a/org.eclipse.xtext.ide.tests/.classpath +++ b/org.eclipse.xtext.ide.tests/.classpath @@ -37,7 +37,7 @@ - + diff --git a/org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.core.prefs index 35068d95fc..18ad895236 100644 --- a/org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF index 006e0d02ca..fa08a33831 100644 --- a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtext IDE Tests Bundle-SymbolicName: org.eclipse.xtext.ide.tests;singleton:=true Bundle-Version: 2.29.0.qualifier Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Xtext Require-Bundle: org.eclipse.xtext;visibility:=reexport, diff --git a/org.eclipse.xtext.ide/.classpath b/org.eclipse.xtext.ide/.classpath index 040706ff08..6be8f74512 100644 --- a/org.eclipse.xtext.ide/.classpath +++ b/org.eclipse.xtext.ide/.classpath @@ -6,7 +6,7 @@ - + diff --git a/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.core.prefs index 358b1563db..0b7f1d57c6 100644 --- a/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF index 327ef8df6c..a9a540a71e 100644 --- a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Xtext IDE Core Bundle-SymbolicName: org.eclipse.xtext.ide;singleton:=true Bundle-Version: 2.29.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Bundle-Vendor: Eclipse Xtext diff --git a/org.eclipse.xtext.testing/.classpath b/org.eclipse.xtext.testing/.classpath index 8d7bd0d7cc..9562e8b41c 100644 --- a/org.eclipse.xtext.testing/.classpath +++ b/org.eclipse.xtext.testing/.classpath @@ -19,7 +19,7 @@ - + diff --git a/org.eclipse.xtext.testing/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.testing/.settings/org.eclipse.jdt.core.prefs index 35068d95fc..18ad895236 100644 --- a/org.eclipse.xtext.testing/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.testing/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.eclipse.xtext.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing/META-INF/MANIFEST.MF index 72eb76efe6..c68910f23d 100644 --- a/org.eclipse.xtext.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testing/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.testing;singleton:=true Bundle-Version: 2.29.0.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.xtext.testing, org.eclipse.xtext.testing.builder, org.eclipse.xtext.testing.extensions, diff --git a/org.eclipse.xtext.testlanguages.ide/.classpath b/org.eclipse.xtext.testlanguages.ide/.classpath index aa4b1d2e8e..17aa8efb2a 100644 --- a/org.eclipse.xtext.testlanguages.ide/.classpath +++ b/org.eclipse.xtext.testlanguages.ide/.classpath @@ -13,7 +13,7 @@ - + diff --git a/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.jdt.core.prefs index 358b1563db..0b7f1d57c6 100644 --- a/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF index 79981f29d4..6516d20299 100644 --- a/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Common Xtext Testlanguages for UI and Runtime - IDE Features Bundle-SymbolicName: org.eclipse.xtext.testlanguages.ide;singleton:=true Bundle-Version: 2.29.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Xtext Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.testlanguages.backtracking.ide;x-internal:=true, diff --git a/org.eclipse.xtext.testlanguages/.classpath b/org.eclipse.xtext.testlanguages/.classpath index aa4b1d2e8e..17aa8efb2a 100644 --- a/org.eclipse.xtext.testlanguages/.classpath +++ b/org.eclipse.xtext.testlanguages/.classpath @@ -13,7 +13,7 @@ - + diff --git a/org.eclipse.xtext.testlanguages/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.testlanguages/.settings/org.eclipse.jdt.core.prefs index 35068d95fc..18ad895236 100644 --- a/org.eclipse.xtext.testlanguages/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.testlanguages/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF index d3105f97e8..c5784dc16a 100644 --- a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF @@ -25,7 +25,7 @@ Import-Package: org.apache.log4j;version="1.2.19", org.junit.runner.notification;version="4.12.0", org.junit.runners;version="4.12.0", org.junit.runners.model;version="4.12.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.xtext.testlanguages;x-internal:=true, org.eclipse.xtext.testlanguages.backtracking, org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage, diff --git a/org.eclipse.xtext.tests/.classpath b/org.eclipse.xtext.tests/.classpath index 1cdb4a423c..c2da5d63a2 100644 --- a/org.eclipse.xtext.tests/.classpath +++ b/org.eclipse.xtext.tests/.classpath @@ -42,7 +42,7 @@ - + diff --git a/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.core.prefs index 35068d95fc..18ad895236 100644 --- a/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch b/org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch index c577200609..570436de16 100644 --- a/org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch +++ b/org.eclipse.xtext.tests/GenerateAllTestLanguages.mwe2.launch @@ -9,7 +9,7 @@ - + diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF index d18f35c501..2270e2d641 100644 --- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.tests;singleton:=true Bundle-Version: 2.29.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtext, org.eclipse.emf.mwe.utils;bundle-version="1.3.21", org.eclipse.xtext.util, diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen index c557a8804e..9bf183baeb 100644 --- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen +++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.xtext.tests Bundle-SymbolicName: org.eclipse.xtext.tests;singleton:=true Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext, org.eclipse.xtext.dummy, diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/JavaVersionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/JavaVersionTest.java index 330cd52683..edfdd16717 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/JavaVersionTest.java +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/JavaVersionTest.java @@ -29,6 +29,8 @@ public void test_fromBree() { @Test public void testFromQualifier() { + assertEquals(JavaVersion.JAVA17, JavaVersion.fromQualifier("17")); + assertEquals(JavaVersion.JAVA17, JavaVersion.fromQualifier("1.17")); assertEquals(JavaVersion.JAVA11, JavaVersion.fromQualifier("11")); assertEquals(JavaVersion.JAVA11, JavaVersion.fromQualifier("1.11")); assertEquals(JavaVersion.JAVA10, JavaVersion.fromQualifier("10")); @@ -49,6 +51,7 @@ public void testFromQualifier() { @Test public void test_getQualifier() { + assertEquals("17", JavaVersion.JAVA17.getQualifier()); assertEquals("11", JavaVersion.JAVA11.getQualifier()); assertEquals("10", JavaVersion.JAVA10.getQualifier()); assertEquals("9", JavaVersion.JAVA9.getQualifier()); @@ -65,6 +68,8 @@ public void test_isAtLeast() { @Test public void test_toJdtClassFileConstant () { + assertEquals(3997696, JavaVersion.JAVA17.toJdtClassFileConstant()); + assertEquals(3604480, JavaVersion.JAVA11.toJdtClassFileConstant()); assertEquals(3538944, JavaVersion.JAVA10.toJdtClassFileConstant()); assertEquals(3473408, JavaVersion.JAVA9.toJdtClassFileConstant()); assertEquals(3407872, JavaVersion.JAVA8.toJdtClassFileConstant()); diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/WizardConfigurationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/WizardConfigurationTest.java index 03524f5a0c..95efe7a0b4 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/WizardConfigurationTest.java +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/WizardConfigurationTest.java @@ -76,16 +76,6 @@ public void p2AndSdkProjectsAreBuiltWithTychoWhenMavenBuiltIsEnabled() { assertTrue(config.getP2Project().pom().getContent().contains("eclipse-repository")); assertTrue(config.getParentProject().pom().getContent().contains("tycho")); } - - @Test - public void p2ProjectsEnablesSourceGenerationWithTychoWhenMavenBuiltIsEnabled() { - config.getUiProject().setEnabled(true); - config.getP2Project().setEnabled(true); - config.setPreferredBuildSystem(BuildSystem.MAVEN); - assertTrue(config.needsTychoBuild()); - assertTrue(config.getParentProject().pom().getContent().contains("tycho-source-plugin")); - assertTrue(config.getParentProject().pom().getContent().contains("tycho-source-feature-plugin")); - } @Test public void p2ProjectsEnablesSourceGenerationWithTychoWhenMavenBuiltIsEnabledJ11() { @@ -363,15 +353,15 @@ public void tychoDoesNotFailOnMissingTests() { } @Test - public void allBuildSystemsUseJava8() { + public void allBuildSystemsUseJava11() { String parentPom = config.getParentProject().pom().getContent(); - assertTrue(parentPom.contains("1.8")); - assertTrue(parentPom.contains("1.8")); + assertTrue(parentPom.contains("11")); + assertTrue(parentPom.contains("11")); String parentGradle = config.getParentProject().buildGradle().getContent(); - assertTrue(parentGradle.contains("sourceCompatibility = \'1.8\'")); - assertTrue(parentGradle.contains("targetCompatibility = \'1.8\'")); + assertTrue(parentGradle.contains("sourceCompatibility = \'11\'")); + assertTrue(parentGradle.contains("targetCompatibility = \'11\'")); for (String it : Lists.transform(allJavaProjects(), (ProjectDescriptor it) -> it.manifest())) { - assertTrue(it.contains("Bundle-RequiredExecutionEnvironment: JavaSE-1.8")); + assertTrue(it.contains("Bundle-RequiredExecutionEnvironment: JavaSE-11")); } ; } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java index a16b917797..f8daf84986 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java @@ -139,7 +139,7 @@ public static void main(String[] args) { project.getIdeProject().setEnabled(true); project.getWebProject().setEnabled(true); }), CliWizardIntegrationTest.newProjectConfig(project -> { - project.setBaseName("mavenTychoJ11"); + project.setBaseName("mavenTychoJ17"); project.setPreferredBuildSystem(BuildSystem.MAVEN); project.setSourceLayout(SourceLayout.PLAIN); project.setProjectLayout(ProjectLayout.HIERARCHICAL); @@ -148,7 +148,7 @@ public static void main(String[] args) { project.getUiProject().getTestProject().setEnabled(true); project.getIdeProject().setEnabled(true); project.getWebProject().setEnabled(true); - project.setJavaVersion(JavaVersion.JAVA11); + project.setJavaVersion(JavaVersion.JAVA17); project.setJunitVersion(JUnitVersion.JUNIT_5); }), CliWizardIntegrationTest.newProjectConfig(project -> { project.setBaseName("gradle"); @@ -190,8 +190,8 @@ public static void main(String[] args) { project.getWebProject().setEnabled(true); project.getP2Project().setEnabled(true); }), CliWizardIntegrationTest.newProjectConfig(project -> { - project.setBaseName("mavenTychoP2J11"); - project.setJavaVersion(JavaVersion.JAVA11); + project.setBaseName("mavenTychoP2J17"); + project.setJavaVersion(JavaVersion.JAVA17); project.setPreferredBuildSystem(BuildSystem.MAVEN); project.setSourceLayout(SourceLayout.PLAIN); project.setProjectLayout(ProjectLayout.HIERARCHICAL); diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ide/META-INF/MANIFEST.MF index e9d98ada9d..de61be541a 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ide/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: eclipsePlugin, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: eclipsePlugin.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.tests/META-INF/MANIFEST.MF index 57ad751079..6f0b00f4a0 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.tests/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Require-Bundle: eclipsePlugin, org.junit;bundle-version="4.12.0", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: eclipsePlugin.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui.tests/META-INF/MANIFEST.MF index 0ad52570b5..58023dbb65 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui.tests/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: eclipsePlugin.ui, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.junit4, org.eclipse.xtext.xbase.junit -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: eclipsePlugin.ui.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui/META-INF/MANIFEST.MF index d6ec48db8c..68efe226b8 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: eclipsePlugin, org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: eclipsePlugin.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/.launch/Launch Runtime Eclipse.launch index 94d2fdb7a0..e1bc5e0c59 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/.launch/Launch Runtime Eclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/META-INF/MANIFEST.MF index 0f5edcdfd0..a13f6711d8 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: eclipsePlugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ide/META-INF/MANIFEST.MF index 33d51946ce..fdd777b7ed 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ide/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: eclipsePluginP2, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: eclipsePluginP2.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.tests/META-INF/MANIFEST.MF index 89ba21252c..de87bc5dbb 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.tests/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Require-Bundle: eclipsePluginP2, org.junit;bundle-version="4.12.0", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: eclipsePluginP2.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF index fc898ba3f1..297392aefc 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: eclipsePluginP2.ui, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.junit4, org.eclipse.xtext.xbase.junit -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: eclipsePluginP2.ui.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui/META-INF/MANIFEST.MF index 0660b0c30a..59ba9f6b28 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: eclipsePluginP2, org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: eclipsePluginP2.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/.launch/Launch Runtime Eclipse.launch index ad2c09cca0..b36c6a609b 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/.launch/Launch Runtime Eclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/META-INF/MANIFEST.MF index 4e621ad4de..826ae2d46d 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: eclipsePluginP2 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/build.gradle index 3820c11208..47374c2450 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/build.gradle +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/build.gradle @@ -26,8 +26,8 @@ subprojects { group = 'full' version = '1.0.0-SNAPSHOT' - sourceCompatibility = '1.8' - targetCompatibility = '1.8' + sourceCompatibility = '11' + targetCompatibility = '11' configurations.all { exclude group: 'asm' diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ide/META-INF/MANIFEST.MF index f991a58457..ace51a3636 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ide/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: full, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: full.ide 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 e8bc15b6fe..4cb371a9bd 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 @@ -8,8 +8,7 @@ - - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.tests/META-INF/MANIFEST.MF index 53df71681b..930cfcf3bc 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.tests/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Require-Bundle: full, org.junit;bundle-version="4.12.0", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: full.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui.tests/META-INF/MANIFEST.MF index 1a38defead..7661d637a6 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui.tests/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: full.ui, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.junit4, org.eclipse.xtext.xbase.junit -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: full.ui.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui/META-INF/MANIFEST.MF index f359482205..2c6b954750 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: full, org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: full.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/.launch/Launch Runtime Eclipse.launch index c6c623b29f..c5cfb73c3c 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/.launch/Launch Runtime Eclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/META-INF/MANIFEST.MF index c5e86bc71b..d570def5e0 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: full diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/pom.xml index e5de358146..1e041cf989 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/pom.xml @@ -36,26 +36,6 @@ false - - org.eclipse.emf - org.eclipse.emf.mwe2.launch - ${mwe2Version} - - - org.eclipse.xtext - org.eclipse.xtext.common.types - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xtext.generator - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xbase - ${xtextVersion} - org.eclipse.xtext xtext-antlr-generator 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 a6768e1657..d24187ec8f 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 @@ -10,10 +10,10 @@ unspecified 2.13.0 UTF-8 - 1.8 - 1.8 + 11 + 11 - 1.7.0 + 2.7.5 @@ -59,18 +59,10 @@ plugin-source - - - - org.eclipse.tycho.extras - tycho-source-feature-plugin - ${tycho-version} - - source-feature - package + feature-source - source-feature + feature-source @@ -216,67 +208,6 @@ - - - - org.eclipse.tycho - - - tycho-compiler-plugin - - - [0.23.1,) - - - compile - testCompile - - - - - - - - - - org.eclipse.tycho - - - tycho-packaging-plugin - - - [0.23.1,) - - - build-qualifier - build-qualifier-aggregator - validate-id - validate-version - - - - - - - - - - org.eclipse.tycho - - - target-platform-configuration - - - [2.4.0,) - - - target-platform - - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/build.gradle index 7d0880c115..5eebfee647 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/build.gradle +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/build.gradle @@ -26,8 +26,8 @@ subprojects { group = 'gradle' version = '1.0.0-SNAPSHOT' - sourceCompatibility = '1.8' - targetCompatibility = '1.8' + sourceCompatibility = '11' + targetCompatibility = '11' configurations.all { exclude group: 'asm' diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/build.gradle index 331e6e68c1..d0632d4ec7 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/build.gradle +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/build.gradle @@ -26,8 +26,8 @@ subprojects { group = 'lsGradleApp' version = '1.0.0-SNAPSHOT' - sourceCompatibility = '1.8' - targetCompatibility = '1.8' + sourceCompatibility = '11' + targetCompatibility = '11' configurations.all { exclude group: 'asm' diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/build.gradle index c567652ff1..3c073acd0a 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/build.gradle +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/build.gradle @@ -26,8 +26,8 @@ subprojects { group = 'lsGradleFatjar' version = '1.0.0-SNAPSHOT' - sourceCompatibility = '1.8' - targetCompatibility = '1.8' + sourceCompatibility = '11' + targetCompatibility = '11' configurations.all { exclude group: 'asm' diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/pom.xml index 023e1d7b12..1438ec1452 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/pom.xml @@ -9,8 +9,8 @@ unspecified UTF-8 - 1.8 - 1.8 + 11 + 11 lsMavenApp diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/pom.xml index cbad978d3f..fa72f26aa0 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/pom.xml @@ -9,8 +9,8 @@ unspecified UTF-8 - 1.8 - 1.8 + 11 + 11 lsMavenFatjar diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/META-INF/MANIFEST.MF index eda29c4d5d..51bc25fc48 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: lsMavenTychoApp, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: lsMavenTychoApp.ide 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 fb2c4c7d18..ebe78a501c 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 @@ -8,8 +8,7 @@ - - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ui/META-INF/MANIFEST.MF index 77a45d42ae..a7a1f991b5 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: lsMavenTychoApp, org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: lsMavenTychoApp.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/.launch/Launch Runtime Eclipse.launch index 92121e94d8..8d98971360 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/.launch/Launch Runtime Eclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/META-INF/MANIFEST.MF index dca5be5a22..560d4f1443 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: lsMavenTychoApp diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/pom.xml index 4d08419247..30284dce02 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp/pom.xml @@ -36,26 +36,6 @@ false - - org.eclipse.emf - org.eclipse.emf.mwe2.launch - ${mwe2Version} - - - org.eclipse.xtext - org.eclipse.xtext.common.types - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xtext.generator - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xbase - ${xtextVersion} - org.eclipse.xtext xtext-antlr-generator 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 b18996d676..19c838d22d 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 @@ -10,10 +10,10 @@ unspecified 2.13.0 UTF-8 - 1.8 - 1.8 + 11 + 11 - 1.7.0 + 2.7.5 @@ -172,67 +172,6 @@ - - - - org.eclipse.tycho - - - tycho-compiler-plugin - - - [0.23.1,) - - - compile - testCompile - - - - - - - - - - org.eclipse.tycho - - - tycho-packaging-plugin - - - [0.23.1,) - - - build-qualifier - build-qualifier-aggregator - validate-id - validate-version - - - - - - - - - - org.eclipse.tycho - - - target-platform-configuration - - - [2.4.0,) - - - target-platform - - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/META-INF/MANIFEST.MF index 9ffaa1a1cd..10c3b46159 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: lsMavenTychoFatjar, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: lsMavenTychoFatjar.ide 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 f0020b60f9..99da9f2c98 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 @@ -8,8 +8,7 @@ - - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ui/META-INF/MANIFEST.MF index 0467e74fa1..a6a5d2f226 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: lsMavenTychoFatjar, org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: lsMavenTychoFatjar.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/.launch/Launch Runtime Eclipse.launch index a6ab7e6e9b..73aa031e9d 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/.launch/Launch Runtime Eclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/META-INF/MANIFEST.MF index c3c4b4c3c1..ede9973532 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: lsMavenTychoFatjar diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/pom.xml index 8b4aa665dc..00f2772f3f 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar/pom.xml @@ -36,26 +36,6 @@ false - - org.eclipse.emf - org.eclipse.emf.mwe2.launch - ${mwe2Version} - - - org.eclipse.xtext - org.eclipse.xtext.common.types - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xtext.generator - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xbase - ${xtextVersion} - org.eclipse.xtext xtext-antlr-generator 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 00dda9b2e4..f9c94d1a22 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 @@ -10,10 +10,10 @@ unspecified 2.13.0 UTF-8 - 1.8 - 1.8 + 11 + 11 - 1.7.0 + 2.7.5 @@ -172,67 +172,6 @@ - - - - org.eclipse.tycho - - - tycho-compiler-plugin - - - [0.23.1,) - - - compile - testCompile - - - - - - - - - - org.eclipse.tycho - - - tycho-packaging-plugin - - - [0.23.1,) - - - build-qualifier - build-qualifier-aggregator - validate-id - validate-version - - - - - - - - - - org.eclipse.tycho - - - target-platform-configuration - - - [2.4.0,) - - - target-platform - - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ide/META-INF/MANIFEST.MF index 784ea7b85e..8c2b6f5ad7 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ide/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: mavenTycho, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: mavenTycho.ide 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 bd7302dabd..4351c3fb2d 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 @@ -8,8 +8,7 @@ - - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.tests/META-INF/MANIFEST.MF index 467b6a3b5b..eaa0f20063 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.tests/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Require-Bundle: mavenTycho, org.junit;bundle-version="4.12.0", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: mavenTycho.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui.tests/META-INF/MANIFEST.MF index 701fb6bfe1..cdd48f127d 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui.tests/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: mavenTycho.ui, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.junit4, org.eclipse.xtext.xbase.junit -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: mavenTycho.ui.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui/META-INF/MANIFEST.MF index 96cb89cd32..d09df6c64c 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: mavenTycho, org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: mavenTycho.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/.launch/Launch Runtime Eclipse.launch index 4c0b4f2c1f..f4910ee633 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/.launch/Launch Runtime Eclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/META-INF/MANIFEST.MF index 61764cd31e..6805d7b32c 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: mavenTycho diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/pom.xml index 43461a7a65..d85706f1f0 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho/pom.xml @@ -36,26 +36,6 @@ false - - org.eclipse.emf - org.eclipse.emf.mwe2.launch - ${mwe2Version} - - - org.eclipse.xtext - org.eclipse.xtext.common.types - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xtext.generator - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xbase - ${xtextVersion} - org.eclipse.xtext xtext-antlr-generator 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 2296e1ed8b..6f527c2c01 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 @@ -10,10 +10,10 @@ unspecified 2.13.0 UTF-8 - 1.8 - 1.8 + 11 + 11 - 1.7.0 + 2.7.5 @@ -175,67 +175,6 @@ - - - - org.eclipse.tycho - - - tycho-compiler-plugin - - - [0.23.1,) - - - compile - testCompile - - - - - - - - - - org.eclipse.tycho - - - tycho-packaging-plugin - - - [0.23.1,) - - - build-qualifier - build-qualifier-aggregator - validate-id - validate-version - - - - - - - - - - org.eclipse.tycho - - - target-platform-configuration - - - [2.4.0,) - - - target-platform - - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ide/META-INF/MANIFEST.MF deleted file mode 100644 index 19d7ed6f84..0000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ide/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoJ11.ide -Bundle-Vendor: My Company -Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoJ11.ide; singleton:=true -Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoJ11, - org.eclipse.xtext.ide, - org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Automatic-Module-Name: mavenTychoJ11.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..8243e46754 --- /dev/null +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/META-INF/MANIFEST.MF @@ -0,0 +1,12 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: mavenTychoJ17.ide +Bundle-Vendor: My Company +Bundle-Version: 1.0.0.qualifier +Bundle-SymbolicName: mavenTychoJ17.ide; singleton:=true +Bundle-ActivationPolicy: lazy +Require-Bundle: mavenTychoJ17, + org.eclipse.xtext.ide, + org.eclipse.xtext.xbase.ide +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Automatic-Module-Name: mavenTychoJ17.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ide/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ide/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/pom.xml similarity index 80% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ide/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/pom.xml index 09487fe1a0..e58886513e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ide/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ide/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoJ11 - mavenTychoJ11.parent + mavenTychoJ17 + mavenTychoJ17.parent 1.0.0-SNAPSHOT - mavenTychoJ11.ide + mavenTychoJ17.ide eclipse-plugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.target/mavenTychoJ11.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target similarity index 98% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.target/mavenTychoJ11.target.target rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target index b3eff83dbf..16afc2d168 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.target/mavenTychoJ11.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.target/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/pom.xml similarity index 75% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.target/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/pom.xml index 4f7ea21f7c..672263289c 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.target/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoJ11 - mavenTychoJ11.parent + mavenTychoJ17 + mavenTychoJ17.parent 1.0.0-SNAPSHOT - mavenTychoJ11.target + mavenTychoJ17.target eclipse-target-definition diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/META-INF/MANIFEST.MF similarity index 59% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/META-INF/MANIFEST.MF index eba90d4b34..89e8fc9f55 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/META-INF/MANIFEST.MF @@ -1,14 +1,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoJ11.tests +Bundle-Name: mavenTychoJ17.tests Bundle-Vendor: My Company Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoJ11.tests; singleton:=true +Bundle-SymbolicName: mavenTychoJ17.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoJ11, +Require-Bundle: mavenTychoJ17, org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing Import-Package: org.junit.jupiter.api;version="[5.1.0,6.0.0)", org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Automatic-Module-Name: mavenTychoJ11.tests +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Automatic-Module-Name: mavenTychoJ17.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/pom.xml similarity index 79% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.tests/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/pom.xml index a8ac676a52..488cada294 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.tests/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.tests/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoJ11 - mavenTychoJ11.parent + mavenTychoJ17 + mavenTychoJ17.parent 1.0.0-SNAPSHOT - mavenTychoJ11.tests + mavenTychoJ17.tests eclipse-test-plugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/META-INF/MANIFEST.MF similarity index 60% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/META-INF/MANIFEST.MF index f3ee6e91f4..4bd53940c8 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoJ11.ui.tests +Bundle-Name: mavenTychoJ17.ui.tests Bundle-Vendor: My Company Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoJ11.ui.tests; singleton:=true +Bundle-SymbolicName: mavenTychoJ17.ui.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoJ11.ui, +Require-Bundle: mavenTychoJ17.ui, org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.xbase.junit Import-Package: org.junit.jupiter.api;version="[5.1.0,6.0.0)", org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Automatic-Module-Name: mavenTychoJ11.ui.tests +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Automatic-Module-Name: mavenTychoJ17.ui.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/pom.xml similarity index 84% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui.tests/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/pom.xml index 5330f4ac3c..561f8d0a3e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui.tests/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoJ11 - mavenTychoJ11.parent + mavenTychoJ17 + mavenTychoJ17.parent 1.0.0-SNAPSHOT - mavenTychoJ11.ui.tests + mavenTychoJ17.ui.tests eclipse-test-plugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/META-INF/MANIFEST.MF similarity index 61% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/META-INF/MANIFEST.MF index f438e46c0c..c52668d815 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/META-INF/MANIFEST.MF @@ -1,17 +1,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoJ11.ui +Bundle-Name: mavenTychoJ17.ui Bundle-Vendor: My Company Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoJ11.ui; singleton:=true +Bundle-SymbolicName: mavenTychoJ17.ui; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoJ11, - mavenTychoJ11.ide, +Require-Bundle: mavenTychoJ17, + mavenTychoJ17.ide, org.eclipse.xtext.ui, org.eclipse.xtext.ui.shared, org.eclipse.xtext.ui.codetemplates.ui, org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Automatic-Module-Name: mavenTychoJ11.ui +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Automatic-Module-Name: mavenTychoJ17.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/pom.xml similarity index 80% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/pom.xml index 535e186e3e..2f264d0967 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.ui/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoJ11 - mavenTychoJ11.parent + mavenTychoJ17 + mavenTychoJ17.parent 1.0.0-SNAPSHOT - mavenTychoJ11.ui + mavenTychoJ17.ui eclipse-plugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml similarity index 94% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.web/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml index f172fb84d5..7b734bcf30 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoJ11 - mavenTychoJ11.parent + mavenTychoJ17 + mavenTychoJ17.parent 1.0.0-SNAPSHOT - mavenTychoJ11.web + mavenTychoJ17.web war @@ -75,12 +75,12 @@ ${project.groupId} - mavenTychoJ11 + mavenTychoJ17 ${project.version} ${project.groupId} - mavenTychoJ11.ide + mavenTychoJ17.ide ${project.version} diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch similarity index 63% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch index 6572b65149..3550ebf55e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch @@ -1,7 +1,7 @@ - + @@ -10,9 +10,9 @@ - + - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/.launch/Launch Runtime Eclipse.launch similarity index 94% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/.launch/Launch Runtime Eclipse.launch rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/.launch/Launch Runtime Eclipse.launch index c4fc62032b..7ed8b31128 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/.launch/Launch Runtime Eclipse.launch @@ -4,7 +4,7 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/META-INF/MANIFEST.MF similarity index 60% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/META-INF/MANIFEST.MF index 9171c85628..8d7b8aedbe 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoJ11 +Bundle-Name: mavenTychoJ17 Bundle-Vendor: My Company Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoJ11; singleton:=true +Bundle-SymbolicName: mavenTychoJ17; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Automatic-Module-Name: mavenTychoJ11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Automatic-Module-Name: mavenTychoJ17 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/pom.xml similarity index 87% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/pom.xml index a664a5dc11..31b724e811 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoJ11 - mavenTychoJ11.parent + mavenTychoJ17 + mavenTychoJ17.parent 1.0.0-SNAPSHOT - mavenTychoJ11 + mavenTychoJ17 eclipse-plugin @@ -54,37 +54,37 @@ - ${basedir}/../mavenTychoJ11/src-gen/ + ${basedir}/../mavenTychoJ17/src-gen/ **/* - ${basedir}/../mavenTychoJ11.tests/src-gen/ + ${basedir}/../mavenTychoJ17.tests/src-gen/ **/* - ${basedir}/../mavenTychoJ11.ide/src-gen/ + ${basedir}/../mavenTychoJ17.ide/src-gen/ **/* - ${basedir}/../mavenTychoJ11.ui/src-gen/ + ${basedir}/../mavenTychoJ17.ui/src-gen/ **/* - ${basedir}/../mavenTychoJ11.ui.tests/src-gen/ + ${basedir}/../mavenTychoJ17.ui.tests/src-gen/ **/* - ${basedir}/../mavenTychoJ11.web/src-gen/ + ${basedir}/../mavenTychoJ17.web/src-gen/ **/* diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/src/mydsl/GenerateMyDsl.mwe2 b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/src/mydsl/GenerateMyDsl.mwe2 similarity index 97% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/src/mydsl/GenerateMyDsl.mwe2 rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/src/mydsl/GenerateMyDsl.mwe2 index 6c8bff93f0..4bd5ad84da 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/src/mydsl/GenerateMyDsl.mwe2 +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/src/mydsl/GenerateMyDsl.mwe2 @@ -10,7 +10,7 @@ Workflow { component = XtextGenerator { configuration = { project = StandardProjectConfig { - baseName = "mavenTychoJ11" + baseName = "mavenTychoJ17" rootPath = rootPath runtimeTest = { enabled = true diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/src/mydsl/MyDsl.xtext b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/src/mydsl/MyDsl.xtext similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11/src/mydsl/MyDsl.xtext rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17/src/mydsl/MyDsl.xtext diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/pom.xml similarity index 94% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/pom.xml index 076cc5716c..ced89cf9c4 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/pom.xml @@ -1,17 +1,17 @@ 4.0.0 - mavenTychoJ11 + mavenTychoJ17 1.0.0-SNAPSHOT - mavenTychoJ11.parent + mavenTychoJ17.parent pom unspecified 2.13.0 UTF-8 - 11 - 11 + 17 + 17 2.7.5 @@ -21,13 +21,13 @@ - mavenTychoJ11 - mavenTychoJ11.ide - mavenTychoJ11.ui - mavenTychoJ11.web - mavenTychoJ11.target - mavenTychoJ11.tests - mavenTychoJ11.ui.tests + mavenTychoJ17 + mavenTychoJ17.ide + mavenTychoJ17.ui + mavenTychoJ17.web + mavenTychoJ17.target + mavenTychoJ17.tests + mavenTychoJ17.ui.tests @@ -55,8 +55,8 @@ - mavenTychoJ11 - mavenTychoJ11.target + mavenTychoJ17 + mavenTychoJ17.target ${project.version} diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ide/META-INF/MANIFEST.MF index 19698995af..bde943ec7c 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ide/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: mavenTychoP2, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: mavenTychoP2.ide 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 2dea0b4aa4..d06bb6c4a9 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 @@ -8,8 +8,7 @@ - - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.tests/META-INF/MANIFEST.MF index 06fc4075ef..375f7a06e4 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.tests/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Require-Bundle: mavenTychoP2, org.junit;bundle-version="4.12.0", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: mavenTychoP2.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui.tests/META-INF/MANIFEST.MF index ac8db5e110..6a2ba617de 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui.tests/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: mavenTychoP2.ui, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.junit4, org.eclipse.xtext.xbase.junit -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: mavenTychoP2.ui.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui/META-INF/MANIFEST.MF index a3d18059dd..e08ddc5cb7 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: mavenTychoP2, org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: mavenTychoP2.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/.launch/Launch Runtime Eclipse.launch index 834a8a8ca4..421c9e4e20 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/.launch/Launch Runtime Eclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/META-INF/MANIFEST.MF index 04e716759f..087af2f430 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: mavenTychoP2 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/pom.xml index 5af9765a16..9e2af2f359 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2/pom.xml @@ -36,26 +36,6 @@ false - - org.eclipse.emf - org.eclipse.emf.mwe2.launch - ${mwe2Version} - - - org.eclipse.xtext - org.eclipse.xtext.common.types - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xtext.generator - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xbase - ${xtextVersion} - org.eclipse.xtext xtext-antlr-generator 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 5c064c8185..6bddf19038 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 @@ -10,10 +10,10 @@ unspecified 2.13.0 UTF-8 - 1.8 - 1.8 + 11 + 11 - 1.7.0 + 2.7.5 @@ -61,18 +61,10 @@ plugin-source - - - - org.eclipse.tycho.extras - tycho-source-feature-plugin - ${tycho-version} - - source-feature - package + feature-source - source-feature + feature-source @@ -218,67 +210,6 @@ - - - - org.eclipse.tycho - - - tycho-compiler-plugin - - - [0.23.1,) - - - compile - testCompile - - - - - - - - - - org.eclipse.tycho - - - tycho-packaging-plugin - - - [0.23.1,) - - - build-qualifier - build-qualifier-aggregator - validate-id - validate-version - - - - - - - - - - org.eclipse.tycho - - - target-platform-configuration - - - [2.4.0,) - - - target-platform - - - - - - diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ide/META-INF/MANIFEST.MF deleted file mode 100644 index e117d0d985..0000000000 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ide/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoP2J11.ide -Bundle-Vendor: My Company -Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoP2J11.ide; singleton:=true -Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoP2J11, - org.eclipse.xtext.ide, - org.eclipse.xtext.xbase.ide -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Automatic-Module-Name: mavenTychoP2J11.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.feature/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.feature/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.feature/feature.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/feature.xml similarity index 75% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.feature/feature.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/feature.xml index 92d57ec7a7..a594f450cd 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.feature/feature.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.feature/feature.xml @@ -1,21 +1,21 @@ - 4.0.0 - mavenTychoP2J11 - mavenTychoP2J11.parent + mavenTychoP2J17 + mavenTychoP2J17.parent 1.0.0-SNAPSHOT - mavenTychoP2J11.feature + mavenTychoP2J17.feature eclipse-feature diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..bcdf274dec --- /dev/null +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/META-INF/MANIFEST.MF @@ -0,0 +1,12 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: mavenTychoP2J17.ide +Bundle-Vendor: My Company +Bundle-Version: 1.0.0.qualifier +Bundle-SymbolicName: mavenTychoP2J17.ide; singleton:=true +Bundle-ActivationPolicy: lazy +Require-Bundle: mavenTychoP2J17, + org.eclipse.xtext.ide, + org.eclipse.xtext.xbase.ide +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Automatic-Module-Name: mavenTychoP2J17.ide diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ide/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ide/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/pom.xml similarity index 79% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ide/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/pom.xml index 7510d6548c..e421285ee6 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ide/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ide/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoP2J11 - mavenTychoP2J11.parent + mavenTychoP2J17 + mavenTychoP2J17.parent 1.0.0-SNAPSHOT - mavenTychoP2J11.ide + mavenTychoP2J17.ide eclipse-plugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.repository/category.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository/category.xml similarity index 66% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.repository/category.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository/category.xml index dbdd517e86..2b86ad4eb2 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.repository/category.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository/category.xml @@ -1,9 +1,9 @@ - + - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.repository/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository/pom.xml similarity index 90% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.repository/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository/pom.xml index a68981a3ae..e07aa7f029 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.repository/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.repository/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoP2J11 - mavenTychoP2J11.parent + mavenTychoP2J17 + mavenTychoP2J17.parent 1.0.0-SNAPSHOT - mavenTychoP2J11.repository + mavenTychoP2J17.repository eclipse-repository diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.target/mavenTychoP2J11.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target similarity index 97% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.target/mavenTychoP2J11.target.target rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target index 8680d68a78..f90350fb24 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.target/mavenTychoP2J11.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.target/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/pom.xml similarity index 74% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.target/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/pom.xml index 3021c79240..b7d32dbe43 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.target/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoP2J11 - mavenTychoP2J11.parent + mavenTychoP2J17 + mavenTychoP2J17.parent 1.0.0-SNAPSHOT - mavenTychoP2J11.target + mavenTychoP2J17.target eclipse-target-definition diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/META-INF/MANIFEST.MF similarity index 51% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/META-INF/MANIFEST.MF index 656d02c666..76fe00eb5a 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoP2J11.tests +Bundle-Name: mavenTychoP2J17.tests Bundle-Vendor: My Company Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoP2J11.tests; singleton:=true +Bundle-SymbolicName: mavenTychoP2J17.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoP2J11, +Require-Bundle: mavenTychoP2J17, org.junit;bundle-version="4.12.0", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Automatic-Module-Name: mavenTychoP2J11.tests +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Automatic-Module-Name: mavenTychoP2J17.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/pom.xml similarity index 79% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.tests/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/pom.xml index 03efb87b1d..17380a6eec 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.tests/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.tests/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoP2J11 - mavenTychoP2J11.parent + mavenTychoP2J17 + mavenTychoP2J17.parent 1.0.0-SNAPSHOT - mavenTychoP2J11.tests + mavenTychoP2J17.tests eclipse-test-plugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/META-INF/MANIFEST.MF similarity index 55% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui.tests/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/META-INF/MANIFEST.MF index 6b7e1ae1fb..15d618bf8a 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoP2J11.ui.tests +Bundle-Name: mavenTychoP2J17.ui.tests Bundle-Vendor: My Company Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoP2J11.ui.tests; singleton:=true +Bundle-SymbolicName: mavenTychoP2J17.ui.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoP2J11.ui, +Require-Bundle: mavenTychoP2J17.ui, org.junit;bundle-version="4.12.0", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.junit4, org.eclipse.xtext.xbase.junit -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Automatic-Module-Name: mavenTychoP2J11.ui.tests +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Automatic-Module-Name: mavenTychoP2J17.ui.tests diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui.tests/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui.tests/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui.tests/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/pom.xml similarity index 83% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui.tests/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/pom.xml index a18650cb1d..2f0b2637af 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui.tests/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoP2J11 - mavenTychoP2J11.parent + mavenTychoP2J17 + mavenTychoP2J17.parent 1.0.0-SNAPSHOT - mavenTychoP2J11.ui.tests + mavenTychoP2J17.ui.tests eclipse-test-plugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/META-INF/MANIFEST.MF similarity index 60% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/META-INF/MANIFEST.MF index 6accf27c9c..d307ca664d 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/META-INF/MANIFEST.MF @@ -1,17 +1,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoP2J11.ui +Bundle-Name: mavenTychoP2J17.ui Bundle-Vendor: My Company Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoP2J11.ui; singleton:=true +Bundle-SymbolicName: mavenTychoP2J17.ui; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: mavenTychoP2J11, - mavenTychoP2J11.ide, +Require-Bundle: mavenTychoP2J17, + mavenTychoP2J17.ide, org.eclipse.xtext.ui, org.eclipse.xtext.ui.shared, org.eclipse.xtext.ui.codetemplates.ui, org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Automatic-Module-Name: mavenTychoP2J11.ui +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Automatic-Module-Name: mavenTychoP2J17.ui diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/pom.xml similarity index 79% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/pom.xml index 3767abdea6..e0104a8dd6 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.ui/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoP2J11 - mavenTychoP2J11.parent + mavenTychoP2J17 + mavenTychoP2J17.parent 1.0.0-SNAPSHOT - mavenTychoP2J11.ui + mavenTychoP2J17.ui eclipse-plugin diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml similarity index 93% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.web/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml index 24bdb8bbbc..11c619149a 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoP2J11 - mavenTychoP2J11.parent + mavenTychoP2J17 + mavenTychoP2J17.parent 1.0.0-SNAPSHOT - mavenTychoP2J11.web + mavenTychoP2J17.web war @@ -75,12 +75,12 @@ ${project.groupId} - mavenTychoP2J11 + mavenTychoP2J17 ${project.version} ${project.groupId} - mavenTychoP2J11.ide + mavenTychoP2J17.ide ${project.version} diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch similarity index 60% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch index f318a3125c..294b34e474 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch @@ -1,7 +1,7 @@ - + @@ -10,9 +10,9 @@ - + - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/.launch/Launch Runtime Eclipse.launch b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/.launch/Launch Runtime Eclipse.launch similarity index 97% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/.launch/Launch Runtime Eclipse.launch rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/.launch/Launch Runtime Eclipse.launch index 3be0ea9131..1726442757 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/.launch/Launch Runtime Eclipse.launch +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/.launch/Launch Runtime Eclipse.launch @@ -4,7 +4,7 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/META-INF/MANIFEST.MF similarity index 59% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/META-INF/MANIFEST.MF rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/META-INF/MANIFEST.MF index 9260d5262f..f88a4ce579 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: mavenTychoP2J11 +Bundle-Name: mavenTychoP2J17 Bundle-Vendor: My Company Bundle-Version: 1.0.0.qualifier -Bundle-SymbolicName: mavenTychoP2J11; singleton:=true +Bundle-SymbolicName: mavenTychoP2J17; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Automatic-Module-Name: mavenTychoP2J11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Automatic-Module-Name: mavenTychoP2J17 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/build.properties b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/build.properties similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/build.properties rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/build.properties diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/pom.xml similarity index 86% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/pom.xml index a48e7c9896..cc9d850590 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mavenTychoP2J11 - mavenTychoP2J11.parent + mavenTychoP2J17 + mavenTychoP2J17.parent 1.0.0-SNAPSHOT - mavenTychoP2J11 + mavenTychoP2J17 eclipse-plugin @@ -54,37 +54,37 @@ - ${basedir}/../mavenTychoP2J11/src-gen/ + ${basedir}/../mavenTychoP2J17/src-gen/ **/* - ${basedir}/../mavenTychoP2J11.tests/src-gen/ + ${basedir}/../mavenTychoP2J17.tests/src-gen/ **/* - ${basedir}/../mavenTychoP2J11.ide/src-gen/ + ${basedir}/../mavenTychoP2J17.ide/src-gen/ **/* - ${basedir}/../mavenTychoP2J11.ui/src-gen/ + ${basedir}/../mavenTychoP2J17.ui/src-gen/ **/* - ${basedir}/../mavenTychoP2J11.ui.tests/src-gen/ + ${basedir}/../mavenTychoP2J17.ui.tests/src-gen/ **/* - ${basedir}/../mavenTychoP2J11.web/src-gen/ + ${basedir}/../mavenTychoP2J17.web/src-gen/ **/* diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/src/mydsl/GenerateMyDsl.mwe2 b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/src/mydsl/GenerateMyDsl.mwe2 similarity index 97% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/src/mydsl/GenerateMyDsl.mwe2 rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/src/mydsl/GenerateMyDsl.mwe2 index 5b3d3c007f..c4b1fbf068 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/src/mydsl/GenerateMyDsl.mwe2 +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/src/mydsl/GenerateMyDsl.mwe2 @@ -10,7 +10,7 @@ Workflow { component = XtextGenerator { configuration = { project = StandardProjectConfig { - baseName = "mavenTychoP2J11" + baseName = "mavenTychoP2J17" rootPath = rootPath runtimeTest = { enabled = true diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/src/mydsl/MyDsl.xtext b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/src/mydsl/MyDsl.xtext similarity index 100% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/mavenTychoP2J11/src/mydsl/MyDsl.xtext rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17/src/mydsl/MyDsl.xtext diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml similarity index 93% rename from org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/pom.xml rename to org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml index 24b31c4648..610a17c472 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J11/mavenTychoP2J11.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml @@ -1,17 +1,17 @@ 4.0.0 - mavenTychoP2J11 + mavenTychoP2J17 1.0.0-SNAPSHOT - mavenTychoP2J11.parent + mavenTychoP2J17.parent pom unspecified 2.13.0 UTF-8 - 11 - 11 + 17 + 17 2.7.5 @@ -21,15 +21,15 @@ - mavenTychoP2J11 - mavenTychoP2J11.ide - mavenTychoP2J11.ui - mavenTychoP2J11.web - mavenTychoP2J11.target - mavenTychoP2J11.feature - mavenTychoP2J11.repository - mavenTychoP2J11.tests - mavenTychoP2J11.ui.tests + mavenTychoP2J17 + mavenTychoP2J17.ide + mavenTychoP2J17.ui + mavenTychoP2J17.web + mavenTychoP2J17.target + mavenTychoP2J17.feature + mavenTychoP2J17.repository + mavenTychoP2J17.tests + mavenTychoP2J17.ui.tests @@ -90,8 +90,8 @@ - mavenTychoP2J11 - mavenTychoP2J11.target + mavenTychoP2J17 + mavenTychoP2J17.target ${project.version} diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/pom.xml index 032bec94a7..0b6ef58d29 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/pom.xml @@ -9,8 +9,8 @@ unspecified UTF-8 - 1.8 - 1.8 + 11 + 11 plainMaven diff --git a/org.eclipse.xtext.util/.classpath b/org.eclipse.xtext.util/.classpath index 040706ff08..6be8f74512 100644 --- a/org.eclipse.xtext.util/.classpath +++ b/org.eclipse.xtext.util/.classpath @@ -6,7 +6,7 @@ - + diff --git a/org.eclipse.xtext.util/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.util/.settings/org.eclipse.jdt.core.prefs index 35068d95fc..18ad895236 100644 --- a/org.eclipse.xtext.util/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.util/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/org.eclipse.xtext.util/META-INF/MANIFEST.MF index 81be0d5778..ecf041d030 100644 --- a/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.util Bundle-Version: 2.29.0.qualifier Maven-Version: unspecified Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.xtext.util; uses:="org.eclipse.emf.ecore.resource, org.apache.log4j, diff --git a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaVersion.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaVersion.java index 48c6099c97..c62e1e67c4 100644 --- a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaVersion.java +++ b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaVersion.java @@ -53,7 +53,11 @@ public enum JavaVersion { /** * Well, Java 11 */ - JAVA11("Java 11", new String[] {"11", "1.11"}, "JavaSE-11", "-1.11", Constants.JAVA11) + JAVA11("Java 11", new String[] {"11", "1.11"}, "JavaSE-11", "-1.11", Constants.JAVA11), + /** + * Well, Java 17, next LTS version + */ + JAVA17("Java 17", new String[] {"17", "1.17"}, "JavaSE-17", "-1.17", Constants.JAVA17) ; private static final class Constants { @@ -66,6 +70,7 @@ private static final class Constants { private static final long JAVA9 = ((long)(MAJOR_VERSION_1_5 + 4) << 16) + MINOR_VERSION_0; private static final long JAVA10 = ((long)(MAJOR_VERSION_1_5 + 5) << 16) + MINOR_VERSION_0; private static final long JAVA11 = ((long)(MAJOR_VERSION_1_5 + 6) << 16) + MINOR_VERSION_0; + private static final long JAVA17 = ((long)(MAJOR_VERSION_1_5 + 12) << 16) + MINOR_VERSION_0; } // if you introduce a new JavaVersion don't forget to adapt diff --git a/org.eclipse.xtext.xtext.bootstrap/.classpath b/org.eclipse.xtext.xtext.bootstrap/.classpath index 65a5d19c16..dd4ba27ebc 100644 --- a/org.eclipse.xtext.xtext.bootstrap/.classpath +++ b/org.eclipse.xtext.xtext.bootstrap/.classpath @@ -6,7 +6,7 @@ - + diff --git a/org.eclipse.xtext.xtext.bootstrap/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.bootstrap/.settings/org.eclipse.jdt.core.prefs index 35068d95fc..18ad895236 100644 --- a/org.eclipse.xtext.xtext.bootstrap/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.bootstrap/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.eclipse.xtext.xtext.generator/.classpath b/org.eclipse.xtext.xtext.generator/.classpath index 557b73a6c5..307b9ffff6 100644 --- a/org.eclipse.xtext.xtext.generator/.classpath +++ b/org.eclipse.xtext.xtext.generator/.classpath @@ -19,7 +19,7 @@ - + diff --git a/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.core.prefs index 35068d95fc..18ad895236 100644 --- a/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF index dafad4dffb..2a84f641d4 100644 --- a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.xtext.xtext.generator;singleton:=true Bundle-Version: 2.29.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Name: Xtext Generator 2 Bundle-Vendor: Eclipse Xtext Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/ManifestAccess.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/ManifestAccess.xtend index 247d3d00d3..cc4ebeb9ec 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/ManifestAccess.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/ManifestAccess.xtend @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2020 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2022 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -112,7 +112,7 @@ class ManifestAccess extends TextFileAccess implements IGuiceAwareGeneratorCompo «IF !version.nullOrEmpty» Bundle-Version: «version» «ENDIF» - Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy «IF !exportedPackages.empty» Export-Package: «FOR pack : exportedPackages.sort SEPARATOR ',\n '»«pack»«ENDFOR» diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/ManifestAccess.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/ManifestAccess.java index 3fd2d747e7..bac54e828b 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/ManifestAccess.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/ManifestAccess.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2015, 2020 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2022 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -168,7 +168,7 @@ public CharSequence getContent() { _builder.newLineIfNotEmpty(); } } - _builder.append("Bundle-RequiredExecutionEnvironment: JavaSE-1.8"); + _builder.append("Bundle-RequiredExecutionEnvironment: JavaSE-11"); _builder.newLine(); _builder.append("Bundle-ActivationPolicy: lazy"); _builder.newLine(); diff --git a/org.eclipse.xtext.xtext.ide/.classpath b/org.eclipse.xtext.xtext.ide/.classpath index aa4b1d2e8e..17aa8efb2a 100644 --- a/org.eclipse.xtext.xtext.ide/.classpath +++ b/org.eclipse.xtext.xtext.ide/.classpath @@ -13,7 +13,7 @@ - + diff --git a/org.eclipse.xtext.xtext.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.ide/.settings/org.eclipse.jdt.core.prefs index 35068d95fc..18ad895236 100644 --- a/org.eclipse.xtext.xtext.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF index 6c30096c4b..2894296aad 100644 --- a/org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Xtext Language IDE Support Bundle-SymbolicName: org.eclipse.xtext.xtext.ide;singleton:=true Bundle-Version: 2.29.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Xtext Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.11.0" diff --git a/org.eclipse.xtext.xtext.wizard/.classpath b/org.eclipse.xtext.xtext.wizard/.classpath index cb4fd9ace9..c56a1b8441 100644 --- a/org.eclipse.xtext.xtext.wizard/.classpath +++ b/org.eclipse.xtext.xtext.wizard/.classpath @@ -18,7 +18,7 @@ - + diff --git a/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.jdt.core.prefs index 35068d95fc..18ad895236 100644 --- a/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF index 02fc28681a..58d7537634 100644 --- a/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtext Wizard Bundle-SymbolicName: org.eclipse.xtext.xtext.wizard Bundle-Version: 2.29.0.qualifier Bundle-Vendor: Eclipse Xtext -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: gradlew;x-internal:=true, org.eclipse.xtext.xtext.wizard;x-friends:="org.eclipse.xtext.tests,org.eclipse.xtext.xtext.ui,org.eclipse.xtext.xtext.ui.tests", org.eclipse.xtext.xtext.wizard.cli;x-friends:="org.eclipse.xtext.tests", 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 e9919ae727..8ab62d0a2c 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 @@ -11,7 +11,6 @@ package org.eclipse.xtext.xtext.wizard import com.google.common.base.Charsets import com.google.common.io.Resources import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor -import org.eclipse.xtext.util.JavaVersion @FinalFieldsConstructor class ParentProjectDescriptor extends ProjectDescriptor { @@ -73,10 +72,6 @@ class ParentProjectDescriptor extends ProjectDescriptor { '2.7.5' } - def String getTychoVersionJ8() { - '1.7.0' - } - def private CharSequence loadResource(String resourcePath) { Resources.toString(class.classLoader.getResource(resourcePath), Charsets.ISO_8859_1) } @@ -102,6 +97,11 @@ class ParentProjectDescriptor extends ProjectDescriptor { maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } +««« «FOR x : #['lib','core','extras','maven','xtend','web']» +««« maven { +««« url 'https://ci.eclipse.org/xtext/job/xtext-«x»/job//lastSuccessfulBuild/artifact/build/maven-repository/' +««« } +««« «ENDFOR» «ENDIF» } @@ -218,7 +218,7 @@ class ParentProjectDescriptor extends ProjectDescriptor { «javaVersion» «IF config.needsTychoBuild» - «IF config.javaVersion.isAtLeast(JavaVersion.JAVA11)»«tychoVersion»«ELSE»«tychoVersionJ8»«ENDIF» + «tychoVersion» @@ -263,32 +263,14 @@ class ParentProjectDescriptor extends ProjectDescriptor { plugin-source - «IF config.javaVersion.isAtLeast(JavaVersion.JAVA11)» - - feature-source - - feature-source - - - «ENDIF» + + feature-source + + feature-source + + - «IF !config.javaVersion.isAtLeast(JavaVersion.JAVA11)» - - org.eclipse.tycho.extras - tycho-source-feature-plugin - ${tycho-version} - - - source-feature - package - - source-feature - - - - - «ENDIF» org.eclipse.tycho tycho-p2-plugin @@ -445,69 +427,6 @@ class ParentProjectDescriptor extends ProjectDescriptor { - «IF config.needsTychoBuild && !config.javaVersion.isAtLeast(JavaVersion.JAVA11)» - - - - org.eclipse.tycho - - - tycho-compiler-plugin - - - [0.23.1,) - - - compile - testCompile - - - - - - - - - - org.eclipse.tycho - - - tycho-packaging-plugin - - - [0.23.1,) - - - build-qualifier - build-qualifier-aggregator - validate-id - validate-version - - - - - - - - - - org.eclipse.tycho - - - target-platform-configuration - - - [2.4.0,) - - - target-platform - - - - - - - «ENDIF» @@ -596,6 +515,18 @@ class ParentProjectDescriptor extends ProjectDescriptor { true +««« «FOR x : #['lib','core','extras','maven','xtend','web']» +««« +««« xtext-«x» +««« https://ci.eclipse.org/xtext/job/xtext-«x»/job//lastSuccessfulBuild/artifact/build/maven-repository/ +««« +««« false +««« +««« +««« true +««« +««« +««« «ENDFOR» «ENDIF» @@ -645,6 +576,18 @@ class ParentProjectDescriptor extends ProjectDescriptor { true +««« «FOR x : #['lib','core','extras','maven','xtend','web']» +««« +««« xtext-«x»-p +««« https://ci.eclipse.org/xtext/job/xtext-«x»/job//lastSuccessfulBuild/artifact/build/maven-repository/ +««« +««« false +««« +««« +««« true +««« +««« +««« «ENDFOR» «ENDIF» «IF config.needsTychoBuild && tychoVersion.endsWith("-SNAPSHOT")» diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend index 820e9283ee..11cff61db9 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend @@ -10,7 +10,6 @@ package org.eclipse.xtext.xtext.wizard import org.eclipse.xtend.lib.annotations.Accessors import org.eclipse.xtext.util.JUnitVersion -import org.eclipse.xtext.util.JavaVersion import org.eclipse.xtext.util.Strings import org.eclipse.xtext.xtext.wizard.ecore2xtext.Ecore2XtextGrammarCreator @@ -364,28 +363,6 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor { «IF config.needsTychoBuild» - «IF !config.javaVersion.isAtLeast(JavaVersion.JAVA11)» - - org.eclipse.emf - org.eclipse.emf.mwe2.launch - ${mwe2Version} - - - org.eclipse.xtext - org.eclipse.xtext.common.types - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xtext.generator - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xbase - ${xtextVersion} - - «ENDIF» org.eclipse.xtext xtext-antlr-generator diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WizardConfiguration.java b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WizardConfiguration.java index 69871630bd..247463c6c5 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WizardConfiguration.java +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WizardConfiguration.java @@ -41,7 +41,7 @@ public class WizardConfiguration { private boolean needsGradleWrapper = true; - private JavaVersion javaVersion = JavaVersion.JAVA8; + private JavaVersion javaVersion = JavaVersion.JAVA11; private LanguageServer languageServer = LanguageServer.NONE; 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 fdf46ce53c..250c3e009d 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 @@ -18,7 +18,6 @@ import java.util.Set; import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor; import org.eclipse.xtend2.lib.StringConcatenation; -import org.eclipse.xtext.util.JavaVersion; import org.eclipse.xtext.util.XtextVersion; import org.eclipse.xtext.xbase.lib.CollectionLiterals; import org.eclipse.xtext.xbase.lib.Exceptions; @@ -109,10 +108,6 @@ public String getTychoVersion() { return "2.7.5"; } - public String getTychoVersionJ8() { - return "1.7.0"; - } - private CharSequence loadResource(final String resourcePath) { try { return Resources.toString(this.getClass().getClassLoader().getResource(resourcePath), Charsets.ISO_8859_1); @@ -563,16 +558,8 @@ public PomFile pom() { _builder.newLine(); _builder.append("\t"); _builder.append(""); - { - boolean _isAtLeast = this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA11); - if (_isAtLeast) { - String _tychoVersion = this.getTychoVersion(); - _builder.append(_tychoVersion, "\t"); - } else { - String _tychoVersionJ8 = this.getTychoVersionJ8(); - _builder.append(_tychoVersionJ8, "\t"); - } - } + String _tychoVersion = this.getTychoVersion(); + _builder.append(_tychoVersion, "\t"); _builder.append(""); _builder.newLineIfNotEmpty(); _builder.append("\t"); @@ -739,45 +726,36 @@ public PomFile pom() { _builder.append("\t\t"); _builder.append(""); _builder.newLine(); - { - boolean _isAtLeast_1 = this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA11); - if (_isAtLeast_1) { - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t\t"); - _builder.append("\t"); - _builder.append("feature-source"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t\t"); - _builder.append("\t\t"); - _builder.append("feature-source"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - } - } + _builder.append("\t"); + _builder.append("\t"); + _builder.append("\t\t"); + _builder.append(""); + _builder.newLine(); + _builder.append("\t"); + _builder.append("\t"); + _builder.append("\t\t\t"); + _builder.append("feature-source"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("\t"); + _builder.append("\t\t\t"); + _builder.append(""); + _builder.newLine(); + _builder.append("\t"); + _builder.append("\t"); + _builder.append("\t\t\t\t"); + _builder.append("feature-source"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("\t"); + _builder.append("\t\t\t"); + _builder.append(""); + _builder.newLine(); + _builder.append("\t"); + _builder.append("\t"); + _builder.append("\t\t"); + _builder.append(""); + _builder.newLine(); _builder.append("\t"); _builder.append("\t"); _builder.append("\t"); @@ -787,80 +765,6 @@ public PomFile pom() { _builder.append("\t"); _builder.append(""); _builder.newLine(); - { - boolean _isAtLeast_2 = this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA11); - boolean _not = (!_isAtLeast_2); - if (_not) { - _builder.append("\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("org.eclipse.tycho.extras"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("tycho-source-feature-plugin"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("${tycho-version}"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t\t\t"); - _builder.append("source-feature"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t\t\t"); - _builder.append("package"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t\t\t\t"); - _builder.append("source-feature"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - } - } _builder.append("\t"); _builder.append("\t"); _builder.append(""); @@ -1316,8 +1220,8 @@ public PomFile pom() { _builder.newLine(); { boolean _needsTychoBuild_3 = this.getConfig().needsTychoBuild(); - boolean _not_1 = (!_needsTychoBuild_3); - if (_not_1) { + boolean _not = (!_needsTychoBuild_3); + if (_not) { _builder.append("\t\t\t"); _builder.append(""); _builder.newLine(); @@ -1441,248 +1345,6 @@ public PomFile pom() { _builder.append("\t\t\t\t\t\t\t"); _builder.append(""); _builder.newLine(); - { - if ((this.getConfig().needsTychoBuild() && (!this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA11)))) { - _builder.append("\t\t\t\t\t\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("org.eclipse.tycho"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("tycho-compiler-plugin"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("[0.23.1,)"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("compile"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("testCompile"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("org.eclipse.tycho"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("tycho-packaging-plugin"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("[0.23.1,)"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("build-qualifier"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("build-qualifier-aggregator"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("validate-id"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("validate-version"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("org.eclipse.tycho"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("target-platform-configuration"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("[2.4.0,)"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t\t"); - _builder.append("target-platform"); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t\t\t\t\t"); - _builder.append(""); - _builder.newLine(); - } - } _builder.append("\t\t\t\t\t\t"); _builder.append(""); _builder.newLine(); diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java index 5ca8efad8b..f9f8b143ad 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java @@ -18,7 +18,6 @@ import org.eclipse.xtend.lib.annotations.Accessors; import org.eclipse.xtend2.lib.StringConcatenation; import org.eclipse.xtext.util.JUnitVersion; -import org.eclipse.xtext.util.JavaVersion; import org.eclipse.xtext.util.Strings; import org.eclipse.xtext.xbase.lib.CollectionLiterals; import org.eclipse.xtext.xbase.lib.Functions.Function1; @@ -839,104 +838,6 @@ public PomFile pom() { _builder.append("\t\t\t"); _builder.append(""); _builder.newLine(); - { - boolean _isAtLeast = this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA11); - boolean _not = (!_isAtLeast); - if (_not) { - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("org.eclipse.emf"); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("org.eclipse.emf.mwe2.launch"); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("${mwe2Version}"); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("org.eclipse.xtext"); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("org.eclipse.xtext.common.types"); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("${xtextVersion}"); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("org.eclipse.xtext"); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("org.eclipse.xtext.xtext.generator"); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("${xtextVersion}"); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("org.eclipse.xtext"); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("org.eclipse.xtext.xbase"); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append("\t"); - _builder.append("${xtextVersion}"); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append(""); - _builder.newLine(); - } - } _builder.append("\t\t\t"); _builder.append("\t"); _builder.append(""); @@ -1099,8 +1000,8 @@ public PomFile pom() { _builder.newLine(); { boolean _isEclipsePluginProject_1 = this.isEclipsePluginProject(); - boolean _not_1 = (!_isEclipsePluginProject_1); - if (_not_1) { + boolean _not = (!_isEclipsePluginProject_1); + if (_not) { _builder.append("\t\t"); _builder.append(""); _builder.newLine(); diff --git a/org.eclipse.xtext/.classpath b/org.eclipse.xtext/.classpath index 7fc453a7f5..0e25c2576b 100644 --- a/org.eclipse.xtext/.classpath +++ b/org.eclipse.xtext/.classpath @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.xtext/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext/.settings/org.eclipse.jdt.core.prefs index ea7194f4a9..2ce6e606f1 100644 --- a/org.eclipse.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.xtext/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled @@ -15,7 +15,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF index e0cb5fc2a4..2b29ed033f 100644 --- a/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.29.0.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse Xtext Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.xtext, org.eclipse.xtext.build;x-friends:="org.eclipse.xtext.testing, org.eclipse.xtext.ide, diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext/META-INF/MANIFEST.MF_gen index 576b599d8d..ed2582b724 100644 --- a/org.eclipse.xtext/META-INF/MANIFEST.MF_gen +++ b/org.eclipse.xtext/META-INF/MANIFEST.MF_gen @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.xtext Bundle-SymbolicName: org.eclipse.xtext Bundle-Version: 0.0.1 -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext Require-Bundle: org.eclipse.xtext, diff --git a/releng/pom.xml b/releng/pom.xml index aaa7d3643d..f2d149fc15 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -9,7 +9,7 @@ ISO-8859-1 - 1.7.0 + 2.7.5 ${basedir}/.. https://ci.eclipse.org/xtext master diff --git a/releng/releng-target/xtext-core.target.target b/releng/releng-target/xtext-core.target.target index 0bd795dee7..0f930248a9 100644 --- a/releng/releng-target/xtext-core.target.target +++ b/releng/releng-target/xtext-core.target.target @@ -15,7 +15,7 @@ - +