Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Langer2017-09-28 08:47:25 +0000
committerPhilip Langer2017-09-28 08:55:52 +0000
commit92d67eb03f6c19beec24e0abdf28db8f478754bb (patch)
treebf06ad8aa07b744aa475ca9e8c7bc3ee89b31e0e /org.eclipse.emf.compare-parent
parent15516eace82431f09127a24e687200b2f1be68ef (diff)
downloadorg.eclipse.emf.compare-92d67eb03f6c19beec24e0abdf28db8f478754bb.tar.gz
org.eclipse.emf.compare-92d67eb03f6c19beec24e0abdf28db8f478754bb.tar.xz
org.eclipse.emf.compare-92d67eb03f6c19beec24e0abdf28db8f478754bb.zip
Switch to official SysML releases in Oxygen target
We have to switch to the SysML releases repository as we run into ambiguous dependencies to org.eclipse.papyrus.uml.diagram.sequence since Oxygen.1 otherwise. SysML 1.4 however is not compatible with the ProfileMigrationTest. Thus, we have to ignore this test temporarily until it has been migrated to SysML 1.4. Change-Id: Iecccf5e93aafe99654543a5e2c30b2e9c4f0168a Signed-off-by: Philip Langer <planger@eclipsesource.com>
Diffstat (limited to 'org.eclipse.emf.compare-parent')
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target6
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.tpd5
2 files changed, 6 insertions, 5 deletions
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target
index 2b84ec20f..1bf60ba8b 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.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="EMF Compare with extras based on Oxygen SDK" sequenceNumber="1504559326">
+<target name="EMF Compare with extras based on Oxygen SDK" sequenceNumber="1506587845">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -45,8 +45,8 @@
<repository location="http://download.eclipse.org/releases/oxygen"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/>
- <repository location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository"/>
+ <unit id="org.eclipse.papyrus.sysml14" version="0.0.0"/>
+ <repository id="sysml" location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14"/>
</location>
</locations>
</target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.tpd
index 33e74f327..f200537be 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.tpd
@@ -18,6 +18,7 @@ location "http://download.eclipse.org/releases/oxygen" {
org.eclipse.papyrus.sdk.feature.feature.group lazy
}
-location "https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository" {
- org.eclipse.papyrus.sysml.feature.feature.group lazy
+//required for Compare test ProfileMigrationTest
+location sysml "http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14" {
+ org.eclipse.papyrus.sysml14 lazy
} \ No newline at end of file

Back to the top