Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2016-11-22 14:56:27 +0000
committerGerrit Code Review @ Eclipse.org2016-11-22 16:20:43 +0000
commit89febaac134140f608cdb2f957bc0b0d9cf709ba (patch)
tree54a9bd2599d24dd1ff3ee582f0e44b24a35c1bdc
parentb4f1a8ce8cf91a47540aae253892f1842df60807 (diff)
downloadorg.eclipse.papyrus-89febaac134140f608cdb2f957bc0b0d9cf709ba.tar.gz
org.eclipse.papyrus-89febaac134140f608cdb2f957bc0b0d9cf709ba.tar.xz
org.eclipse.papyrus-89febaac134140f608cdb2f957bc0b0d9cf709ba.zip
[Releng] [Oxygen] Update to the new Aggregator file
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
-rw-r--r--features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml12
-rwxr-xr-xplugins/developer/org.eclipse.papyrus.releng.dev.release/release.digestbin2162 -> 346 bytes
-rwxr-xr-xplugins/developer/org.eclipse.papyrus.releng.dev.release/release.digest.bak1bin0 -> 2162 bytes
-rwxr-xr-xplugins/developer/org.eclipse.papyrus.releng.dev.release/release.xml20
-rw-r--r--plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF6
-rw-r--r--plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java19
-rw-r--r--plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java4
-rw-r--r--plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java2
-rw-r--r--plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/UpdateDependencies.java6
-rw-r--r--releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target10
-rw-r--r--releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target8
-rw-r--r--releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd8
-rw-r--r--releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target12
-rw-r--r--releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target12
-rw-r--r--releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target4
-rw-r--r--releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target4
-rw-r--r--releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd6
-rw-r--r--releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target8
-rw-r--r--releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target8
-rw-r--r--releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target4
-rw-r--r--releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target4
21 files changed, 65 insertions, 92 deletions
diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
index 708688dcbb1..1c257edfd4a 100644
--- a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
+++ b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
@@ -113,39 +113,39 @@ http://www.eclipse.org/legal/epl-v10.html
unpack="false"/>
<plugin
- id="org.eclipse.b3.aggregator"
+ id="org.eclipse.cbi.p2repo.aggregator"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.b3.aggregator.legacy"
+ id="org.eclipse.cbi.p2repo.aggregator.legacy"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.b3.cli"
+ id="org.eclipse.cbi.p2repo.util"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.b3.p2"
+ id="org.eclipse.cbi.p2repo.cli"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.b3.util"
+ id="org.eclipse.cbi.p2repo.p2"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="false"/>
<plugin
id="org.eclipse.papyrus.mwe2.utils"
diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.digest b/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.digest
index 425492eb42f..0cc85bffb49 100755
--- a/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.digest
+++ b/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.digest
Binary files differ
diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.digest.bak1 b/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.digest.bak1
new file mode 100755
index 00000000000..425492eb42f
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.digest.bak1
Binary files differ
diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.xml b/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.xml
index 973bd6c14bc..df7d2bbf4b3 100755
--- a/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.xml
+++ b/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.xml
@@ -15,11 +15,11 @@
<plugin name="org.eclipse.papyrus.infra.emf.commandstack" version="1.2.0"/>
<plugin name="org.eclipse.papyrus.dev.assistants.codegen" version="1.2.0"/>
<plugin name="org.eclipse.papyrus.uml.developer.mde" version="1.2.0"/>
- <plugin name="org.eclipse.b3.aggregator" version="1.0.0"/>
- <plugin name="org.eclipse.b3.aggregator.legacy" version="1.0.0"/>
- <plugin name="org.eclipse.b3.cli" version="1.0.0"/>
- <plugin name="org.eclipse.b3.p2" version="1.0.0"/>
- <plugin name="org.eclipse.b3.util" version="1.0.0"/>
+ <plugin name="org.eclipse.cbi.p2repo.aggregator" version="1.0.0"/>
+ <plugin name="org.eclipse.cbi.p2repo.aggregator.legacy" version="1.0.0"/>
+ <plugin name="org.eclipse.cbi.p2repo.util" version="1.0.0"/>
+ <plugin name="org.eclipse.cbi.p2repo.cli" version="1.0.0"/>
+ <plugin name="org.eclipse.cbi.p2repo.p2" version="1.0.0"/>
<plugin name="org.eclipse.papyrus.mwe2.utils" version="1.2.0"/>
<plugin name="org.eclipse.papyrus.dev.tests.framework" version="2.0.0"/>
<plugin name="org.eclipse.papyrus.dev.tests.framework.ui" version="1.2.0"/>
@@ -36,11 +36,11 @@
<plugin name="org.eclipse.papyrus.tests.framework.annotations" version="1.2.0"/>
<plugin name="org.eclipse.upr.utp" version="0.9.0"/>
</feature>
- <plugin name="org.eclipse.b3.aggregator" version="1.0.0"/>
- <plugin name="org.eclipse.b3.aggregator.legacy" version="1.0.0"/>
- <plugin name="org.eclipse.b3.cli" version="1.0.0"/>
- <plugin name="org.eclipse.b3.p2" version="1.0.0"/>
- <plugin name="org.eclipse.b3.util" version="1.0.0"/>
+ <plugin name="org.eclipse.cbi.p2repo.aggregator" version="1.0.0"/>
+ <plugin name="org.eclipse.cbi.p2repo.aggregator.legacy" version="1.0.0"/>
+ <plugin name="org.eclipse.cbi.p2repo.util" version="1.0.0"/>
+ <plugin name="org.eclipse.cbi.p2repo.cli" version="1.0.0"/>
+ <plugin name="org.eclipse.cbi.p2repo.p2" version="1.0.0"/>
<plugin name="org.eclipse.papyrus.bundles.tests" version="1.2.0"/>
<plugin name="org.eclipse.papyrus.codegen" version="1.2.0"/>
<plugin name="org.eclipse.papyrus.def" version="1.2.0"/>
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
index 1bf342485a3..74c7b13b0ce 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.b3.aggregator;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.b3.aggregator.legacy;bundle-version="[1.0.0,2.0.0)",
org.eclipse.oomph.setup.targlets;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
com.google.guava;bundle-version="11.0.0",
org.eclipse.oomph.setup.workingsets;bundle-version="[1.3.0,2.0.0)",
- fr.obeo.releng.targetplatform;bundle-version="2.1.1";resolution:=optional
+ fr.obeo.releng.targetplatform;bundle-version="2.1.1";resolution:=optional,
+ org.eclipse.cbi.p2repo.aggregator;bundle-version="1.0.0",
+ org.eclipse.cbi.p2repo.aggregator.legacy;bundle-version="1.0.0"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java
index bc0d8e22361..54f5c963804 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java
@@ -22,11 +22,11 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.eclipse.b3.aggregator.Aggregation;
-import org.eclipse.b3.aggregator.AggregatorPackage;
-import org.eclipse.b3.aggregator.Contribution;
-import org.eclipse.b3.aggregator.MappedRepository;
-import org.eclipse.b3.aggregator.transformer.TransformationManager;
+import org.eclipse.cbi.p2repo.aggregator.Aggregation;
+import org.eclipse.cbi.p2repo.aggregator.AggregatorPackage;
+import org.eclipse.cbi.p2repo.aggregator.Contribution;
+import org.eclipse.cbi.p2repo.aggregator.MappedRepository;
+import org.eclipse.cbi.p2repo.aggregator.transformer.TransformationManager;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
@@ -84,7 +84,7 @@ public class AddSetupRepositoryUpdateAnnotationHandler extends AbstractHandler {
List<IAggregationElementProxy> elements = loadContributionsAndRepositories(rset, URI.createPlatformResourceURI(aggrFile.getFullPath().toString(), true));
- Map<Repository, IAggregationElementProxy> updates = new HashMap<Repository, AddSetupRepositoryUpdateAnnotationHandler.IAggregationElementProxy>();
+ Map<Repository, IAggregationElementProxy> updates = new HashMap<>();
for (Repository repo : repositories) {
FilteredItemsSelectionDialog dlg = createSelectionDialog(activeShell, repo, elements);
if (dlg.open() == Window.OK) {
@@ -113,7 +113,7 @@ public class AddSetupRepositoryUpdateAnnotationHandler extends AbstractHandler {
}
private Collection<Repository> getSelectedRepositories(Object context) {
- List<Repository> result = new ArrayList<Repository>();
+ List<Repository> result = new ArrayList<>();
Object variable = null;
if (context instanceof ExecutionEvent) {
@@ -141,7 +141,7 @@ public class AddSetupRepositoryUpdateAnnotationHandler extends AbstractHandler {
// Ensure that the Aggregator model is loaded because the model plug-in doesn't register it
AggregatorPackage.eINSTANCE.eClass();
- List<IAggregationElementProxy> result = new ArrayList<AddSetupRepositoryUpdateAnnotationHandler.IAggregationElementProxy>();
+ List<IAggregationElementProxy> result = new ArrayList<>();
Resource resource;
try {
@@ -382,6 +382,7 @@ public class AddSetupRepositoryUpdateAnnotationHandler extends AbstractHandler {
this.index = index;
}
+ @Override
public Contribution getContribution() {
return contribution;
}
@@ -394,10 +395,12 @@ public class AddSetupRepositoryUpdateAnnotationHandler extends AbstractHandler {
return index;
}
+ @Override
public String getLabel() {
return String.format("%s - %s", contribution.getLabel(), repository.getLocation());
}
+ @Override
public String getDetails() {
if ((contribution.getDescription() != null) && (contribution.getDescription().length() > 0)) {
return String.format("%s (%s) - %s", contribution.getLabel(), contribution.getDescription(), repository.getLocation());
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java
index 67ae1abfcb4..55364d2e18c 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java
@@ -23,8 +23,8 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.eclipse.b3.aggregator.Contribution;
-import org.eclipse.b3.aggregator.MappedRepository;
+import org.eclipse.cbi.p2repo.aggregator.Contribution;
+import org.eclipse.cbi.p2repo.aggregator.MappedRepository;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java
index c0852df4589..8794a4295f9 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.eclipse.b3.aggregator.Contribution;
+import org.eclipse.cbi.p2repo.aggregator.Contribution;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/UpdateDependencies.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/UpdateDependencies.java
index cad56874b2b..a38c3d86c56 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/UpdateDependencies.java
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/UpdateDependencies.java
@@ -23,9 +23,9 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.eclipse.b3.aggregator.Aggregation;
-import org.eclipse.b3.aggregator.AggregatorPackage;
-import org.eclipse.b3.aggregator.transformer.TransformationManager;
+import org.eclipse.cbi.p2repo.aggregator.Aggregation;
+import org.eclipse.cbi.p2repo.aggregator.AggregatorPackage;
+import org.eclipse.cbi.p2repo.aggregator.transformer.TransformationManager;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
diff --git a/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target b/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
index 9ffd5deaa88..1d66e06efba 100644
--- a/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
+++ b/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
@@ -102,11 +102,11 @@
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.22.0/v20161026-0352"/>
</location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.b3.aggregator.editor.feature.source.feature.group" version="1.0.0.20161031-0323"/>
- <unit id="org.eclipse.b3.aggregator.editor.feature.feature.group" version="1.0.0.20161031-0323"/>
- <unit id="org.eclipse.b3.aggregator.engine.feature.source.feature.group" version="1.0.0.20161031-0323"/>
- <repository id="b3" location="file:/home/data/httpd/download.eclipse.org/cbi/updates/aggregator/ide/4.5/"/>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="1.0.100.20161116-2325"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group" version="1.0.100.20161116-2325"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group" version="1.0.100.20161116-2325"/>
+ <repository id="cbiAggregator" location="file:/home/data/httpd/download.eclipse.org/cbi/updates/aggregator/ide/4.6/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
diff --git a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
index 6218dcd8a50..0f185eafa6e 100644
--- a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
+++ b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
@@ -103,10 +103,10 @@
<repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.22.0/v20161026-0352"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.b3.aggregator.editor.feature.source.feature.group" version="1.0.0.20161031-0323"/>
- <unit id="org.eclipse.b3.aggregator.editor.feature.feature.group" version="1.0.0.20161031-0323"/>
- <unit id="org.eclipse.b3.aggregator.engine.feature.source.feature.group" version="1.0.0.20161031-0323"/>
- <repository id="b3" location="http://download.eclipse.org/cbi/updates/aggregator/ide/4.5/"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="1.0.100.20161116-2325"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group" version="1.0.100.20161116-2325"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group" version="1.0.100.20161116-2325"/>
+ <repository id="cbiAggregator" location="http://download.eclipse.org/cbi/updates/aggregator/ide/4.6/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
diff --git a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd
index fb00baa3e1d..3691928b796 100644
--- a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd
+++ b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd
@@ -4,10 +4,10 @@ include "../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable
//manualUpdate
-location b3 "http://download.eclipse.org/cbi/updates/aggregator/ide/4.5/" {
- org.eclipse.b3.aggregator.editor.feature.source.feature.group
- org.eclipse.b3.aggregator.editor.feature.feature.group
- org.eclipse.b3.aggregator.engine.feature.source.feature.group
+location cbiAggregator "http://download.eclipse.org/cbi/updates/aggregator/ide/4.6/" {
+ org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group
+ org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group
+ org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group
}
//manualUpdate
diff --git a/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target b/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target
index 226ace3651f..50fc05d385a 100644
--- a/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target
+++ b/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target
@@ -4,10 +4,10 @@
<target name="Papyrus Extra Tests" sequenceNumber="1479378485">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.b3.aggregator.editor.feature.source.feature.group" version="1.0.0.20161031-0323"/>
- <unit id="org.eclipse.b3.aggregator.editor.feature.feature.group" version="1.0.0.20161031-0323"/>
- <unit id="org.eclipse.b3.aggregator.engine.feature.source.feature.group" version="1.0.0.20161031-0323"/>
- <repository id="b3" location="file:/home/data/httpd/download.eclipse.org/cbi/updates/aggregator/ide/4.5/"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="1.0.100.20161116-2325"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group" version="1.0.100.20161116-2325"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group" version="1.0.100.20161116-2325"/>
+ <repository id="cbiAggregator" location="file:/home/data/httpd/download.eclipse.org/cbi/updates/aggregator/ide/4.6/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.oomph.version.feature.group" version="1.6.0.v20161019-0656"/>
@@ -134,10 +134,6 @@
<repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.22.0/v20161026-0352"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.3.v20161116-1156"/>
- <repository id="aeri" location="file:/home/data/httpd/download.eclipse.org/technology/epp/logging/milestones/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.0.201611040610"/>
<unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.0.201611040610"/>
<unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.0.201611040610"/>
diff --git a/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target b/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target
index d66cd475d2c..b5d96786265 100644
--- a/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target
+++ b/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target
@@ -4,10 +4,10 @@
<target name="Papyrus Extra Tests" sequenceNumber="1479378485">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.b3.aggregator.editor.feature.source.feature.group" version="1.0.0.20161031-0323"/>
- <unit id="org.eclipse.b3.aggregator.editor.feature.feature.group" version="1.0.0.20161031-0323"/>
- <unit id="org.eclipse.b3.aggregator.engine.feature.source.feature.group" version="1.0.0.20161031-0323"/>
- <repository id="b3" location="http://download.eclipse.org/cbi/updates/aggregator/ide/4.5/"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="1.0.100.20161116-2325"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group" version="1.0.100.20161116-2325"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group" version="1.0.100.20161116-2325"/>
+ <repository id="cbiAggregator" location="http://download.eclipse.org/cbi/updates/aggregator/ide/4.6/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.oomph.version.feature.group" version="1.6.0.v20161019-0656"/>
@@ -134,10 +134,6 @@
<repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.22.0/v20161026-0352"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.3.v20161116-1156"/>
- <repository id="aeri" location="http://download.eclipse.org/technology/epp/logging/milestones/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.0.201611040610"/>
<unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.0.201611040610"/>
<unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.0.201611040610"/>
diff --git a/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target b/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
index 04a1fe2ca12..6005eeb924f 100644
--- a/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
+++ b/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
@@ -99,10 +99,6 @@
<repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.22.0/v20161026-0352"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.3.v20161116-1156"/>
- <repository id="aeri" location="file:/home/data/httpd/download.eclipse.org/technology/epp/logging/milestones/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.0.201611040610"/>
<unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.0.201611040610"/>
<unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.0.201611040610"/>
diff --git a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
index b4e497ff743..0af1bfaac47 100644
--- a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
+++ b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
@@ -99,10 +99,6 @@
<repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.22.0/v20161026-0352"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.3.v20161116-1156"/>
- <repository id="aeri" location="http://download.eclipse.org/technology/epp/logging/milestones/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.0.201611040610"/>
<unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.0.201611040610"/>
<unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.0.201611040610"/>
diff --git a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
index be3cd0b53ab..273a8e591a6 100644
--- a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
+++ b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
@@ -2,12 +2,6 @@ target "Papyrus Extra" with requirements source
include "../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd"
-//updateFrom("EPP Logging",0)
-
-location aeri "http://download.eclipse.org/technology/epp/logging/milestones/" {
- org.eclipse.epp.logging.aeri.feature.feature.group
-}
-
//updateFrom("EMF COMPARE",0)
location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201611040610" {
diff --git a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
index 9b24036aa1e..46d70f61b41 100644
--- a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
+++ b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
@@ -103,10 +103,10 @@
<repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.22.0/v20161026-0352"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.b3.aggregator.editor.feature.source.feature.group" version="1.0.0.20161031-0323"/>
- <unit id="org.eclipse.b3.aggregator.editor.feature.feature.group" version="1.0.0.20161031-0323"/>
- <unit id="org.eclipse.b3.aggregator.engine.feature.source.feature.group" version="1.0.0.20161031-0323"/>
- <repository id="b3" location="file:/home/data/httpd/download.eclipse.org/cbi/updates/aggregator/ide/4.5/"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="1.0.100.20161116-2325"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group" version="1.0.100.20161116-2325"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group" version="1.0.100.20161116-2325"/>
+ <repository id="cbiAggregator" location="file:/home/data/httpd/download.eclipse.org/cbi/updates/aggregator/ide/4.6/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
diff --git a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
index 7dcf2525002..82793bc1025 100644
--- a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
+++ b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
@@ -103,10 +103,10 @@
<repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.22.0/v20161026-0352"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.b3.aggregator.editor.feature.source.feature.group" version="1.0.0.20161031-0323"/>
- <unit id="org.eclipse.b3.aggregator.editor.feature.feature.group" version="1.0.0.20161031-0323"/>
- <unit id="org.eclipse.b3.aggregator.engine.feature.source.feature.group" version="1.0.0.20161031-0323"/>
- <repository id="b3" location="http://download.eclipse.org/cbi/updates/aggregator/ide/4.5/"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="1.0.100.20161116-2325"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group" version="1.0.100.20161116-2325"/>
+ <unit id="org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group" version="1.0.100.20161116-2325"/>
+ <repository id="cbiAggregator" location="http://download.eclipse.org/cbi/updates/aggregator/ide/4.6/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
diff --git a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
index 6aa25a11c8e..57f3a07c61e 100644
--- a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
+++ b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
@@ -88,10 +88,6 @@
<repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.3.v20161116-1156"/>
- <repository id="aeri" location="file:/home/data/httpd/download.eclipse.org/technology/epp/logging/milestones/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.7.0.201610150614"/>
<unit id="org.eclipse.acceleo.source.feature.group" version="3.7.0.201610150614"/>
<unit id="org.eclipse.acceleo.query.source.feature.group" version="6.0.0.201610150614"/>
diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
index 40ad8911830..0ee8cdf034b 100644
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
@@ -88,10 +88,6 @@
<repository id="gmfTooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.3.v20161116-1156"/>
- <repository id="aeri" location="http://download.eclipse.org/technology/epp/logging/milestones/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.7.0.201610150614"/>
<unit id="org.eclipse.acceleo.source.feature.group" version="3.7.0.201610150614"/>
<unit id="org.eclipse.acceleo.query.source.feature.group" version="6.0.0.201610150614"/>

Back to the top