sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed platform targetplatform badness with Java 11 in wizard

Browse source 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2020-10-18 10:12:31 +02:00
parent 381f995130
commit 12e396a62a
34 changed files with 133 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java
View file

@ -140,7 +140,7 @@ public class CliWizardIntegrationTest {
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(true);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("org.xtext.example.mavenTychoJ9");
project.setBaseName("org.xtext.example.mavenTychoJ11");
project.setPreferredBuildSystem(BuildSystem.MAVEN);
project.setSourceLayout(SourceLayout.PLAIN);
project.setProjectLayout(ProjectLayout.HIERARCHICAL);
@ -149,7 +149,7 @@ public class CliWizardIntegrationTest {
project.getUiProject().getTestProject().setEnabled(true);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(true);
project.setJavaVersion(JavaVersion.JAVA9);
project.setJavaVersion(JavaVersion.JAVA11);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("org.xtext.example.gradle");
project.setPreferredBuildSystem(BuildSystem.GRADLE);

3
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/org.xtext.example.full.target.target vendored
View file

@ -8,7 +8,8 @@
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2020-12"/>
<!-- newer Eclipse versions need Java 11 to run the Maven Tycho build -->
<repository location="https://download.eclipse.org/releases/2020-06"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>

3
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/org.xtext.example.lsMavenTychoApp.target/org.xtext.example.lsMavenTychoApp.target.target vendored
View file

@ -8,7 +8,8 @@
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2020-12"/>
<!-- newer Eclipse versions need Java 11 to run the Maven Tycho build -->
<repository location="https://download.eclipse.org/releases/2020-06"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>

3
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.target/org.xtext.example.lsMavenTychoFatjar.target.target vendored
View file

@ -8,7 +8,8 @@
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2020-12"/>
<!-- newer Eclipse versions need Java 11 to run the Maven Tycho build -->
<repository location="https://download.eclipse.org/releases/2020-06"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>

3
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/org.xtext.example.mavenTycho.target.target vendored
View file

@ -8,7 +8,8 @@
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2020-12"/>
<!-- newer Eclipse versions need Java 11 to run the Maven Tycho build -->
<repository location="https://download.eclipse.org/releases/2020-06"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>

12
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.ide/META-INF/MANIFEST.MF vendored Normal file
View file

@ -0,0 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.xtext.example.mavenTychoJ11.ide
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.mavenTychoJ11.ide; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.mavenTychoJ11,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide
Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.xtext.example.mavenTychoJ11.ide

0
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.ide/build.properties → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.ide/build.properties vendored
View file

6
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.ui/pom.xml → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.ide/pom.xml vendored
View file

@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.xtext.example.mavenTychoJ9</groupId>
<artifactId>org.xtext.example.mavenTychoJ9.parent</artifactId>
<groupId>org.xtext.example.mavenTychoJ11</groupId>
<artifactId>org.xtext.example.mavenTychoJ11.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.xtext.example.mavenTychoJ9.ui</artifactId>
<artifactId>org.xtext.example.mavenTychoJ11.ide</artifactId>
<packaging>eclipse-plugin</packaging>
<build>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.target/org.xtext.example.mavenTychoJ9.target.target → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.target/org.xtext.example.mavenTychoJ11.target.target vendored
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="org.xtext.example.mavenTychoJ9.target" sequenceNumber="1">
<target name="org.xtext.example.mavenTychoJ11.target" sequenceNumber="1">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>

6
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.target/pom.xml → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.target/pom.xml vendored
View file

@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.xtext.example.mavenTychoJ9</groupId>
<artifactId>org.xtext.example.mavenTychoJ9.parent</artifactId>
<groupId>org.xtext.example.mavenTychoJ11</groupId>
<artifactId>org.xtext.example.mavenTychoJ11.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.xtext.example.mavenTychoJ9.target</artifactId>
<artifactId>org.xtext.example.mavenTychoJ11.target</artifactId>
<packaging>eclipse-target-definition</packaging>

13
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.tests/META-INF/MANIFEST.MF vendored Normal file
View file

@ -0,0 +1,13 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.xtext.example.mavenTychoJ11.tests
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.mavenTychoJ11.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.mavenTychoJ11,
org.junit;bundle-version="4.12.0",
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing
Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.xtext.example.mavenTychoJ11.tests

0
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.tests/build.properties → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.tests/build.properties vendored
View file

6
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.tests/pom.xml → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.tests/pom.xml vendored
View file

@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.xtext.example.mavenTychoJ9</groupId>
<artifactId>org.xtext.example.mavenTychoJ9.parent</artifactId>
<groupId>org.xtext.example.mavenTychoJ11</groupId>
<artifactId>org.xtext.example.mavenTychoJ11.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.xtext.example.mavenTychoJ9.tests</artifactId>
<artifactId>org.xtext.example.mavenTychoJ11.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
<build>

15
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.ui.tests/META-INF/MANIFEST.MF vendored Normal file
View file

@ -0,0 +1,15 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.xtext.example.mavenTychoJ11.ui.tests
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.mavenTychoJ11.ui.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.mavenTychoJ11.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: org.xtext.example.mavenTychoJ11.ui.tests

0
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.ui.tests/build.properties → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.ui.tests/build.properties vendored
View file

6
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.ui.tests/pom.xml → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.ui.tests/pom.xml vendored
View file

@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.xtext.example.mavenTychoJ9</groupId>
<artifactId>org.xtext.example.mavenTychoJ9.parent</artifactId>
<groupId>org.xtext.example.mavenTychoJ11</groupId>
<artifactId>org.xtext.example.mavenTychoJ11.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.xtext.example.mavenTychoJ9.ui.tests</artifactId>
<artifactId>org.xtext.example.mavenTychoJ11.ui.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
<build>

12
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.ui/META-INF/MANIFEST.MF → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.ui/META-INF/MANIFEST.MF vendored
View file

@ -1,17 +1,17 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.xtext.example.mavenTychoJ9.ui
Bundle-Name: org.xtext.example.mavenTychoJ11.ui
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.mavenTychoJ9.ui; singleton:=true
Bundle-SymbolicName: org.xtext.example.mavenTychoJ11.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.mavenTychoJ9,
org.xtext.example.mavenTychoJ9.ide,
Require-Bundle: org.xtext.example.mavenTychoJ11,
org.xtext.example.mavenTychoJ11.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-9
Automatic-Module-Name: org.xtext.example.mavenTychoJ9.ui
Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.xtext.example.mavenTychoJ11.ui

0
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.ui/build.properties → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.ui/build.properties vendored
View file

6
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.ide/pom.xml → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.ui/pom.xml vendored
View file

@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.xtext.example.mavenTychoJ9</groupId>
<artifactId>org.xtext.example.mavenTychoJ9.parent</artifactId>
<groupId>org.xtext.example.mavenTychoJ11</groupId>
<artifactId>org.xtext.example.mavenTychoJ11.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.xtext.example.mavenTychoJ9.ide</artifactId>
<artifactId>org.xtext.example.mavenTychoJ11.ui</artifactId>
<packaging>eclipse-plugin</packaging>
<build>

10
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.web/pom.xml → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11.web/pom.xml vendored
View file

@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.xtext.example.mavenTychoJ9</groupId>
<artifactId>org.xtext.example.mavenTychoJ9.parent</artifactId>
<groupId>org.xtext.example.mavenTychoJ11</groupId>
<artifactId>org.xtext.example.mavenTychoJ11.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.xtext.example.mavenTychoJ9.web</artifactId>
<artifactId>org.xtext.example.mavenTychoJ11.web</artifactId>
<packaging>war</packaging>
<build>
@ -75,12 +75,12 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>org.xtext.example.mavenTychoJ9</artifactId>
<artifactId>org.xtext.example.mavenTychoJ11</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>org.xtext.example.mavenTychoJ9.ide</artifactId>
<artifactId>org.xtext.example.mavenTychoJ11.ide</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

6
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.xtext.example.mavenTychoJ9"/>
<listEntry value="/org.xtext.example.mavenTychoJ11"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
@ -10,9 +10,9 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ9.parent&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ9&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ9.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ9.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ9.web&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ9.target&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ9.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ9.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ9.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ9.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ11.parent&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ11&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ11.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ11.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ11.web&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ11.target&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ11.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ11.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ11.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.xtext.example.mavenTychoJ11.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="org.xtext.example.mydsl.GenerateMyDsl"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.xtext.example.mavenTychoJ9"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.xtext.example.mavenTychoJ11"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
</launchConfiguration>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9/.launch/Launch Runtime Eclipse.launch → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11/.launch/Launch Runtime Eclipse.launch vendored
View file

@ -4,7 +4,7 @@
<booleanAttribute key="askclear" value="true"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bad_container_name" value="/org.xtext.example.mavenTychoJ9/.launch/"/>
<stringAttribute key="bad_container_name" value="/org.xtext.example.mavenTychoJ11/.launch/"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>

8
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9/META-INF/MANIFEST.MF → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11/META-INF/MANIFEST.MF vendored
View file

@ -1,12 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.xtext.example.mavenTychoJ9
Bundle-Name: org.xtext.example.mavenTychoJ11
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.mavenTychoJ9; singleton:=true
Bundle-SymbolicName: org.xtext.example.mavenTychoJ11; 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-9
Automatic-Module-Name: org.xtext.example.mavenTychoJ9
Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.xtext.example.mavenTychoJ11

0
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9/build.properties → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11/build.properties vendored
View file

18
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9/pom.xml → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11/pom.xml vendored
View file

@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.xtext.example.mavenTychoJ9</groupId>
<artifactId>org.xtext.example.mavenTychoJ9.parent</artifactId>
<groupId>org.xtext.example.mavenTychoJ11</groupId>
<artifactId>org.xtext.example.mavenTychoJ11.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.xtext.example.mavenTychoJ9</artifactId>
<artifactId>org.xtext.example.mavenTychoJ11</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
@ -74,37 +74,37 @@
<configuration>
<filesets combine.children="append">
<fileset>
<directory>${basedir}/../org.xtext.example.mavenTychoJ9/src-gen/</directory>
<directory>${basedir}/../org.xtext.example.mavenTychoJ11/src-gen/</directory>
<includes>
<include>**/*</include>
</includes>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.mavenTychoJ9.tests/src-gen/</directory>
<directory>${basedir}/../org.xtext.example.mavenTychoJ11.tests/src-gen/</directory>
<includes>
<include>**/*</include>
</includes>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.mavenTychoJ9.ide/src-gen/</directory>
<directory>${basedir}/../org.xtext.example.mavenTychoJ11.ide/src-gen/</directory>
<includes>
<include>**/*</include>
</includes>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.mavenTychoJ9.ui/src-gen/</directory>
<directory>${basedir}/../org.xtext.example.mavenTychoJ11.ui/src-gen/</directory>
<includes>
<include>**/*</include>
</includes>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.mavenTychoJ9.ui.tests/src-gen/</directory>
<directory>${basedir}/../org.xtext.example.mavenTychoJ11.ui.tests/src-gen/</directory>
<includes>
<include>**/*</include>
</includes>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.mavenTychoJ9.web/src-gen/</directory>
<directory>${basedir}/../org.xtext.example.mavenTychoJ11.web/src-gen/</directory>
<includes>
<include>**/*</include>
</includes>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 vendored
View file

@ -10,7 +10,7 @@ Workflow {
component = XtextGenerator {
configuration = {
project = StandardProjectConfig {
baseName = "org.xtext.example.mavenTychoJ9"
baseName = "org.xtext.example.mavenTychoJ11"
rootPath = rootPath
runtimeTest = {
enabled = true

0
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9/src/org/xtext/example/mydsl/MyDsl.xtext → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/org.xtext.example.mavenTychoJ11/src/org/xtext/example/mydsl/MyDsl.xtext vendored
View file

26
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/pom.xml → org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ11/org.xtext.example.mavenTychoJ11.parent/pom.xml vendored
View file

@ -1,17 +1,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.xtext.example.mavenTychoJ9</groupId>
<groupId>org.xtext.example.mavenTychoJ11</groupId>
<version>1.0.0-SNAPSHOT</version>
<artifactId>org.xtext.example.mavenTychoJ9.parent</artifactId>
<artifactId>org.xtext.example.mavenTychoJ11.parent</artifactId>
<packaging>pom</packaging>
<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.11.3</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>9</maven.compiler.source>
<maven.compiler.target>9</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>1.7.0</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
@ -21,13 +21,13 @@
<additionalTestArguments></additionalTestArguments>
</properties>
<modules>
<module>org.xtext.example.mavenTychoJ9</module>
<module>org.xtext.example.mavenTychoJ9.ide</module>
<module>org.xtext.example.mavenTychoJ9.ui</module>
<module>org.xtext.example.mavenTychoJ9.web</module>
<module>org.xtext.example.mavenTychoJ9.target</module>
<module>org.xtext.example.mavenTychoJ9.tests</module>
<module>org.xtext.example.mavenTychoJ9.ui.tests</module>
<module>org.xtext.example.mavenTychoJ11</module>
<module>org.xtext.example.mavenTychoJ11.ide</module>
<module>org.xtext.example.mavenTychoJ11.ui</module>
<module>org.xtext.example.mavenTychoJ11.web</module>
<module>org.xtext.example.mavenTychoJ11.target</module>
<module>org.xtext.example.mavenTychoJ11.tests</module>
<module>org.xtext.example.mavenTychoJ11.ui.tests</module>
</modules>
<dependencyManagement>
<dependencies>
@ -55,8 +55,8 @@
<configuration>
<target>
<artifact>
<groupId>org.xtext.example.mavenTychoJ9</groupId>
<artifactId>org.xtext.example.mavenTychoJ9.target</artifactId>
<groupId>org.xtext.example.mavenTychoJ11</groupId>
<artifactId>org.xtext.example.mavenTychoJ11.target</artifactId>
<version>${project.version}</version>
</artifact>
</target>

12
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.ide/META-INF/MANIFEST.MF vendored
View file

@ -1,12 +0,0 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.xtext.example.mavenTychoJ9.ide
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.mavenTychoJ9.ide; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.mavenTychoJ9,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide
Bundle-RequiredExecutionEnvironment: JavaSE-9
Automatic-Module-Name: org.xtext.example.mavenTychoJ9.ide

13
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.tests/META-INF/MANIFEST.MF vendored
View file

@ -1,13 +0,0 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.xtext.example.mavenTychoJ9.tests
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.mavenTychoJ9.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.mavenTychoJ9,
org.junit;bundle-version="4.12.0",
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing
Bundle-RequiredExecutionEnvironment: JavaSE-9
Automatic-Module-Name: org.xtext.example.mavenTychoJ9.tests

15
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.ui.tests/META-INF/MANIFEST.MF vendored
View file

@ -1,15 +0,0 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.xtext.example.mavenTychoJ9.ui.tests
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.xtext.example.mavenTychoJ9.ui.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.mavenTychoJ9.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-9
Automatic-Module-Name: org.xtext.example.mavenTychoJ9.ui.tests

3
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/org.xtext.example.mavenTychoP2.target.target vendored
View file

@ -8,7 +8,8 @@
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2020-12"/>
<!-- newer Eclipse versions need Java 11 to run the Maven Tycho build -->
<repository location="https://download.eclipse.org/releases/2020-06"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>

8
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
View file

@ -10,6 +10,7 @@ package org.eclipse.xtext.xtext.wizard
import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
import org.eclipse.xtext.util.JUnitVersion
import org.eclipse.xtext.util.JavaVersion
@FinalFieldsConstructor
class TargetPlatformProject extends ProjectDescriptor {
@ -60,7 +61,12 @@ class TargetPlatformProject extends ProjectDescriptor {
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2020-12"/>
«IF config.javaVersion.isAtLeast(JavaVersion.JAVA11)»
<repository location="https://download.eclipse.org/releases/2020-12"/>
«ELSE»
<!-- newer Eclipse versions need Java 11 to run the Maven Tycho build -->
<repository location="https://download.eclipse.org/releases/2020-06"/>
«ENDIF»
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>

19
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
View file

@ -16,6 +16,7 @@ import java.util.Set;
import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor;
import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.util.JUnitVersion;
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.ObjectExtensions;
@ -115,9 +116,21 @@ public class TargetPlatformProject extends ProjectDescriptor {
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.eclipse.emf.sdk.feature.group\" version=\"0.0.0\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<repository location=\"https://download.eclipse.org/releases/2020-12\"/>");
_builder.newLine();
{
boolean _isAtLeast = this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA11);
if (_isAtLeast) {
_builder.append("\t\t\t");
_builder.append("<repository location=\"https://download.eclipse.org/releases/2020-12\"/>");
_builder.newLine();
} else {
_builder.append("\t\t\t");
_builder.append("<!-- newer Eclipse versions need Java 11 to run the Maven Tycho build -->");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<repository location=\"https://download.eclipse.org/releases/2020-06\"/>");
_builder.newLine();
}
}
_builder.append("\t\t");
_builder.append("</location>");
_builder.newLine();