Use Sirius 6.1

Fix #118
- switch to TP based on capella 1.3

Author: fbats

plugins/org.obeonetwork.dsl.sysml.design/META-INF/MANIFEST.MF

@@ -6,12 +6,12 @@ Bundle-Version: 8.1.1.qualifier
 Bundle-Activator: org.obeonetwork.dsl.sysml.design.SysMLDesignerPlugin
 Require-Bundle: com.google.guava,
  org.eclipse.emf.transaction,
- org.eclipse.sirius.common,
- org.eclipse.sirius.common.ui,
- org.eclipse.sirius;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.diagram;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.ext.base;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.sirius.common;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.sirius.common.ui;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.sirius;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.sirius.ui;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.sirius.diagram;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.sirius.ext.base;bundle-version="[6.0.0,7.0.0)",
  org.eclipse.ui,
  org.eclipse.ui.ide,
  org.eclipse.ui.navigator,

plugins/org.obeonetwork.dsl.sysml.design/icons/deleteModel.gif

@@ -40,9 +40,10 @@ Contributors:
 
   <properties>
     <tycho-version>0.19.0</tycho-version>
-    <umlcore-site>https://s3-eu-west-1.amazonaws.com/obeo-umldesigner-nightly/master/core/repository</umlcore-site>
+    <!--<umlcore-site>https://s3-eu-west-1.amazonaws.com/obeo-umldesigner-nightly/master/core/repository</umlcore-site>-->
+    <umlcore-site>file:/C:/github/UML-Designer/packaging/org.obeonetwork.dsl.uml2.core.update/target/repository/</umlcore-site>
     <root-path>../..</root-path>
-    <platform-version-name>capella-1.2.1</platform-version-name>
+    <platform-version-name>capella-1.3.0</platform-version-name>
   </properties>
 
   <repositories>

releng/org.obeonetwork.dsl.sysml.parent/pom.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="SysMLDesigner for capella-1.3.0" sequenceNumber="1544028832">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.mapping.ecore.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.importer.ecore" version="0.0.0"/>
+      <unit id="org.eclipse.emf.eef.runtime" version="0.0.0"/>
+      <unit id="org.eclipse.core.runtime.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.eef" version="0.0.0"/>
+      <unit id="org.eclipse.eef.common" version="0.0.0"/>
+      <unit id="org.eclipse.eef.common.ui" version="0.0.0"/>
+      <unit id="org.eclipse.eef.core" version="0.0.0"/>
+      <unit id="org.eclipse.eef.core.ext.widgets.reference" version="0.0.0"/>
+      <unit id="org.eclipse.eef.ext.widgets.reference" version="0.0.0"/>
+      <unit id="org.eclipse.eef.ide" version="0.0.0"/>
+      <unit id="org.eclipse.eef.ide.ui" version="0.0.0"/>
+      <unit id="org.eclipse.eef.ide.ui.ext.widgets.reference" version="0.0.0"/>
+      <unit id="org.eclipse.eef.ide.ui.properties" version="0.0.0"/>
+      <unit id="org.eclipse.eef.properties.ui" version="0.0.0"/>
+      <unit id="org.eclipse.eef.properties.ui.legacy" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/releases/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.uml.feature.group" version="5.3.0.v20170605-1616"/>
+      <unit id="org.eclipse.uml2.uml.edit.feature.group" version="5.3.0.v20170605-1616"/>
+      <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
+      <repository location="http://download.eclipse.org/releases/oxygen"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v201305281000"/>
+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+      <repository id="orbit-R20140525021250" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.properties.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.tests.support.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.aql.feature.group" version="0.0.0"/>
+      <repository id="sirius-6.1.0" location="http://download.eclipse.org/sirius/updates/releases/6.1.0/oxygen"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.obeonetwork.dsl.uml2.core.runtime.feature.feature.group" version="0.0.0"/>
+      <unit id="org.obeonetwork.dsl.uml2.core.runtime.sdk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.obeonetwork.gmf.runtime.diagram.ui.extension.feature.feature.group" version="0.0.0"/>
+      <repository location="file:/C:/github/UML-Designer/packaging/org.obeonetwork.dsl.uml2.core.update/target/repository/"/>
+    </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.edit" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/"/>
+    </location>
+  </locations>
+</target>

releng/org.obeonetwork.dsl.sysml.target/sysmldesigner-capella-1.3.0.target

@@ -0,0 +1,16 @@
+target "SysMLDesigner for capella-1.3.0"
+include "https://s3-eu-west-1.amazonaws.com/obeo-umldesigner-nightly/capella-1.3/umlcoredesigner-capella-1.3.0.tpd"
+with source, requirements
+
+// UML Designer core
+location "https://s3-eu-west-1.amazonaws.com/obeo-umldesigner-nightly/capella-1.3/core/repository/"{
+	org.obeonetwork.dsl.uml2.core.runtime.feature.feature.group lazy
+	org.obeonetwork.dsl.uml2.core.runtime.sdk.feature.feature.group lazy
+	org.obeonetwork.gmf.runtime.diagram.ui.extension.feature.feature.group lazy
+}
+
+// SysML
+location "http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/" {
+	org.eclipse.papyrus.sysml14 lazy
+	org.eclipse.papyrus.sysml14.edit lazy
+}