Update Papyrus Compare and Collaborative Modeling target platforms to be
consistent with each other (And use the proper EMF Compare update sites)
Change-Id: I16b6edeb17eb07d5efd17026aae3be9bc9f09582
Signed-off-by: Camille Letavernier <cletavernier@eclipsesource.com>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.p2/category.xml b/plugins/compare/org.eclipse.papyrus.compare.p2/category.xml
index f8db90e..5f0d935 100644
--- a/plugins/compare/org.eclipse.papyrus.compare.p2/category.xml
+++ b/plugins/compare/org.eclipse.papyrus.compare.p2/category.xml
@@ -13,6 +13,6 @@
</category-def>
<!-- This is currently ignored by Tycho, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708 -->
<!-- We add those sites in the root pom.xml now instead as a workaround -->
- <repository-reference location="http://download.eclipse.org/releases/oxygen/" enabled="true" />
- <repository-reference location="http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201709090201" enabled="true" />
+ <repository-reference location="http://download.eclipse.org/egit/updates" enabled="true" />
+ <repository-reference location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/" enabled="true" />
</site>
diff --git a/plugins/compare/pom.xml b/plugins/compare/pom.xml
index 1fd3ec5..80ca27c 100755
--- a/plugins/compare/pom.xml
+++ b/plugins/compare/pom.xml
@@ -40,8 +40,8 @@
<env.ui.test>-Xms256m -Xmx1024m</env.ui.test>
<!-- P2 Repo References -->
- <egit.p2.repo>http://download.eclipse.org/releases/oxygen/</egit.p2.repo>
- <emf-compare.p2.repo>http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201709090201</emf-compare.p2.repo>
+ <egit.p2.repo>http://download.eclipse.org/egit/updates</egit.p2.repo>
+ <emf-compare.p2.repo>http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/</emf-compare.p2.repo>
</properties>
<pluginRepositories>
@@ -379,7 +379,7 @@
</activation>
<properties>
<egit.p2.repo>http://download.eclipse.org/egit/updates</egit.p2.repo>
- <emf-compare.p2.repo>http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest</emf-compare.p2.repo>
+ <emf-compare.p2.repo>http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/</emf-compare.p2.repo>
</properties>
</profile>
</profiles>
diff --git a/plugins/compare/targetplatforms/compare-nightly.target b/plugins/compare/targetplatforms/compare-nightly.target
index 1612572..48b085f 100644
--- a/plugins/compare/targetplatforms/compare-nightly.target
+++ b/plugins/compare/targetplatforms/compare-nightly.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Nightly" sequenceNumber="1509377777">
+<target name="Compare Target Platform - Nightly" sequenceNumber="1509457206">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -40,7 +40,7 @@
<unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
- <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest"/>
+ <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.commons.io" version="0.0.0"/>
diff --git a/plugins/compare/targetplatforms/compare-nightly.tpd b/plugins/compare/targetplatforms/compare-nightly.tpd
index 23772bd..fe9240d 100755
--- a/plugins/compare/targetplatforms/compare-nightly.tpd
+++ b/plugins/compare/targetplatforms/compare-nightly.tpd
@@ -38,7 +38,7 @@
* If changed, this should also be changed in Papyrus Compare's root pom.xml, in the nightly profile
* Search all references to emf-compare.p2.repo
*/
-location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest" {
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest/" {
org.eclipse.emf.compare.feature.group lazy
org.eclipse.emf.compare.diagram.gmf.feature.group lazy
org.eclipse.emf.compare.uml2.feature.group lazy
diff --git a/plugins/compare/targetplatforms/compare-release-base.target b/plugins/compare/targetplatforms/compare-release-base.target
index 39b210d..fc426ee 100644
--- a/plugins/compare/targetplatforms/compare-release-base.target
+++ b/plugins/compare/targetplatforms/compare-release-base.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Base for Release" sequenceNumber="1509377878">
+<target name="Compare Target Platform - Base for Release" sequenceNumber="1509457260">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="4.7.1.v20171009-0410"/>
@@ -21,18 +21,21 @@
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.11.0.201706061354"/>
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.11.0.201706061437"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.3.0.v20170605-1616"/>
- <unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="4.8.0.201706111038-r"/>
<repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.2.201709090201"/>
- <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201709090201"/>
+ <unit id="org.eclipse.egit.feature.group" version="4.9.0.201710071750-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="4.9.0.201710071750-r"/>
+ <repository id="egit" location="http://download.eclipse.org/egit/updates"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
+ <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.commons.io" version="0.0.0"/>
diff --git a/plugins/compare/targetplatforms/compare-release-base.tpd b/plugins/compare/targetplatforms/compare-release-base.tpd
index 81bb5a0..539928d 100755
--- a/plugins/compare/targetplatforms/compare-release-base.tpd
+++ b/plugins/compare/targetplatforms/compare-release-base.tpd
@@ -22,11 +22,14 @@
org.eclipse.gmf.runtime.notation.sdk.feature.group
org.eclipse.gmf.runtime.sdk.feature.group
org.eclipse.uml2.sdk.feature.group
+}
+
+location "http://download.eclipse.org/egit/updates" egit {
org.eclipse.egit.feature.group
org.eclipse.jgit.feature.group
}
-location "http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201709090201" emfCompare {
+location "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/" emfCompare {
org.eclipse.emf.compare.source.feature.group
org.eclipse.emf.compare.diagram.gmf.source.feature.group
org.eclipse.emf.compare.uml2.feature.group
diff --git a/plugins/compare/targetplatforms/compare-release.target b/plugins/compare/targetplatforms/compare-release.target
index a97800a..3fa9c15 100644
--- a/plugins/compare/targetplatforms/compare-release.target
+++ b/plugins/compare/targetplatforms/compare-release.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Release" sequenceNumber="1509377878">
+<target name="Compare Target Platform - Release" sequenceNumber="1509457257">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="4.7.1.v20171009-0410"/>
@@ -21,18 +21,21 @@
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.11.0.201706061354"/>
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.11.0.201706061437"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.3.0.v20170605-1616"/>
- <unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="4.8.0.201706111038-r"/>
<repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.2.201709090201"/>
- <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201709090201"/>
+ <unit id="org.eclipse.egit.feature.group" version="4.9.0.201710071750-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="4.9.0.201710071750-r"/>
+ <repository id="egit" location="http://download.eclipse.org/egit/updates"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
+ <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.commons.io" version="0.0.0"/>
diff --git a/plugins/compare/targetplatforms/compare.tests-nightly.target b/plugins/compare/targetplatforms/compare.tests-nightly.target
index 3c13ce1..f23bb9e 100644
--- a/plugins/compare/targetplatforms/compare.tests-nightly.target
+++ b/plugins/compare/targetplatforms/compare.tests-nightly.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Nightly, Tests" sequenceNumber="1509377777">
+<target name="Compare Target Platform - Nightly, Tests" sequenceNumber="1509457255">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -69,7 +69,7 @@
<unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
- <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest"/>
+ <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest/"/>
</location>
</locations>
</target>
diff --git a/plugins/compare/targetplatforms/compare.tests-nightly.tpd b/plugins/compare/targetplatforms/compare.tests-nightly.tpd
index 841d764..a96a928 100755
--- a/plugins/compare/targetplatforms/compare.tests-nightly.tpd
+++ b/plugins/compare/targetplatforms/compare.tests-nightly.tpd
@@ -13,7 +13,7 @@
org.eclipse.papyrus.sysml14 lazy
}
-location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest" {
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest/" {
org.eclipse.emf.compare.rcp.ui.source.feature.group lazy
org.eclipse.emf.compare.tests.source.feature.group lazy
}
\ No newline at end of file
diff --git a/plugins/compare/targetplatforms/compare.tests-release.target b/plugins/compare/targetplatforms/compare.tests-release.target
index 4a3231b..5f96086 100644
--- a/plugins/compare/targetplatforms/compare.tests-release.target
+++ b/plugins/compare/targetplatforms/compare.tests-release.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Release, Tests" sequenceNumber="1509377878">
+<target name="Compare Target Platform - Release, Tests" sequenceNumber="1509457239">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="4.7.1.v20171009-0410"/>
@@ -21,24 +21,27 @@
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.11.0.201706061354"/>
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.11.0.201706061437"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.3.0.v20170605-1616"/>
- <unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="4.8.0.201706111038-r"/>
<repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.commons.io" version="0.0.0"/>
- <unit id="org.apache.commons.io.source" version="0.0.0"/>
+ <unit id="org.eclipse.egit.feature.group" version="4.9.0.201710071750-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="4.9.0.201710071750-r"/>
+ <repository id="egit" location="http://download.eclipse.org/egit/updates"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
+ <unit id="org.apache.commons.io.source" version="2.0.1.v201105210651"/>
<unit id="com.google.inject" version="0.0.0"/>
<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
<unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
- <unit id="javaewah" version="0.0.0"/>
+ <unit id="javaewah" version="0.7.9.v201605172130"/>
<unit id="org.apache.commons.compress" version="0.0.0"/>
<unit id="org.apache.commons.lang" version="0.0.0"/>
- <unit id="org.kohsuke.args4j" version="0.0.0"/>
+ <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
<unit id="org.mockito" version="1.9.5.v201605172210"/>
<unit id="org.hamcrest" version="0.0.0"/>
- <unit id="org.hamcrest.library" version="0.0.0"/>
- <unit id="org.hamcrest.integration" version="0.0.0"/>
+ <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/>
<unit id="org.hamcrest.text" version="0.0.0"/>
<unit id="org.objenesis" version="1.0.0.v201505121915"/>
<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
@@ -58,19 +61,19 @@
<repository id="xwt" location="http://download.eclipse.org/xwt/updates"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sysml14" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.sysml14" version="1.0.0"/>
<repository id="sysml" location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/oxygen"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.compare.tests.source.feature.group" version="3.5.0.201709090201"/>
- <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.2.201709090201"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.2.201709090201"/>
- <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201709090201"/>
+ <unit id="org.eclipse.emf.compare.tests.source.feature.group" version="3.5.0.201707041528"/>
+ <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
+ <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/"/>
</location>
</locations>
</target>
diff --git a/plugins/compare/targetplatforms/compare.tests-release.tpd b/plugins/compare/targetplatforms/compare.tests-release.tpd
index b4944c1..20a4b11 100755
--- a/plugins/compare/targetplatforms/compare.tests-release.tpd
+++ b/plugins/compare/targetplatforms/compare.tests-release.tpd
@@ -29,7 +29,7 @@
org.eclipse.papyrus.sysml14
}
-location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201709090201" {
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/" {
org.eclipse.emf.compare.tests.source.feature.group
org.eclipse.emf.compare.uml2.source.feature.group
}
\ No newline at end of file
diff --git a/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target b/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
index 71e789e..3cd3c53 100755
--- a/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
+++ b/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Collaborative Modeling Target Platform" sequenceNumber="1508838287">
+<target name="Collaborative Modeling Target Platform" sequenceNumber="1509457282">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -122,7 +122,8 @@
<unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.tests.source.feature.group" version="0.0.0"/>
- <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest"/>
+ <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
+ <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.sysml14" version="0.0.0"/>
diff --git a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
index b742077..b35a0b1 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
+++ b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Collaborative Modeling Target Platform" sequenceNumber="1508838287">
+<target name="Collaborative Modeling Target Platform" sequenceNumber="1509457282">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -122,7 +122,8 @@
<unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.tests.source.feature.group" version="0.0.0"/>
- <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest"/>
+ <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
+ <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.sysml14" version="0.0.0"/>
diff --git a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
index f41df4c..0f6c71f 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
+++ b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
@@ -150,7 +150,7 @@
}
//updateFrom("EMF COMPARE",0)
-location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest" {
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest/" {
org.eclipse.emf.compare.source.feature.group lazy
org.eclipse.emf.compare.diagram.gmf.source.feature.group lazy
org.eclipse.emf.compare.uml2.source.feature.group lazy
@@ -158,6 +158,7 @@
org.eclipse.emf.compare.ide.ui.source.feature.group lazy
org.eclipse.emf.compare.rcp.ui.source.feature.group lazy
org.eclipse.emf.compare.tests.source.feature.group lazy
+ org.eclipse.emf.compare.feature.group lazy
}
//required for Compare test ProfileMigrationTest
location sysml "http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14" {
