Prepared for release 1.7.0
Change-Id: I3099083b8b3c8f6ef6170451218e02c92e4a3880
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 8c98834..40c72a2 100644
--- a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
+++ b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
@@ -144,7 +144,7 @@
<setupTask
xsi:type="setup:VariableTask"
name="xtext.site"
- value="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.17.0"/>
+ value="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.18.0"/>
<setupTask
xsi:type="setup:VariableTask"
name="api.baseline.version"
@@ -567,7 +567,7 @@
<repositoryList
name="2019-06">
<repository
- url="http://download.eclipse.org/staging/2019-06/"/>
+ url="http://download.eclipse.org/releases/2019-06/"/>
<repository
url="http://download.eclipse.org/cbi/updates/license"/>
<repository
@@ -737,7 +737,7 @@
licenseConfirmationDisabled="true">
<requirement
name="org.eclipse.xtext.sdk.feature.group"
- versionRange="[2.17.0,2.18.0)"/>
+ versionRange="[2.18.0,2.19.0)"/>
<requirement
name="de.itemis.xtext.antlr.feature.feature.group"/>
<repository
@@ -755,8 +755,8 @@
<setupTask
xsi:type="setup:VariableTask"
name="eclipse.target.platform"
- value="2019-03"
- defaultValue="2019-03"
+ value="2019-06"
+ defaultValue="2019-06"
storageURI="scope://Workspace"/>
<setupTask
xsi:type="setup.p2:P2Task"
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2019-06-rap.target b/devtools/org.eclipse.emf.parsley.targetplatform/2019-06-rap.target
new file mode 100644
index 0000000..fcda1fe
--- /dev/null
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/2019-06-rap.target
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="2019-06-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="https://download.eclipse.org/releases/2019-06/"/>
+</location>
+</locations>
+</target>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2019-06.target b/devtools/org.eclipse.emf.parsley.targetplatform/2019-06.target
new file mode 100644
index 0000000..f005b45
--- /dev/null
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/2019-06.target
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="2019-06" 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="https://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/2019-06/"/>
+</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.18.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.mwe.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.10.0"/>
+</location>
+</locations>
+</target>
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 a354e57..ed1a099 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.0.0,7.1.0)";resolution:=optional
+ org.objectweb.asm;bundle-version="[7.1.0,7.2.0)";resolution:=optional
Import-Package: org.apache.log4j,
org.apache.log4j.spi,
org.hamcrest.core,
diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
index dd9a2ff..3e87f71 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.0.0</tycho-version>
+ <tycho-version>1.4.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,7 +66,7 @@
<findbugs-version>3.0.5</findbugs-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <xtext-version>2.18.0-SNAPSHOT</xtext-version>
+ <xtext-version>2.18.0</xtext-version>
<xtextVersion>${xtext-version}</xtextVersion>
<mwe2Version>2.10.0</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>2019-06-staging</target-file-name>
+ <target-file-name>2019-06</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>2019-06-staging-rap</target-file-name>
+ <target-file-name>2019-06-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 db8f32d..2fc2662 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.7.0-SNAPSHOT</version>
<properties>
- <tycho-version>1.0.0</tycho-version>
+ <tycho-version>1.4.0</tycho-version>
<mockito-version>1.10.19</mockito-version>
<hamcrest-version>1.3</hamcrest-version>
</properties>
