Use released Xtext 2.20
Change-Id: I6785e0accab1192caada017a93f47f9843822eec
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 6db0f94..5928236 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="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.10.0"/>
+ value="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.1"/>
<setupTask
xsi:type="setup:VariableTask"
name="xtext.site"
- value="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.18.0"/>
+ value="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.20.0"/>
<setupTask
xsi:type="setup:VariableTask"
name="api.baseline.version"
@@ -582,9 +582,9 @@
<repositoryList
name="2019-09">
<repository
- url="http://download.eclipse.org/releases/2019-09/"/>
+ url="https://download.eclipse.org/releases/2019-09/"/>
<repository
- url="http://download.eclipse.org/cbi/updates/license"/>
+ url="https://download.eclipse.org/cbi/updates/license"/>
<repository
url="http://download.itemis.com/updates/releases/2.1.1/"/>
<repository
@@ -597,9 +597,9 @@
<repositoryList
name="2019-12">
<repository
- url="http://download.eclipse.org/releases/2019-12/"/>
+ url="https://download.eclipse.org/releases/2019-12/"/>
<repository
- url="http://download.eclipse.org/cbi/updates/license"/>
+ url="https://download.eclipse.org/cbi/updates/license"/>
<repository
url="http://download.itemis.com/updates/releases/2.1.1/"/>
<repository
@@ -786,7 +786,7 @@
licenseConfirmationDisabled="true">
<requirement
name="org.eclipse.xtext.sdk.feature.group"
- versionRange="[2.19.0,2.20.0)"/>
+ versionRange="[2.20.0,2.21.0)"/>
<requirement
name="de.itemis.xtext.antlr.feature.feature.group"/>
<repository
@@ -797,14 +797,6 @@
url="http://download.itemis.com/updates/releases/2.1.1/"/>
<description>Xtext & Xtend</description>
</setupTask>
- <setupTask
- xsi:type="setup:VariableTask"
- name="mwe2.site"
- value="http://download.eclipse.org/releases/2019-09/"/>
- <setupTask
- xsi:type="setup:VariableTask"
- name="xtext.site"
- value="http://download.eclipse.org/releases/2019-09/"/>
</stream>
<stream
name="next-simrel"
diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/META-INF/MANIFEST.MF b/dsl/org.eclipse.emf.parsley.dsl.tests/META-INF/MANIFEST.MF
index c6f9940..deb52d0 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.tests/META-INF/MANIFEST.MF
+++ b/dsl/org.eclipse.emf.parsley.dsl.tests/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@
org.eclipse.emf.parsley.junit4,
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing,
- org.objectweb.asm;bundle-version="[7.1.0,7.2.0)";resolution:=optional
+ org.objectweb.asm;bundle-version="[7.2.0,7.3.0)";resolution:=optional
Import-Package: org.apache.log4j,
org.apache.log4j.spi,
org.hamcrest.core,
diff --git a/dsl/org.eclipse.emf.parsley.dsl/pom.xml b/dsl/org.eclipse.emf.parsley.dsl/pom.xml
index b28a69a..b98d2c4 100644
--- a/dsl/org.eclipse.emf.parsley.dsl/pom.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl/pom.xml
@@ -146,7 +146,7 @@
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-antlr-generator</artifactId>
- <version>[2.1.1, 3)</version>
+ <version>2.1.1</version>
</dependency>
</dependencies>
</plugin>
diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
index 5665e69..4a3c2f1 100644
--- a/releng/org.eclipse.emf.parsley.parent/pom.xml
+++ b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -66,9 +66,9 @@
<findbugs-version>3.0.5</findbugs-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <xtext-version>2.20.0-SNAPSHOT</xtext-version>
+ <xtext-version>2.20.0</xtext-version>
<xtextVersion>${xtext-version}</xtextVersion>
- <mwe2Version>2.11.0</mwe2Version>
+ <mwe2Version>2.11.1</mwe2Version>
<emf.version>(2.8,3.0)</emf.version>
<guava.version>[10.0.1,)</guava.version>
<google-inject.version>3.0</google-inject.version>
