Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Ortmayr2018-09-21 04:52:23 -0400
committerTobias Ortmayr2018-09-21 04:52:23 -0400
commitc01155bdfe0af8832e3c5b3e0d871f476f86cad5 (patch)
treef17db5bed3c90d9390c341f37f32b0611376e375
parent80a453e22d75d86dc389d03050a4c4050deb868d (diff)
downloadorg.eclipse.papyrus-collaborativemodeling-c01155bdfe0af8832e3c5b3e0d871f476f86cad5.tar.gz
org.eclipse.papyrus-collaborativemodeling-c01155bdfe0af8832e3c5b3e0d871f476f86cad5.tar.xz
org.eclipse.papyrus-collaborativemodeling-c01155bdfe0af8832e3c5b3e0d871f476f86cad5.zip
Update targets to fix build of Papyrus Compare nightly
-Change the version selection for to lazy for : org.eclipse.egit.feature.group and org.eclipse.jgit.feature.group -Regenerate nightly targets Change-Id: I8faed455342aaa2e0e01a6d19cb33bbcddad1b25 Signed-off-by: Tobias Ortmayr <tortmayr@eclipsesource.com>
-rw-r--r--plugins/compare/targetplatforms/compare-nightly.target6
-rwxr-xr-xplugins/compare/targetplatforms/compare-nightly.tpd4
-rwxr-xr-xplugins/compare/targetplatforms/compare-release-current.tpd59
-rw-r--r--plugins/compare/targetplatforms/compare.tests-nightly.target6
4 files changed, 67 insertions, 8 deletions
diff --git a/plugins/compare/targetplatforms/compare-nightly.target b/plugins/compare/targetplatforms/compare-nightly.target
index b6eb5ca..7ee7854 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/eclipse-cbi/targetplatform-dsl -->
-<target name="Compare Target Platform - Nightly" sequenceNumber="1536842242">
+<target name="Compare Target Platform - Nightly" sequenceNumber="1537518835">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -20,8 +20,8 @@
<repository id="eclipse-oxygen" location="http://download.eclipse.org/staging/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="5.0.3.201809091024-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="5.0.3.201809091024-r"/>
+ <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
<repository id="EGit" location="http://download.eclipse.org/egit/updates"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/plugins/compare/targetplatforms/compare-nightly.tpd b/plugins/compare/targetplatforms/compare-nightly.tpd
index dfee621..7f9ab5d 100755
--- a/plugins/compare/targetplatforms/compare-nightly.tpd
+++ b/plugins/compare/targetplatforms/compare-nightly.tpd
@@ -21,8 +21,8 @@ location "http://download.eclipse.org/staging/oxygen/" eclipse-oxygen {
* Search all references to egit.p2.repo
*/
location "http://download.eclipse.org/egit/updates" EGit {
- org.eclipse.egit.feature.group [4.9.0,6.0.0)
- org.eclipse.jgit.feature.group [4.9.0,6.0.0)
+ org.eclipse.egit.feature.group lazy
+ org.eclipse.jgit.feature.group lazy
}
location papyrusNightly "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen" {
diff --git a/plugins/compare/targetplatforms/compare-release-current.tpd b/plugins/compare/targetplatforms/compare-release-current.tpd
new file mode 100755
index 0000000..3d646fa
--- /dev/null
+++ b/plugins/compare/targetplatforms/compare-release-current.tpd
@@ -0,0 +1,59 @@
+//This target platform is not used as-is, but we need it to get a mix of Nightlies and Release artifacts for Papyrus
+//Papyrus tests need the Nightlies, whereas we want to build against the Release. We can't mix both in a single TP.
+//So we need a generic base TP that excludes Papyrus, then Main and Tests will add the version of Papyrus they need
+
+target "Compare Target Platform - Base for Release" with source requirements
+
+location "http://download.eclipse.org/releases/photon/" eclipse-photon{
+ org.eclipse.platform.feature.group
+ org.eclipse.sdk.feature.group
+ org.eclipse.rcp.feature.group
+ org.eclipse.jdt.feature.group
+ org.eclipse.equinox.p2.discovery.feature.feature.group
+ org.eclipse.equinox.executable.feature.group
+ org.eclipse.draw2d
+ org.eclipse.gef
+ org.eclipse.m2m.qvt.oml.sdk.feature.group
+ org.eclipse.emf.sdk.feature.group
+ org.eclipse.xsd.sdk.feature.group
+ org.eclipse.emf.validation.sdk.feature.group
+ org.eclipse.emf.transaction.sdk.feature.group
+ org.eclipse.emf.workspace.feature.group
+ 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/" 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
+location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository" {
+ org.apache.commons.io
+ org.apache.commons.io.source
+ com.google.inject
+ com.google.guava [21.0.0,22.0.0)
+ com.google.guava.source [21.0.0,22.0.0)
+ /* Egit/Jgit */
+ javaewah
+ org.apache.commons.compress
+ org.apache.commons.lang
+ org.kohsuke.args4j
+ org.mockito [1.9.0,2.0.0)
+ org.hamcrest
+ org.hamcrest.library
+ org.hamcrest.integration
+ org.hamcrest.text
+ org.objenesis [1.0.0,2.0.0)
+}
diff --git a/plugins/compare/targetplatforms/compare.tests-nightly.target b/plugins/compare/targetplatforms/compare.tests-nightly.target
index 43f1b21..474ec0c 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/eclipse-cbi/targetplatform-dsl -->
-<target name="Compare Target Platform - Nightly, Tests" sequenceNumber="1536842256">
+<target name="Compare Target Platform - Nightly, Tests" sequenceNumber="1537518899">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -20,8 +20,8 @@
<repository id="eclipse-oxygen" location="http://download.eclipse.org/staging/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="5.0.3.201809091024-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="5.0.3.201809091024-r"/>
+ <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
<repository id="EGit" location="http://download.eclipse.org/egit/updates"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

Back to the top