538400: Update to Xtext 2.15 for SimRel
Change-Id: I84ac694023b32e838f14c8f564cf8ad414a26e28
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=538400
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2018-09-staging-rap.target b/devtools/org.eclipse.emf.parsley.targetplatform/2018-09-staging-rap.target
new file mode 100644
index 0000000..65ae9ee
--- /dev/null
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/2018-09-staging-rap.target
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="2018-09-staging-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/staging/2018-09/"/>
+</location>
+</locations>
+</target>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2018-09-staging.target b/devtools/org.eclipse.emf.parsley.targetplatform/2018-09-staging.target
new file mode 100644
index 0000000..fc15c97
--- /dev/null
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/2018-09-staging.target
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="2018-09-staging" 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"/>
+<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/staging/2018-09/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.mockito" version="0.0.0"/>
+<unit id="org.hamcrest" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository"/>
+</location>
+</locations>
+</target>
diff --git a/devtools/org.eclipse.emf.parsley.workspace/feature.xml b/devtools/org.eclipse.emf.parsley.workspace/feature.xml
index e9f6d73..129bc05 100644
--- a/devtools/org.eclipse.emf.parsley.workspace/feature.xml
+++ b/devtools/org.eclipse.emf.parsley.workspace/feature.xml
@@ -18,7 +18,7 @@
</license>
<requires>
- <import feature="org.eclipse.xtext.sdk" version="2.14.0" match="equivalent"/>
+ <import feature="org.eclipse.xtext.sdk" version="2.15.0" match="equivalent"/>
<import feature="org.eclipse.swtbot.eclipse" version="2.5.0.201609021837"/>
<import feature="org.eclipse.swtbot.ide" version="2.5.0.201609021837"/>
<import plugin="org.mockito"/>
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ide/META-INF/MANIFEST.MF b/dsl/org.eclipse.emf.parsley.dsl.ide/META-INF/MANIFEST.MF
index e6c19ad..c823f0b 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ide/META-INF/MANIFEST.MF
+++ b/dsl/org.eclipse.emf.parsley.dsl.ide/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
Require-Bundle: org.eclipse.emf.parsley.dsl,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide,
- org.antlr.runtime
+ org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.emf.parsley.dsl.ide.contentassist.antlr.internal,
org.eclipse.emf.parsley.dsl.ide.contentassist.antlr
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 bf2ffbd..c3b1b98 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
@@ -19,8 +19,7 @@
org.eclipse.pde.core;bundle-version="3.7.1",
org.eclipse.emf.parsley.junit4,
org.eclipse.xtext.testing,
- org.eclipse.xtext.xbase.testing,
- org.objectweb.asm;bundle-version="[6.1.1,6.2.0)";resolution:=optional
+ org.eclipse.xtext.xbase.testing
Import-Package: org.apache.log4j,
org.apache.log4j.spi,
org.hamcrest.core,
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 c826259..0f76472 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml_gen
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml_gen
@@ -250,15 +250,6 @@
<super type="org.eclipse.xtext.ui.check.expensive"/>
<persistent value="true"/>
</extension>
- <extension point="org.eclipse.ui.preferencePages">
- <page
- category="org.eclipse.emf.parsley.dsl.EmfParsleyDsl"
- class="org.eclipse.emf.parsley.dsl.ui.EmfParsleyDslExecutableExtensionFactory:org.eclipse.xtext.ui.validation.ValidatorPreferencePage"
- id="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.validator.preferencePage"
- name="Errors/Warnings">
- <keywordReference id="org.eclipse.emf.parsley.dsl.ui.keyword_EmfParsleyDsl"/>
- </page>
- </extension>
<extension point="org.eclipse.xtext.builder.participant">
<participant
class="org.eclipse.emf.parsley.dsl.ui.EmfParsleyDslExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
diff --git a/dsl/org.eclipse.emf.parsley.dsl/META-INF/MANIFEST.MF b/dsl/org.eclipse.emf.parsley.dsl/META-INF/MANIFEST.MF
index fc85330..2cb139f 100644
--- a/dsl/org.eclipse.emf.parsley.dsl/META-INF/MANIFEST.MF
+++ b/dsl/org.eclipse.emf.parsley.dsl/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@
org.eclipse.xtext.util,
org.eclipse.emf.ecore;bundle-version="2.7.0",
org.eclipse.emf.common;bundle-version="2.7.0",
- org.antlr.runtime,
+ org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.common.types,
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
org.eclipse.emf.parsley;visibility:=reexport,
@@ -41,4 +41,3 @@
org.eclipse.emf.parsley.dsl.validation,
org.eclipse.emf.parsley.dsl.formatting2
Automatic-Module-Name: org.eclipse.emf.parsley.dsl
-
diff --git a/examples/org.eclipse.emf.parsley.examples.rap.targetplatform/emf-parsely-rap.target b/examples/org.eclipse.emf.parsley.examples.rap.targetplatform/emf-parsely-rap.target
index 1097092..1fed862 100644
--- a/examples/org.eclipse.emf.parsley.examples.rap.targetplatform/emf-parsely-rap.target
+++ b/examples/org.eclipse.emf.parsley.examples.rap.targetplatform/emf-parsely-rap.target
@@ -26,7 +26,7 @@
<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/oxygen/"/>
+<repository location="http://download.eclipse.org/releases/2018-09/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.parsley.rap.sdk.feature.group" version="0.0.0"/>
diff --git a/features/org.eclipse.emf.parsley.dsl.feature/feature.xml b/features/org.eclipse.emf.parsley.dsl.feature/feature.xml
index d2804f7..68fcd7a 100644
--- a/features/org.eclipse.emf.parsley.dsl.feature/feature.xml
+++ b/features/org.eclipse.emf.parsley.dsl.feature/feature.xml
@@ -23,8 +23,8 @@
</license>
<requires>
- <import feature="org.eclipse.xtext.xbase" version="2.14.0" match="equivalent"/>
- <import feature="org.eclipse.xtext.ui" version="2.14.0" match="equivalent"/>
+ <import feature="org.eclipse.xtext.xbase" version="2.15.0" match="equivalent"/>
+ <import feature="org.eclipse.xtext.ui" version="2.15.0" match="equivalent"/>
</requires>
<plugin
diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
index 05997d2..c0d8aba 100644
--- a/releng/org.eclipse.emf.parsley.parent/pom.xml
+++ b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -66,7 +66,7 @@
<findbugs-version>3.0.5</findbugs-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <xtext-version>2.14.0</xtext-version>
+ <xtext-version>2.15.0-SNAPSHOT</xtext-version>
<xtextVersion>${xtext-version}</xtextVersion>
<mwe2Version>2.9.1.201705291010</mwe2Version>
<emf.version>(2.8,3.0)</emf.version>
@@ -174,7 +174,7 @@
<swtbot.tests.skip>false</swtbot.tests.skip>
<swtbot.cdo.tests.skip>false</swtbot.cdo.tests.skip>
- <target-file-name>photon-staging</target-file-name>
+ <target-file-name>2018-09-staging</target-file-name>
<ant-files-path>${basedir}/../../releng/org.eclipse.emf.parsley.parent/ant</ant-files-path>
</properties>
@@ -298,7 +298,7 @@
</modules>
<properties>
<findbugs.skip>true</findbugs.skip>
- <target-file-name>photon-staging-rap</target-file-name>
+ <target-file-name>2018-09-staging-rap</target-file-name>
</properties>
</profile>
diff --git a/tests/org.eclipse.emf.parsley.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.parsley.tests/META-INF/MANIFEST.MF
index cf51e59..251d2bd 100644
--- a/tests/org.eclipse.emf.parsley.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.parsley.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@
org.apache.log4j;bundle-version="1.2.15",
org.mockito;bundle-version="1.9.5",
org.objenesis;bundle-version="1.0.0",
- org.hamcrest;bundle-version="[1.0.0,2.0.0)"
+ org.hamcrest;bundle-version="[1.0.0,2.0.0)",
+ com.ibm.icu
Import-Package: org.junit;version="4.5.0",
org.junit.rules;version="4.9.0",
org.junit.runner;version="4.5.0",
