Bug 495389 - Use collaborative modeling integration builds
Adds the integration stream of the "logical model" builds from EMF
Compare and EGit also for the release, because these include additional
integration functionalities in comparison to the official EMF Compare
and EGit releases.
Change-Id: I9f60ee4ca23cef728fe39b23cf09647a92ce2a03
Signed-off-by: Philip Langer <planger@eclipsesource.com>
diff --git a/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.neon/org.eclipse.papyrus.information.modeling.targetplatform.neon.target b/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.neon/org.eclipse.papyrus.information.modeling.targetplatform.neon.target
index b049023..30400b4 100755
--- a/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.neon/org.eclipse.papyrus.information.modeling.targetplatform.neon.target
+++ b/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.neon/org.eclipse.papyrus.information.modeling.targetplatform.neon.target
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Neon" sequenceNumber="1464167643">
+<target name="Papyrus Neon" sequenceNumber="1477580477">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.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.uml2.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="0.0.0"/>
@@ -69,5 +61,35 @@
<unit id="org.apache.batik.util" version="1.6.0.v201011041432"/>
<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
</location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.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"/>
+ <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
+ <repository 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.eclipse.egit.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/integration"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+ <repository location="http://download.eclipse.org/cbi/updates/license"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="com.google.guava" version="11.0.2.v201303041551"/>
+ <unit id="org.junit" version="4.12.0.v201504281640"/>
+ <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+ <unit id="javaewah" version="0.7.9.v201401101600"/>
+ <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+ <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
+ <unit id="org.mockito" version="1.9.5.v201311280930"/>
+ <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/>
+ </location>
</locations>
</target>
diff --git a/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.neon/org.eclipse.papyrus.information.modeling.targetplatform.neon.tpd b/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.neon/org.eclipse.papyrus.information.modeling.targetplatform.neon.tpd
index 688eeda..842d173 100755
--- a/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.neon/org.eclipse.papyrus.information.modeling.targetplatform.neon.tpd
+++ b/targetplatform/org.eclipse.papyrus.information.modeling.targetplatform.neon/org.eclipse.papyrus.information.modeling.targetplatform.neon.tpd
@@ -2,14 +2,6 @@
location "http://download.eclipse.org/releases/neon/" eclipse-neon {
org.eclipse.draw2d.feature.group lazy
- org.eclipse.jgit.feature.group lazy
- org.eclipse.egit.feature.group lazy
- org.eclipse.emf.compare.diagram.gmf.feature.group lazy
- org.eclipse.emf.compare.diagram.papyrus.feature.group lazy
- org.eclipse.emf.compare.egit.feature.group lazy
- org.eclipse.emf.compare.feature.group lazy
- org.eclipse.emf.compare.ide.ui.feature.group lazy
- org.eclipse.emf.compare.uml2.feature.group lazy
org.eclipse.emf.feature.group lazy
org.eclipse.emf.mwe2.language.sdk.feature.group lazy
org.eclipse.emf.mwe2.runtime.sdk.feature.group lazy
@@ -68,8 +60,26 @@
}
/**
+ * EMF Compare with logical model support for EGit
+ */
+location "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration" {
+ org.eclipse.emf.compare.diagram.gmf.feature.group lazy
+ org.eclipse.emf.compare.diagram.papyrus.feature.group lazy
+ org.eclipse.emf.compare.egit.feature.group lazy
+ org.eclipse.emf.compare.feature.group lazy
+ org.eclipse.emf.compare.ide.ui.feature.group lazy
+ org.eclipse.emf.compare.rcp.ui.feature.group lazy
+ org.eclipse.emf.compare.uml2.feature.group lazy
+}
+
+location "http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/integration" {
+ org.eclipse.egit.feature.group lazy
+ org.eclipse.jgit.feature.group lazy
+}
+
+/**
* Dependencies of EMF Compare with logical model support for EGit
-
+ */
location "http://download.eclipse.org/cbi/updates/license" {
org.eclipse.license.feature.group [1.0.1,1.1.0)
}
@@ -84,4 +94,3 @@
org.mockito [1.9.0,2.0.0)
org.hamcrest [1.1.0,2.0.0)
}
-* */
