Use released Xtext 2.21
Change-Id: I59ee62ab1512306691aa48c9051dc66fc3c6779b
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
diff --git a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
index 2627da6..9c4bdd8 100644
--- a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
+++ b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
@@ -140,11 +140,11 @@
<setupTask
xsi:type="setup:VariableTask"
name="mwe2.site"
- value="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.1"/>
+ value="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.2"/>
<setupTask
xsi:type="setup:VariableTask"
name="xtext.site"
- value="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.20.0"/>
+ value="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.21.0"/>
<setupTask
xsi:type="setup:VariableTask"
name="api.baseline.version"
@@ -594,7 +594,7 @@
<repositoryList
name="2020-03">
<repository
- url="https://download.eclipse.org/staging/2020-03/"/>
+ url="https://download.eclipse.org/releases/2020-03/"/>
<repository
url="https://download.eclipse.org/cbi/updates/license"/>
<repository
@@ -783,7 +783,7 @@
licenseConfirmationDisabled="true">
<requirement
name="org.eclipse.xtext.sdk.feature.group"
- versionRange="[2.20.0,2.21.0)"/>
+ versionRange="[2.21.0,2.22.0)"/>
<requirement
name="de.itemis.xtext.antlr.feature.feature.group"/>
<repository
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2020-03-rap.target b/devtools/org.eclipse.emf.parsley.targetplatform/2020-03-rap.target
new file mode 100644
index 0000000..6866143
--- /dev/null
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/2020-03-rap.target
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="2020-03-rap" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rap.sdk.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rap.examples.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xtext.xbase.lib.feature.group" version="0.0.0"/>
+<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+<unit id="javax.inject" version="0.0.0"/>
+<unit id="org.apache.log4j" version="0.0.0"/>
+<unit id="com.google.inject" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.rap.edit.ui.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.rap.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.rap.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.net4j.db.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.net4j.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.net4j.util.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.server.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.server.db.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.databinding.edit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.query.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/2020-03/"/>
+</location>
+</locations>
+</target>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2020-03.target b/devtools/org.eclipse.emf.parsley.targetplatform/2020-03.target
new file mode 100644
index 0000000..72e97d9
--- /dev/null
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/2020-03.target
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="2020-03" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="de.itemis.xtext.antlr.feature.feature.group" version="2.1.1.v201405091103"/>
+<repository location="http://download.itemis.com/updates/releases/2.1.1/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.query.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.forms.feature.group" version="0.0.0"/>
+<unit id="org.hamcrest.library" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.generator.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/releases/2020-03/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.21.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" 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.2"/>
+</location>
+</locations>
+</target>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2019-12-staging-rap.target b/devtools/org.eclipse.emf.parsley.targetplatform/old/2019-12-staging-rap.target
similarity index 100%
rename from devtools/org.eclipse.emf.parsley.targetplatform/2019-12-staging-rap.target
rename to devtools/org.eclipse.emf.parsley.targetplatform/old/2019-12-staging-rap.target
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2019-12-staging.target b/devtools/org.eclipse.emf.parsley.targetplatform/old/2019-12-staging.target
similarity index 100%
rename from devtools/org.eclipse.emf.parsley.targetplatform/2019-12-staging.target
rename to devtools/org.eclipse.emf.parsley.targetplatform/old/2019-12-staging.target
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml b/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml
index ee35b57..7b51067 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml
@@ -27,11 +27,11 @@
<handler
class="org.eclipse.emf.parsley.dsl.ui.EmfParsleyDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
commandId="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.validate">
- <activeWhen>
- <reference
+ <activeWhen>
+ <reference
definitionId="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.Editor.opened">
- </reference>
- </activeWhen>
+ </reference>
+ </activeWhen>
</handler>
<!-- copy qualified name -->
<handler
@@ -120,38 +120,38 @@
</extension>
<extension
point="org.eclipse.ui.commands">
- <command
+ <command
description="Trigger expensive validation"
id="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.validate"
name="Validate">
- </command>
- <!-- copy qualified name -->
- <command
+ </command>
+ <!-- copy qualified name -->
+ <command
id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
categoryId="org.eclipse.ui.category.edit"
description="Copy the qualified name for the selected element"
name="Copy Qualified Name">
- </command>
- <command
+ </command>
+ <command
id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
categoryId="org.eclipse.ui.category.edit"
description="Copy the qualified name for the selected element"
name="Copy Qualified Name">
- </command>
+ </command>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution
locationURI="popup:#TextEditorContext?after=group.edit">
- <command
- commandId="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.validate"
- style="push"
- tooltip="Trigger expensive validation">
- <visibleWhen checkEnabled="false">
- <reference
- definitionId="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.Editor.opened">
- </reference>
- </visibleWhen>
- </command>
+ <command
+ commandId="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.validate"
+ style="push"
+ tooltip="Trigger expensive validation">
+ <visibleWhen checkEnabled="false">
+ <reference
+ definitionId="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.Editor.opened">
+ </reference>
+ </visibleWhen>
+ </command>
</menuContribution>
<!-- copy qualified name -->
<menuContribution locationURI="popup:#TextEditorContext?after=copy">
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml_gen b/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml_gen
index 0f76472..a62fc18 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml_gen
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml_gen
@@ -27,11 +27,11 @@
<handler
class="org.eclipse.emf.parsley.dsl.ui.EmfParsleyDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
commandId="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.validate">
- <activeWhen>
- <reference
+ <activeWhen>
+ <reference
definitionId="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.Editor.opened">
- </reference>
- </activeWhen>
+ </reference>
+ </activeWhen>
</handler>
<!-- copy qualified name -->
<handler
@@ -120,38 +120,38 @@
</extension>
<extension
point="org.eclipse.ui.commands">
- <command
+ <command
description="Trigger expensive validation"
id="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.validate"
name="Validate">
- </command>
- <!-- copy qualified name -->
- <command
+ </command>
+ <!-- copy qualified name -->
+ <command
id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
categoryId="org.eclipse.ui.category.edit"
description="Copy the qualified name for the selected element"
name="Copy Qualified Name">
- </command>
- <command
+ </command>
+ <command
id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
categoryId="org.eclipse.ui.category.edit"
description="Copy the qualified name for the selected element"
name="Copy Qualified Name">
- </command>
+ </command>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution
locationURI="popup:#TextEditorContext?after=group.edit">
- <command
- commandId="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.validate"
- style="push"
- tooltip="Trigger expensive validation">
- <visibleWhen checkEnabled="false">
- <reference
- definitionId="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.Editor.opened">
- </reference>
- </visibleWhen>
- </command>
+ <command
+ commandId="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.validate"
+ style="push"
+ tooltip="Trigger expensive validation">
+ <visibleWhen checkEnabled="false">
+ <reference
+ definitionId="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.Editor.opened">
+ </reference>
+ </visibleWhen>
+ </command>
</menuContribution>
<!-- copy qualified name -->
<menuContribution locationURI="popup:#TextEditorContext?after=copy">
diff --git a/dsl/org.eclipse.emf.parsley.dsl/plugin.xml b/dsl/org.eclipse.emf.parsley.dsl/plugin.xml
index 1e0e985..9aaa723 100644
--- a/dsl/org.eclipse.emf.parsley.dsl/plugin.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl/plugin.xml
@@ -2,7 +2,7 @@
<?eclipse version="3.0"?>
<plugin>
<extension point="org.eclipse.emf.ecore.generated_package">
- <package
+ <package
uri = "http://www.eclipse.org/emf/parsley/dsl/EmfParsleyDsl"
class = "org.eclipse.emf.parsley.dsl.model.ModelPackage"
genModel = "model/generated/EmfParsleyDsl.genmodel" />
diff --git a/dsl/org.eclipse.emf.parsley.dsl/plugin.xml_gen b/dsl/org.eclipse.emf.parsley.dsl/plugin.xml_gen
index 1e0e985..9aaa723 100644
--- a/dsl/org.eclipse.emf.parsley.dsl/plugin.xml_gen
+++ b/dsl/org.eclipse.emf.parsley.dsl/plugin.xml_gen
@@ -2,7 +2,7 @@
<?eclipse version="3.0"?>
<plugin>
<extension point="org.eclipse.emf.ecore.generated_package">
- <package
+ <package
uri = "http://www.eclipse.org/emf/parsley/dsl/EmfParsleyDsl"
class = "org.eclipse.emf.parsley.dsl.model.ModelPackage"
genModel = "model/generated/EmfParsleyDsl.genmodel" />
diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
index df0770b..64197b4 100644
--- a/releng/org.eclipse.emf.parsley.parent/pom.xml
+++ b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -57,7 +57,7 @@
</prerequisites>
<properties>
- <tycho-version>1.5.1</tycho-version>
+ <tycho-version>1.6.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
@@ -66,9 +66,9 @@
<findbugs-version>3.0.5</findbugs-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <xtext-version>2.21.0-SNAPSHOT</xtext-version>
+ <xtext-version>2.21.0</xtext-version>
<xtextVersion>${xtext-version}</xtextVersion>
- <mwe2Version>2.11.1</mwe2Version>
+ <mwe2Version>2.11.2</mwe2Version>
<emf.version>(2.8,3.0)</emf.version>
<guava.version>[10.0.1,)</guava.version>
<google-inject.version>3.0</google-inject.version>
@@ -178,7 +178,7 @@
<swtbot.tests.skip>false</swtbot.tests.skip>
<swtbot.cdo.tests.skip>false</swtbot.cdo.tests.skip>
- <target-file-name>2020-03-staging</target-file-name>
+ <target-file-name>2020-03</target-file-name>
<ant-files-path>${basedir}/../../releng/org.eclipse.emf.parsley.parent/ant</ant-files-path>
</properties>
@@ -302,7 +302,7 @@
</modules>
<properties>
<findbugs.skip>true</findbugs.skip>
- <target-file-name>2020-03-staging-rap</target-file-name>
+ <target-file-name>2020-03-rap</target-file-name>
</properties>
</profile>
diff --git a/tests/org.eclipse.emf.parsley.tests.libraries/pom.xml b/tests/org.eclipse.emf.parsley.tests.libraries/pom.xml
index 4423fcc..65cc6f3 100644
--- a/tests/org.eclipse.emf.parsley.tests.libraries/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.libraries/pom.xml
@@ -9,7 +9,7 @@
<version>1.10.0-SNAPSHOT</version>
<properties>
- <tycho-version>1.5.1</tycho-version>
+ <tycho-version>1.6.0</tycho-version>
<mockito-version>1.10.19</mockito-version>
<hamcrest-version>1.3</hamcrest-version>
</properties>
