mirror of
https://github.com/sigmasternchen/xtext-core
synced 2025-03-16 00:38:56 +00:00
Merge pull request #1028 from eclipse/cd_mwe210wizard
[eclipse/xtext#1283] switched to MWE 2.10 in wizard
This commit is contained in:
Karsten Thoms
GitHub
commit
7823e915a9
17 changed files with 33 additions and 19 deletions
org.eclipse.xtext.tests/testdata/wizard-expectations
org.xtext.example.full/org.xtext.example.full.parent
org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent
org.xtext.example.lsMavenTychoApp.target
org.xtext.example.lsMavenTychoApp
org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent
org.xtext.example.lsMavenTychoFatjar.target
org.xtext.example.lsMavenTychoFatjar
org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent
org.xtext.example.mavenTycho.target
org.xtext.example.mavenTycho
org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent
org.xtext.example.mavenTychoJ9.target
org.xtext.example.mavenTychoJ9
org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent
org.xtext.example.mavenTychoP2.target
org.xtext.example.mavenTychoP2
org.eclipse.xtext.util
org.eclipse.xtext.xtext.wizard
src/org/eclipse/xtext/xtext/wizard
xtend-gen/org/eclipse/xtext/xtext/wizard
releng/releng-target
|
|
@ -12,7 +12,7 @@
|
|||
</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="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201901281525/"/>
|
||||
<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.10.0/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
|
||||
<version>2.10.0.M2</version>
|
||||
<version>2.10.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
</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="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201901281525/"/>
|
||||
<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.10.0/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
|
||||
<version>2.10.0.M2</version>
|
||||
<version>2.10.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
</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="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201901281525/"/>
|
||||
<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.10.0/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
|
||||
<version>2.10.0.M2</version>
|
||||
<version>2.10.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
</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="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201901281525/"/>
|
||||
<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.10.0/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
|
||||
<version>2.10.0.M2</version>
|
||||
<version>2.10.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
</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="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201901281525/"/>
|
||||
<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.10.0/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
|
||||
<version>2.10.0.M2</version>
|
||||
<version>2.10.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
</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="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201901281525/"/>
|
||||
<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.10.0/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
|
||||
<version>2.10.0.M2</version>
|
||||
<version>2.10.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2015, 2019 itemis AG (http://www.itemis.eu) and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*******************************************************************************/
|
||||
package org.eclipse.xtext.util
|
||||
|
||||
import java.io.IOException
|
||||
|
|
@ -27,7 +34,7 @@ class XtextVersion {
|
|||
* @noreference
|
||||
*/
|
||||
def getMweVersion() {
|
||||
'2.10.0.M2'
|
||||
'2.10.0'
|
||||
}
|
||||
|
||||
def getAntlrGeneratorVersion() {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
/**
|
||||
* Copyright (c) 2015, 2019 itemis AG (http://www.itemis.eu) and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*/
|
||||
package org.eclipse.xtext.util;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
|
|
@ -51,7 +58,7 @@ public class XtextVersion {
|
|||
* @noreference
|
||||
*/
|
||||
public String getMweVersion() {
|
||||
return "2.10.0.M2";
|
||||
return "2.10.0";
|
||||
}
|
||||
|
||||
public String getAntlrGeneratorVersion() {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2015, 2018 itemis AG (http://www.itemis.eu) and others.
|
||||
* Copyright (c) 2015, 2019 itemis AG (http://www.itemis.eu) and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
|
|
@ -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="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201901281525/"/>
|
||||
<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.10.0/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2015, 2018 itemis AG (http://www.itemis.eu) and others.
|
||||
* Copyright (c) 2015, 2019 itemis AG (http://www.itemis.eu) and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
|
|
@ -126,7 +126,7 @@ public class TargetPlatformProject extends ProjectDescriptor {
|
|||
_builder.newLine();
|
||||
_builder.append("<unit id=\"org.eclipse.emf.mwe2.launcher.feature.group\" version=\"0.0.0\"/>");
|
||||
_builder.newLine();
|
||||
_builder.append("<repository location=\"http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201901281525/\"/>");
|
||||
_builder.append("<repository location=\"http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.10.0/\"/>");
|
||||
_builder.newLine();
|
||||
_builder.append("</location>");
|
||||
_builder.newLine();
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
|
||||
<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201901281525"/>
|
||||
<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.10.0"/>
|
||||
<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="0.0.0"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
|
||||
|
|
|
|||
Loading…
Reference in a new issue