Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorAbel Hegedus2017-03-14 07:34:39 +0000
committerAbel Hegedus2017-03-14 13:48:19 +0000
commit61013165e0174b69e6dafa0596c2045ef3021497 (patch)
tree8f22227573780a77540f426d2aa636b7d4472827 /releng
parent27afc162f7e7be1832d7df70da3b62a9628c7c42 (diff)
downloadorg.eclipse.emf.diffmerge.core-61013165e0174b69e6dafa0596c2045ef3021497.tar.gz
org.eclipse.emf.diffmerge.core-61013165e0174b69e6dafa0596c2045ef3021497.tar.xz
org.eclipse.emf.diffmerge.core-61013165e0174b69e6dafa0596c2045ef3021497.zip
[513564] fix the product and target for UI tests
A newer version of diffmerge.tests.feature is necessary for the product. The target shall contain the Mars SDK instead of the Luna IDE. Bug: 513564 Change-Id: Id195b0067f513b18118e93b5c200d019550d63f4 Signed-off-by: Tamas Borbas <tamas.borbas@incquerylabs.com> Signed-off-by: Abel Hegedus <abel.hegedus@incquerylabs.com>
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target8
-rw-r--r--releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product2
2 files changed, 5 insertions, 5 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
index 08947f19..54d382ae 100644
--- a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
+++ b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
@@ -19,10 +19,10 @@
<repository location="http://download.eclipse.org/sirius/updates/releases/4.1.3/mars"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.ide" version="4.4.2.M20150204-1700"/>
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.10.2.v20150204-1316"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.10.1.v20150204-1700"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.4"/>
+<unit id="org.eclipse.platform.sdk" version="4.5.2.M20160212-1500"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.11.2.v20160202-2102"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.11.2.v20160212-1500"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500"/>
</location>
</locations>
</target>
diff --git a/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product b/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product
index 8ca6ad72..369df9cc 100644
--- a/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product
+++ b/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product
@@ -62,7 +62,7 @@
<feature id="org.eclipse.emf.databinding"/>
<feature id="org.eclipse.emf.ecore.edit"/>
<feature id="org.eclipse.e4.rcp"/>
- <feature id="org.eclipse.emf.diffmerge.tests.feature" version="0.1.0.qualifier"/>
+ <feature id="org.eclipse.emf.diffmerge.tests.feature" version="0.7.0.qualifier"/>
</features>
<configurations>

Back to the top