Switch Papyrus Compare integration build to official EMF Compare release
The integration build used to be based on a custom EMF Compare
integration build. As now all required changes in EMF Compare are
released, we switch to the offical EMF Compare release with the Papyrus
Compare integration build.
Change-Id: I6fdeb61235d7739677aa5dfc60eb9e08c56d5122
Signed-off-by: Philip Langer <planger@eclipsesource.com>
diff --git a/plugins/compare/targetplatforms/compare-release-base.target b/plugins/compare/targetplatforms/compare-release-base.target
index 6aca7e4..28fc0dc 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="1529913499">
+<target name="Compare Target Platform - Base for Release" sequenceNumber="1531136238">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="4.7.3.v20180330-0640"/>
@@ -29,29 +29,29 @@
<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="0.0.0"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="0.0.0"/>
- <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"/>
- <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="1.2.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="3.3.3.201805161152"/>
+ <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/releases/"/>
</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="org.apache.commons.io" version="2.2.0.v201405211200"/>
+ <unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
+ <unit id="com.google.inject" version="3.0.0.v201605172100"/>
<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.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="2.0.21.v201301150030"/>
+ <unit id="javaewah" version="1.1.6.v20160919-1400"/>
+ <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+ <unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
+ <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
<unit id="org.mockito" version="1.9.5.v201605172210"/>
- <unit id="org.hamcrest" 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.hamcrest" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
+ <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
+ <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.objenesis" version="1.0.0.v201505121915"/>
<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
</location>
diff --git a/plugins/compare/targetplatforms/compare-release-base.tpd b/plugins/compare/targetplatforms/compare-release-base.tpd
index 788f2f7..3e90530 100755
--- a/plugins/compare/targetplatforms/compare-release-base.tpd
+++ b/plugins/compare/targetplatforms/compare-release-base.tpd
@@ -29,13 +29,13 @@
org.eclipse.jgit.feature.group
}
-location "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/" emfCompare {
- 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
- org.eclipse.emf.compare.egit.source.feature.group lazy
- org.eclipse.emf.compare.ide.ui.source.feature.group lazy
- org.eclipse.emf.compare.rcp.ui.source.feature.group lazy
+location "http://download.eclipse.org/modeling/emf/compare/updates/releases/" emfCompare {
+ org.eclipse.emf.compare.source.feature.group [3.3.3,4.0.0)
+ org.eclipse.emf.compare.diagram.gmf.source.feature.group [3.3.3,4.0.0)
+ org.eclipse.emf.compare.uml2.source.feature.group [3.3.3,4.0.0)
+ org.eclipse.emf.compare.egit.source.feature.group [1.2.3,2.0.0)
+ org.eclipse.emf.compare.ide.ui.source.feature.group [3.3.3,4.0.0)
+ org.eclipse.emf.compare.rcp.ui.source.feature.group [3.3.3,4.0.0)
}
//manualUpdate
diff --git a/plugins/compare/targetplatforms/compare-release.target b/plugins/compare/targetplatforms/compare-release.target
index f0e7d7d..65fe8a0 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="1529913496">
+<target name="Compare Target Platform - Release" sequenceNumber="1531136217">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="4.7.3.v20180330-0640"/>
@@ -29,29 +29,29 @@
<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="0.0.0"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="0.0.0"/>
- <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"/>
- <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="1.2.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="3.3.3.201805161152"/>
+ <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/releases/"/>
</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="org.apache.commons.io" version="2.2.0.v201405211200"/>
+ <unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
+ <unit id="com.google.inject" version="3.0.0.v201605172100"/>
<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.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="2.0.21.v201301150030"/>
+ <unit id="javaewah" version="1.1.6.v20160919-1400"/>
+ <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+ <unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
+ <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
<unit id="org.mockito" version="1.9.5.v201605172210"/>
- <unit id="org.hamcrest" 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.hamcrest" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
+ <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
+ <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.objenesis" version="1.0.0.v201505121915"/>
<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
</location>
diff --git a/plugins/compare/targetplatforms/compare.tests-release.target b/plugins/compare/targetplatforms/compare.tests-release.target
index cdc0137..87e07ba 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="1529913462">
+<target name="Compare Target Platform - Release, Tests" sequenceNumber="1531136149">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="4.7.3.v20180330-0640"/>
@@ -65,14 +65,14 @@
<repository id="sysml" location="https://hudson.eclipse.org/papyrus/job/papyrus-sysml-oxygen/lastStableBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.compare.tests.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="0.0.0"/>
- <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"/>
- <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/"/>
+ <unit id="org.eclipse.emf.compare.tests.source.feature.group" version="3.5.1.201805161152"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="1.2.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.3.201805161152"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="3.3.3.201805161152"/>
+ <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/releases/"/>
</location>
</locations>
</target>
diff --git a/plugins/compare/targetplatforms/compare.tests-release.tpd b/plugins/compare/targetplatforms/compare.tests-release.tpd
index ec54e42..6592bca 100755
--- a/plugins/compare/targetplatforms/compare.tests-release.tpd
+++ b/plugins/compare/targetplatforms/compare.tests-release.tpd
@@ -31,6 +31,6 @@
org.eclipse.papyrus.sysml14.feature.feature.group lazy
}
-location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/" {
- org.eclipse.emf.compare.tests.source.feature.group lazy
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/releases/" {
+ org.eclipse.emf.compare.tests.source.feature.group [3.5.1,4.0.0)
}
