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

Use mwe2version in POMs and target platform, instead of hard-coding

Browse source 
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
This commit is contained in:
Lorenzo Bettini 2019-11-26 16:12:48 +01:00
parent d9a45cfd05
commit 533b8dd988
21 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml vendored
View file

@ -39,7 +39,7 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>2.11.1</version>
<version>${mwe2Version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>

1
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml vendored
View file

@ -8,6 +8,7 @@
<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.11.1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

1
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenApp/org.xtext.example.lsMavenApp.parent/pom.xml vendored
View file

@ -8,6 +8,7 @@
<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.11.1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

1
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenFatjar/org.xtext.example.lsMavenFatjar.parent/pom.xml vendored
View file

@ -8,6 +8,7 @@
<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.11.1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/org.xtext.example.lsMavenTychoApp/pom.xml vendored
View file

@ -39,7 +39,7 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>2.11.1</version>
<version>${mwe2Version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>

1
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/pom.xml vendored
View file

@ -8,6 +8,7 @@
<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.11.1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar/pom.xml vendored
View file

@ -39,7 +39,7 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>2.11.1</version>
<version>${mwe2Version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>

1
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/pom.xml vendored
View file

@ -8,6 +8,7 @@
<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.11.1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml vendored
View file

@ -39,7 +39,7 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>2.11.1</version>
<version>${mwe2Version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>

1
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml vendored
View file

@ -8,6 +8,7 @@
<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.11.1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

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

@ -39,7 +39,7 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>2.11.1</version>
<version>${mwe2Version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>

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

@ -8,6 +8,7 @@
<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.11.1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>9</maven.compiler.source>
<maven.compiler.target>9</maven.compiler.target>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/pom.xml vendored
View file

@ -39,7 +39,7 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>2.11.1</version>
<version>${mwe2Version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>

1
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml vendored
View file

@ -8,6 +8,7 @@
<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.11.1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

1
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/pom.xml vendored
View file

@ -8,6 +8,7 @@
<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.11.1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

1
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
View file

@ -203,6 +203,7 @@ class ParentProjectDescriptor extends ProjectDescriptor {
buildSection = '''
<properties>
<xtextVersion>«config.xtextVersion»</xtextVersion>
<mwe2Version>«config.xtextVersion.mweVersion»</mwe2Version>
<project.build.sourceEncoding>«config.encoding»</project.build.sourceEncoding>
<maven.compiler.source>«javaVersion»</maven.compiler.source>
<maven.compiler.target>«javaVersion»</maven.compiler.target>

2
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
View file

@ -371,7 +371,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>«config.xtextVersion.mweVersion»</version>
<version>${mwe2Version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>

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

@ -68,7 +68,7 @@ class TargetPlatformProject extends ProjectDescriptor {
</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"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.1/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/«config.xtextVersion.mweVersion»/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>

6
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
View file

@ -539,6 +539,12 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("</xtextVersion>");
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.append("<mwe2Version>");
String _mweVersion = this.getConfig().getXtextVersion().getMweVersion();
_builder.append(_mweVersion, "\t");
_builder.append("</mwe2Version>");
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.append("<project.build.sourceEncoding>");
Charset _encoding = this.getConfig().getEncoding();
_builder.append(_encoding, "\t");

7
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java
View file

@ -878,11 +878,8 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t");
_builder.append("<version>");
String _mweVersion = this.getConfig().getXtextVersion().getMweVersion();
_builder.append(_mweVersion, "\t\t\t\t\t");
_builder.append("</version>");
_builder.newLineIfNotEmpty();
_builder.append("<version>${mwe2Version}</version>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t");
_builder.append("</dependency>");

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

@ -141,8 +141,11 @@ public class TargetPlatformProject extends ProjectDescriptor {
_builder.append("<unit id=\"org.eclipse.emf.mwe2.launcher.feature.group\" version=\"0.0.0\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<repository location=\"https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.1/\"/>");
_builder.newLine();
_builder.append("<repository location=\"https://download.eclipse.org/modeling/emft/mwe/updates/releases/");
String _mweVersion = this.getConfig().getXtextVersion().getMweVersion();
_builder.append(_mweVersion, "\t\t\t");
_builder.append("/\"/>");
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("</location>");
_builder.newLine();