Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcbrun2016-03-23 10:24:31 -0400
committerCedric Brun2016-03-23 10:48:23 -0400
commitbbc638c888fe8edc37bd52e926808e827b653bb9 (patch)
tree88dec4b5fba4b38a47f62726108e30cc1c53874a
parent164a3ec2402206ab20eb308fe4820463a9ee164e (diff)
downloadorg.eclipse.simrel.build-bbc638c888fe8edc37bd52e926808e827b653bb9.tar.gz
org.eclipse.simrel.build-bbc638c888fe8edc37bd52e926808e827b653bb9.tar.xz
org.eclipse.simrel.build-bbc638c888fe8edc37bd52e926808e827b653bb9.zip
Contribute amalgam 1.7.0M6
Additions : the activity and contextual explorer features Removed the Discovery feature from the Modeling category
-rw-r--r--amalgam.b3aggrcon9
-rw-r--r--simrel.b3aggr3
2 files changed, 9 insertions, 3 deletions
diff --git a/amalgam.b3aggrcon b/amalgam.b3aggrcon
index a3405f41..8b4cd852 100644
--- a/amalgam.b3aggrcon
+++ b/amalgam.b3aggrcon
@@ -1,9 +1,14 @@
<?xml version="1.0" encoding="ASCII"?>
<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Amalgam">
- <repositories location="http://download.eclipse.org/modeling/amalgam/updates/milestones/1.7M4" description="Amalgam Stable Milestones">
- <features name="org.eclipse.amalgam.discovery.feature.group" versionRange="[1.4.0,2.0.0]">
+ <repositories location="http://download.eclipse.org/modeling/amalgam/updates/milestones/1.7M6" description="Amalgam Stable Milestones">
+ <features name="org.eclipse.amalgam.discovery.feature.group" versionRange="[1.4.0,2.0.0]"/>
+ <features name="org.eclipse.amalgam.explorer.activity.source.feature.group" versionRange="[1.4.0,2.0.0]">
<categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
</features>
+ <features name="org.eclipse.amalgam.explorer.contextual.core.source.feature.group" versionRange="[1.4.0,2.0.0]">
+ <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
+ </features>
+ <features name="org.eclipse.amalgam.explorer.contextual.sirius.source.feature.group" versionRange="[1.4.0,2.0.0]"/>
</repositories>
<contacts href="simrel.b3aggr#//@contacts[email='stephane.bouchet@obeo.fr']"/>
<contacts href="simrel.b3aggr#//@contacts[email='cedric.brun@obeo.fr']"/>
diff --git a/simrel.b3aggr b/simrel.b3aggr
index c7cb9b0d..5af5b07e 100644
--- a/simrel.b3aggr
+++ b/simrel.b3aggr
@@ -297,7 +297,6 @@
<features href="emft-mwe.b3aggrcon#//@repositories.0/@features.0"/>
<features href="emft-mwe.b3aggrcon#//@repositories.0/@features.1"/>
<features href="emft-mwe.b3aggrcon#//@repositories.0/@features.2"/>
- <features href="amalgam.b3aggrcon#//@repositories.0/@features.0"/>
<features href="emft-ecoretools.b3aggrcon#//@repositories.0/@features.0"/>
<features href="emf-cdo.b3aggrcon#//@repositories.0/@features.0"/>
<features href="emf-cdo.b3aggrcon#//@repositories.0/@features.1"/>
@@ -348,6 +347,8 @@
<features href="emf-parsley.b3aggrcon#//@repositories.0/@features.1"/>
<features href="emf-parsley.b3aggrcon#//@repositories.0/@features.2"/>
<features href="emf-parsley.b3aggrcon#//@repositories.0/@features.3"/>
+ <features href="amalgam.b3aggrcon#//@repositories.0/@features.1"/>
+ <features href="amalgam.b3aggrcon#//@repositories.0/@features.2"/>
</customCategories>
<customCategories identifier="Performance, Profiling and Tracing Tools" label="Performance, Profiling and Tracing Tools" description="Tools to assit analysis of running code.">
<features href="tracecompass.b3aggrcon#//@repositories.0/@features.1"/>

Back to the top