diff options
| author | Stephan Leicht Vogt | 2015-11-10 14:01:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2015-11-10 14:01:25 +0000 |
| commit | 32bca1fc47eb95dfc89be4459fc403cfbeef23f5 (patch) | |
| tree | 90f560ae266fd60e9a6dd237af8909c5796d821b | |
| parent | 282aadd80bbd13d1fe1ae28f63cf91dc9288dfb4 (diff) | |
| parent | 6e28b3c0544285ab33685b4e82b2ec1dc8535c8d (diff) | |
| download | org.eclipse.simrel.build-32bca1fc47eb95dfc89be4459fc403cfbeef23f5.tar.gz org.eclipse.simrel.build-32bca1fc47eb95dfc89be4459fc403cfbeef23f5.tar.xz org.eclipse.simrel.build-32bca1fc47eb95dfc89be4459fc403cfbeef23f5.zip | |
Merge "scout contribution for neon m3"
| -rw-r--r-- | scout-rap.b3aggrcon | 19 | ||||
| -rw-r--r-- | scout.b3aggrcon | 12 | ||||
| -rw-r--r-- | simrel.b3aggr | 6 |
3 files changed, 3 insertions, 34 deletions
diff --git a/scout-rap.b3aggrcon b/scout-rap.b3aggrcon deleted file mode 100644 index 87c569ca0..000000000 --- a/scout-rap.b3aggrcon +++ /dev/null @@ -1,19 +0,0 @@ -<?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" enabled="false" description="Scout Business Application Development" label="Scout RAP Runtime"> - <repositories location="http://download.eclipse.org/scout/releases/5.0/5.0.0/scout.rap/RC4-20150610-0810" description="Scout RAP Targets"> - <features description="Eclipse Scout SDK RAP" name="org.eclipse.scout.rt.rap.source.feature.group" versionRange="4.0.0"> - <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/> - </features> - <features description="Eclipse Scout Runtime RAP Basic Target" name="org.eclipse.scout.rt.rap.basic.target.feature.group" versionRange="4.0.0"> - <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/> - </features> - <features description="Eclipse Scout Runtime RAP Target" name="org.eclipse.scout.rt.rap.target.feature.group" versionRange="4.0.0"/> - <features description="Eclipse Scout Runtime RAP Testing" name="org.eclipse.scout.rt.rap.testing.source.feature.group" versionRange="4.0.0"> - <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/> - </features> - </repositories> - <contacts href="simrel.b3aggr#//@contacts[email='andreas.hoegger@bsiag.com']"/> - <contacts href="simrel.b3aggr#//@contacts[email='judith.gull@bsiag.com']"/> - <contacts href="simrel.b3aggr#//@contacts[email='ken.lee@bsiag.com']"/> - <contacts href="simrel.b3aggr#//@contacts[email='adrian.sacchi@bsiag.com']"/> -</aggregator:Contribution> diff --git a/scout.b3aggrcon b/scout.b3aggrcon index 173fbdd7a..2d7df89be 100644 --- a/scout.b3aggrcon +++ b/scout.b3aggrcon @@ -1,15 +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/b3/2011/aggregator/1.1.0" enabled="false" description="Scout Business Application Development" label="Scout"> - <repositories location="http://download.eclipse.org/scout/releases/5.0/5.0.0/scout.main/RC4-20150610-0810" description="Scout Targets"> - <features description="Eclipse Scout" name="org.eclipse.scout.feature.group" versionRange="4.0.0"> +<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" enabled="true" description="Scout Business Application Development" label="Scout"> + <repositories location="http://download.eclipse.org/scout/releases/5.2/5.2.0/M3" description="Scout SDK"> + <features description="Eclipse Scout SDK" name="org.eclipse.scout.sdk-feature.feature.group" versionRange="5.2.0"> <categories href="simrel.b3aggr#//@customCategories[identifier='Application%20Development%20Frameworks']"/> </features> - <features description="Eclipse Scout Runtime" name="org.eclipse.scout.rt.source.feature.group" versionRange="4.0.0"> - <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/> - </features> - <features description="Eclipse Scout Runtime Testing" name="org.eclipse.scout.rt.testing.source.feature.group" versionRange="4.0.0"> - <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/> - </features> </repositories> <contacts href="simrel.b3aggr#//@contacts[email='andreas.hoegger@bsiag.com']"/> <contacts href="simrel.b3aggr#//@contacts[email='judith.gull@bsiag.com']"/> diff --git a/simrel.b3aggr b/simrel.b3aggr index 4bbb39734..a9d294554 100644 --- a/simrel.b3aggr +++ b/simrel.b3aggr @@ -82,7 +82,6 @@ <validationSets description="EclipseRT Project RAP" label="runtime"> <contributions href="emf-emf-rap.b3aggrcon#/"/> <contributions href="rap.b3aggrcon#/"/> - <contributions href="scout-rap.b3aggrcon#/"/> </validationSets> <configurations operatingSystem="aix" windowSystem="gtk" architecture="ppc"/> <configurations operatingSystem="aix" windowSystem="gtk" architecture="ppc64"/> @@ -189,11 +188,6 @@ <features href="birt.b3aggrcon#//@repositories.0/@features.6"/> <features href="objectteams.b3aggrcon#//@repositories.0/@features.1"/> <features href="emf-emf.b3aggrcon#//@repositories.0/@features.0"/> - <features href="scout.b3aggrcon#//@repositories.0/@features.1"/> - <features href="scout-rap.b3aggrcon#//@repositories.0/@features.0"/> - <features href="scout.b3aggrcon#//@repositories.0/@features.2"/> - <features href="scout-rap.b3aggrcon#//@repositories.0/@features.1"/> - <features href="scout-rap.b3aggrcon#//@repositories.0/@features.3"/> </customCategories> <customCategories identifier="General Purpose Tools" label="General Purpose Tools" description="Tools that can be used by a wide variety of developers."> <features href="actf.b3aggrcon#//@repositories.0/@features.0"/> |