Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Bettini2015-08-07 09:50:53 +0000
committerLorenzo Bettini2015-08-07 09:51:23 +0000
commitb125dc8e8fbaabec29467b8f4553b9f81a2ecfa9 (patch)
treea3fae77b54d23082a2b3fd34baaa0081f161d686
parent864c8305b17a62778081022b82c74fb55335e067 (diff)
downloadorg.eclipse.emf-parsley-b125dc8e8fbaabec29467b8f4553b9f81a2ecfa9.tar.gz
org.eclipse.emf-parsley-b125dc8e8fbaabec29467b8f4553b9f81a2ecfa9.tar.xz
org.eclipse.emf-parsley-b125dc8e8fbaabec29467b8f4553b9f81a2ecfa9.zip
474433: Update to Xtext 2.8.4
Change-Id: I6d2c3543e82eafe922d3c0e233d3d9617ae83b64 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=474433
-rw-r--r--devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup6
-rw-r--r--devtools/org.eclipse.emf.parsley.targetplatform/luna.target4
-rw-r--r--devtools/org.eclipse.emf.parsley.targetplatform/mars.target6
-rw-r--r--dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/ui/tests/EmfParsleyDslWorkbenchTest.xtend6
-rw-r--r--dsl/org.eclipse.emf.parsley.dsl.ui/META-INF/MANIFEST.MF2
-rw-r--r--dsl/org.eclipse.emf.parsley.dsl/META-INF/MANIFEST.MF2
-rw-r--r--features/org.eclipse.emf.parsley.dsl.feature/feature.xml4
-rw-r--r--releng/org.eclipse.emf.parsley.parent/pom.xml2
-rw-r--r--releng/org.eclipse.emf.parsley.releng/aggregator/mars-cdo-xtext-2.8-swtbot-mirror2.b3aggr7
-rw-r--r--tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/EmfParsleySWTBotAbstractTests.java4
10 files changed, 22 insertions, 21 deletions
diff --git a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
index adab1abe2..42b817bff 100644
--- a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
+++ b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
@@ -69,16 +69,16 @@
<setupTask
xsi:type="setup:VariableTask"
name="eclipse.target.platform"
- defaultValue="Luna"
+ defaultValue="Mars"
storageURI="scope://Workspace"/>
<setupTask
xsi:type="setup:VariableTask"
name="mwe2.site"
- value="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.7.1/"/>
+ value="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.8.1/"/>
<setupTask
xsi:type="setup:VariableTask"
name="xtext.site"
- value="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.3/"/>
+ value="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.4/"/>
<setupTask
xsi:type="setup:CompoundTask"
name="Eclipse IDE Plugins">
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/luna.target b/devtools/org.eclipse.emf.parsley.targetplatform/luna.target
index c1ed464f3..dc5b1bcba 100644
--- a/devtools/org.eclipse.emf.parsley.targetplatform/luna.target
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/luna.target
@@ -22,11 +22,11 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.7.1/"/>
+<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.8.1/"/>
</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="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.3/"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.4/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.xdoc.feature.feature.group" version="0.0.0"/>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/mars.target b/devtools/org.eclipse.emf.parsley.targetplatform/mars.target
index e89922609..95fbce6d9 100644
--- a/devtools/org.eclipse.emf.parsley.targetplatform/mars.target
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/mars.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
-<target name="mars" sequenceNumber="1">
+<target name="mars" sequenceNumber="2">
<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"/>
@@ -22,11 +22,11 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.7.1/"/>
+<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.8.1/"/>
</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="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.3/"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.4/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.xdoc.feature.feature.group" version="0.0.0"/>
diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/ui/tests/EmfParsleyDslWorkbenchTest.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/ui/tests/EmfParsleyDslWorkbenchTest.xtend
index f82066f10..d9ec80fbd 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/ui/tests/EmfParsleyDslWorkbenchTest.xtend
+++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/ui/tests/EmfParsleyDslWorkbenchTest.xtend
@@ -107,7 +107,7 @@ module «TEST_PROJECT» {
}
'''
)
- waitForAutoBuild
+ waitForBuild
assertTrue(project.getFile("/" + PLUGIN_XML_EMFPARSLEY_GEN).exists())
@@ -120,7 +120,7 @@ module «TEST_PROJECT» {
}
'''
)
- waitForAutoBuild
+ waitForBuild
assertFalse(project.getFile("/" + PLUGIN_XML_EMFPARSLEY_GEN).exists())
}
@@ -132,7 +132,7 @@ module «TEST_PROJECT» {
val project = root.getProject(TEST_PROJECT)
assertTrue(project.exists())
cleanBuild
- waitForAutoBuild
+ waitForBuild
return project
}
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui/META-INF/MANIFEST.MF b/dsl/org.eclipse.emf.parsley.dsl.ui/META-INF/MANIFEST.MF
index 3cf80638a..e5364df49 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui/META-INF/MANIFEST.MF
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.4.0.qualifier
Bundle-SymbolicName: org.eclipse.emf.parsley.dsl.ui;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.emf.parsley.dsl;visibility:=reexport,
- org.eclipse.xtext.ui;bundle-version="[2.8.3,2.9.0)",
+ org.eclipse.xtext.ui;bundle-version="[2.8.4,2.9.0)",
org.eclipse.ui.editors;bundle-version="3.5.0",
org.eclipse.ui.ide;bundle-version="3.5.0",
org.eclipse.xtext.ui.shared,
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 cded5770b..37d75be46 100644
--- a/dsl/org.eclipse.emf.parsley.dsl/META-INF/MANIFEST.MF
+++ b/dsl/org.eclipse.emf.parsley.dsl/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse Modeling Project
Bundle-Version: 0.4.0.qualifier
Bundle-SymbolicName: org.eclipse.emf.parsley.dsl;singleton:=true
Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext;bundle-version="[2.8.3,2.9.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.8.4,2.9.0)";visibility:=reexport,
org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
org.eclipse.xtext.generator;resolution:=optional,
org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
diff --git a/features/org.eclipse.emf.parsley.dsl.feature/feature.xml b/features/org.eclipse.emf.parsley.dsl.feature/feature.xml
index c2d9bf1a3..55424873f 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 @@ It aims at providing a set of Components like Trees, Tables and Detail Forms tha
</license>
<requires>
- <import feature="org.eclipse.xtext.xbase" version="2.8.3" match="compatible"/>
- <import feature="org.eclipse.xtext.ui" version="2.8.3" match="compatible"/>
+ <import feature="org.eclipse.xtext.xbase" version="2.8.4" match="compatible"/>
+ <import feature="org.eclipse.xtext.ui" version="2.8.4" match="compatible"/>
</requires>
<plugin
diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
index d02f29568..42f569dc0 100644
--- a/releng/org.eclipse.emf.parsley.parent/pom.xml
+++ b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -15,7 +15,7 @@
<jacoco-version>0.7.4.201502262128</jacoco-version>
<findbugs-version>2.5.5</findbugs-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <xtext-version>2.8.3</xtext-version>
+ <xtext-version>2.8.4</xtext-version>
<!-- <platform-version>[3.9,4.0)</platform-version> -->
<fornax-oaw-m2-plugin-version>3.5.1</fornax-oaw-m2-plugin-version>
diff --git a/releng/org.eclipse.emf.parsley.releng/aggregator/mars-cdo-xtext-2.8-swtbot-mirror2.b3aggr b/releng/org.eclipse.emf.parsley.releng/aggregator/mars-cdo-xtext-2.8-swtbot-mirror2.b3aggr
index c661871ce..1118ef7ac 100644
--- a/releng/org.eclipse.emf.parsley.releng/aggregator/mars-cdo-xtext-2.8-swtbot-mirror2.b3aggr
+++ b/releng/org.eclipse.emf.parsley.releng/aggregator/mars-cdo-xtext-2.8-swtbot-mirror2.b3aggr
@@ -16,9 +16,10 @@
</contributions>
<contributions description="Xtext Releases" label="Xtext Releases">
<repositories location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases">
- <features name="org.eclipse.xtext.sdk.feature.group" versionRange="[2.8.3,2.9.0)"/>
- <features name="org.eclipse.emf.mwe2.launcher.feature.group"/>
- </repositories>
+ <features name="org.eclipse.xtext.sdk.feature.group" versionRange="[2.8.4,2.9.0)"/>
+ <features name="org.eclipse.emf.mwe2.language.sdk.feature.group" versionRange="2.8.1"/>
+ <features name="org.eclipse.emf.mwe2.runtime.sdk.feature.group" versionRange="2.8.1"/>
+ <features name="org.eclipse.emf.mwe2.launcher.feature.group" versionRange="2.8.1"/> </repositories>
</contributions>
<contributions description="SwtBot" label="SwtBot">
<repositories location="http://download.eclipse.org/technology/swtbot/releases/latest">
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/EmfParsleySWTBotAbstractTests.java b/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/EmfParsleySWTBotAbstractTests.java
index 93fd35e13..237a6ce4b 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/EmfParsleySWTBotAbstractTests.java
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/EmfParsleySWTBotAbstractTests.java
@@ -382,7 +382,7 @@ public class EmfParsleySWTBotAbstractTests {
// bot.sleep(2000);
bot.saveAllEditors();
cleanWorkspace();
- IResourcesSetupUtil.waitForAutoBuild();
+ IResourcesSetupUtil.waitForBuild();
}
protected static void closeWelcomePage() throws InterruptedException {
@@ -766,7 +766,7 @@ public class EmfParsleySWTBotAbstractTests {
}
protected void waitForBuild() throws CoreException {
- IResourcesSetupUtil.waitForAutoBuild();
+ IResourcesSetupUtil.waitForBuild();
// ensure that all queued workspace operations and locks are released
try {

Back to the top