543479: Update to 2019-03 staging and Xtext 2.17
Change-Id: Iafe69095a3dc881ae6e68e326ab24fce3906d13b
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=543479
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 ce3550d..81ac749 100644
--- a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
+++ b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
@@ -549,6 +549,21 @@
<repository
url="https://dl.bintray.com/lorenzobettini/xtext-xdoc/updates/"/>
</repositoryList>
+ <repositoryList
+ name="2019-03">
+ <repository
+ url="http://download.eclipse.org/staging/2019-03/"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ <repository
+ url="http://download.itemis.com/updates/releases/2.1.1/"/>
+ <repository
+ url="${xtext.site}"/>
+ <repository
+ url="${mwe2.site}"/>
+ <repository
+ url="https://dl.bintray.com/lorenzobettini/xtext-xdoc/updates/"/>
+ </repositoryList>
</targlet>
</setupTask>
<setupTask
@@ -725,8 +740,8 @@
<setupTask
xsi:type="setup:VariableTask"
name="eclipse.target.platform"
- value="2018-12"
- defaultValue="2018-12"
+ value="2019-03"
+ defaultValue="2019-03"
storageURI="scope://Workspace"/>
<setupTask
xsi:type="setup.p2:P2Task"
@@ -734,7 +749,7 @@
licenseConfirmationDisabled="true">
<requirement
name="org.eclipse.xtext.sdk.feature.group"
- versionRange="[2.16.0,2.17.0)"/>
+ versionRange="[2.17.0,2.18.0)"/>
<requirement
name="de.itemis.xtext.antlr.feature.feature.group"/>
<repository
@@ -748,11 +763,11 @@
<setupTask
xsi:type="setup:VariableTask"
name="mwe2.site"
- value="http://download.eclipse.org/staging/2018-12/"/>
+ value="http://download.eclipse.org/staging/2019-03/"/>
<setupTask
xsi:type="setup:VariableTask"
name="xtext.site"
- value="http://download.eclipse.org/staging/2018-12/"/>
+ value="http://download.eclipse.org/staging/2019-03/"/>
<description>Branch for the next Simrel</description>
</stream>
<description>EMF Parsley version for RCP</description>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2019-03-staging-rap.target b/devtools/org.eclipse.emf.parsley.targetplatform/2019-03-staging-rap.target
new file mode 100644
index 0000000..e17ef87
--- /dev/null
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/2019-03-staging-rap.target
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="2019-03-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/2019-03/"/>
+</location>
+</locations>
+</target>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2019-03-staging.target b/devtools/org.eclipse.emf.parsley.targetplatform/2019-03-staging.target
new file mode 100644
index 0000000..0c40bbf
--- /dev/null
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/2019-03-staging.target
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="2019-03-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/2019-03/"/>
+</location>
+</locations>
+</target>
diff --git a/devtools/org.eclipse.emf.parsley.workspace/feature.xml b/devtools/org.eclipse.emf.parsley.workspace/feature.xml
index 89203d5..dfebcc9 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.16.0" match="equivalent"/>
+ <import feature="org.eclipse.xtext.sdk" version="2.17.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"/>
</requires>
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml b/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml
index aae7534..ee35b57 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml
@@ -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/features/org.eclipse.emf.parsley.dsl.feature/feature.xml b/features/org.eclipse.emf.parsley.dsl.feature/feature.xml
index 87517d7..3e1d5d5 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.16.0" match="equivalent"/>
- <import feature="org.eclipse.xtext.ui" version="2.16.0" match="equivalent"/>
+ <import feature="org.eclipse.xtext.xbase" version="2.17.0" match="equivalent"/>
+ <import feature="org.eclipse.xtext.ui" version="2.17.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 9d4eaf1..2cb38f2 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.16.0-SNAPSHOT</xtext-version>
+ <xtext-version>2.17.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>2018-09</target-file-name>
+ <target-file-name>2019-03-staging</target-file-name>
<ant-files-path>${basedir}/../../releng/org.eclipse.emf.parsley.parent/ant</ant-files-path>
</properties>
@@ -299,7 +299,7 @@
</modules>
<properties>
<findbugs.skip>true</findbugs.skip>
- <target-file-name>2018-09-rap</target-file-name>
+ <target-file-name>2019-03-staging-rap</target-file-name>
</properties>
</profile>
diff --git a/tests/org.eclipse.emf.parsley.tests.views/.classpath b/tests/org.eclipse.emf.parsley.tests.views/.classpath
index 72af672..5067db7 100644
--- a/tests/org.eclipse.emf.parsley.tests.views/.classpath
+++ b/tests/org.eclipse.emf.parsley.tests.views/.classpath
@@ -1,16 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="emfparsley-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src">
- <attributes>
- <attribute name="test" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="emfparsley-gen">
- <attributes>
- <attribute name="test" value="true"/>
- </attributes>
- </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
