diff options
| -rw-r--r-- | .mailmap | 2 | ||||
| -rw-r--r-- | emf-emf-rap.aggrcon | 6 | ||||
| -rw-r--r-- | emf-emf.aggrcon | 4 | ||||
| -rw-r--r-- | emft-ecoretools.aggrcon | 1 | ||||
| -rw-r--r-- | simrel.aggr | 2 |
5 files changed, 7 insertions, 8 deletions
@@ -39,7 +39,7 @@ Dennis Huebner <dennis.huebner@itemis.de> Diego Sandin <diegosandin@gmail.com> Doug Schaefer <cdtdoug@gmail.com> <dschaefer@qnx.com> Doug Schaefer <cdtdoug@gmail.com> dschaefer <dschaefer@qnxws9424.local> -Ed Merks <ed.merks@gmail.com> EMFT Ecore Tools Build Team <ed.merks@gmail.com> +Ed Merks <ed.merks@gmail.com> Ed Willink <ed@willink.me.uk> Edgar Mueller <emueller@eclipsesource.com> Eike Stepper <stepper@esc-net.de> diff --git a/emf-emf-rap.aggrcon b/emf-emf-rap.aggrcon index a53d8f4a3..4115afb7c 100644 --- a/emf-emf-rap.aggrcon +++ b/emf-emf-rap.aggrcon @@ -1,9 +1,9 @@ <?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/cbi/p2repo/2011/aggregator/1.1.0" label="EMF RAP(Runtime)"> - <repositories location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201801231215" description="EMF 2.14"> +<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/cbi/p2repo/2011/aggregator/1.1.0" label="EMF RAP (Runtime)"> + <repositories location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201803080939" description="EMF 2.14"> <features name="org.eclipse.emf.rap.sdk.feature.group"> <categories href="simrel.aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/> </features> </repositories> - <contacts href="simrel.aggr#//@contacts[email='dennis.huebner@typefox.io']"/> + <contacts href="simrel.aggr#//@contacts[email='ed.merks@gmail.com']"/> </aggregator:Contribution> diff --git a/emf-emf.aggrcon b/emf-emf.aggrcon index 230a66d50..ec2ad6a83 100644 --- a/emf-emf.aggrcon +++ b/emf-emf.aggrcon @@ -1,6 +1,6 @@ <?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/cbi/p2repo/2011/aggregator/1.1.0" label="EMF (Core)"> - <repositories location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201801231215" description="EMF 2.14"> + <repositories location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201803080939" description="EMF 2.14"> <features name="org.eclipse.emf.sdk.feature.group"> <categories href="simrel.aggr#//@customCategories[identifier='Modeling']"/> <categories href="simrel.aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/> @@ -15,5 +15,5 @@ <categories href="simrel.aggr#//@customCategories[identifier='Modeling']"/> </features> </repositories> - <contacts href="simrel.aggr#//@contacts[email='dennis.huebner@typefox.io']"/> + <contacts href="simrel.aggr#//@contacts[email='ed.merks@gmail.com']"/> </aggregator:Contribution> diff --git a/emft-ecoretools.aggrcon b/emft-ecoretools.aggrcon index 96c65b2a3..747b1a2b4 100644 --- a/emft-ecoretools.aggrcon +++ b/emft-ecoretools.aggrcon @@ -7,6 +7,5 @@ <features name="org.eclipse.emf.ecoretools.design.feature.group" versionRange="[3.0.0,4.0.0]"/> <features name="org.eclipse.emf.ecoretools.explorer.contextual.feature.group" versionRange="[3.0.0,4.0.0]"/> </repositories> - <contacts href="simrel.aggr#//@contacts[email='ed.merks@gmail.com']"/> <contacts href="simrel.aggr#//@contacts[email='cedric.brun@obeo.fr']"/> </aggregator:Contribution> diff --git a/simrel.aggr b/simrel.aggr index 0718a19e1..6172bde95 100644 --- a/simrel.aggr +++ b/simrel.aggr @@ -535,7 +535,6 @@ <contacts name="Doug Schaefer" email="dschaefer@blackberry.com"/> <contacts name="EMF TENEO Build Team" email="mtaal@elver.org"/> <contacts name="EMF TRANSACTION Build Team" email="boris.gruschko@sap.com"/> - <contacts name="EMFT Ecore Tools Build Team" email="ed.merks@gmail.com"/> <contacts name="EMFT MINT Build Team" email="pnehrer@eclipticalsoftware.com"/> <contacts name="Ed Willink" email="ed@willink.me.uk"/> <contacts name="Eike Stepper" email="stepper@esc-net.de"/> @@ -656,4 +655,5 @@ <contacts name="Angelo Zerr" email="angelozerr@gmail.com"/> <contacts name="Rastislav Wagner" email="rawagner@redhat.com"/> <contacts name="Andrej Podhradsky" email="apodhrad@redhat.com"/> + <contacts name="Ed Merks" email="ed.merks@gmail.com"/> </aggregator:Aggregation> |