Fix #80 Migrate to UML 2.5

packaging/org.obeonetwork.dsl.sysml.runtime.feature/feature.xml

@@ -216,11 +216,6 @@ Each party waives its rights to a jury trial in any resulting
 litigation.
    </license>
 
-   <requires>
-      <import feature="org.obeonetwork.dsl.uml2.runtime.feature" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.papyrus.sysml.feature" version="0.0.0" match="greaterOrEqual"/>
-   </requires>
-
    <plugin
          id="org.obeonetwork.dsl.sysml.design"
          download-size="0"

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

@@ -14,12 +14,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.sirius.ui,
  org.eclipse.sirius.common.acceleo.mtl,
  org.eclipse.sirius.common.acceleo.mtl.ide,
- org.eclipse.uml2.uml;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.0.0,6.0.0)",
  org.obeonetwork.dsl.uml2.design;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.sysml;bundle-version="[0.10.0,1.0.0)",
+ org.eclipse.papyrus.sysml;bundle-version="[1.0.0,2.0.0)",
  com.google.guava,
  org.eclipse.sirius.ext.base,
- org.eclipse.uml2.uml.profile.l2
+ org.eclipse.uml2.uml.profile.standard
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Provide-Package: org.obeonetwork.dsl.sysml.design.services

plugins/org.obeonetwork.dsl.sysml.design/src/org/obeonetwork/dsl/sysml/design/Activator.java

@@ -20,14 +20,13 @@
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
+import org.eclipse.sirius.viewpoint.description.Viewpoint;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.uml2.uml.Profile;
 import org.eclipse.uml2.uml.UMLPackage;
 import org.osgi.framework.BundleContext;
 
-import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
-import org.eclipse.sirius.viewpoint.description.Viewpoint;
-
 /**
  * The activator class controls the plug-in life cycle.
  * 
@@ -57,7 +56,7 @@ public class Activator extends AbstractUIPlugin {
 	/**
 	 * Path to Standard profile model.
 	 */
-	protected static final String STANDARD_PROFILE_PATH = "StandardL2.profile.uml";
+	protected static final String STANDARD_PROFILE_PATH = "Standard.profile.uml";
 
 	/**
 	 * The shared instance.

plugins/org.obeonetwork.dsl.sysml.design/src/org/obeonetwork/dsl/sysml/design/services/SysMLServices.java

@@ -73,7 +73,7 @@
 import org.eclipse.uml2.uml.Stereotype;
 import org.eclipse.uml2.uml.Type;
 import org.eclipse.uml2.uml.UseCase;
-import org.eclipse.uml2.uml.profile.l2.Refine;
+import org.eclipse.uml2.uml.profile.standard.Refine;
 import org.obeonetwork.dsl.sysml.design.Activator;
 import org.obeonetwork.dsl.uml2.design.services.EcoreServices;
 import org.obeonetwork.dsl.uml2.design.services.UIServices;

releng/org.obeonetwork.dsl.sysml.target/sysmldesigner-kepler.target

@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="SysMLDesigner-kepler" sequenceNumber="1396271509">
+<target name="SysMLDesigner-kepler" sequenceNumber="1397637786">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="4.3.2.v20140221-1852"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.3.2.v20140221-1852"/>
-      <unit id="org.eclipse.draw2d.sdk.feature.group" version="3.9.1.201308190730"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.9.2.v20140203-1126"/>
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.7.0.201306111400"/>
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.7.0.201306111341"/>
-      <unit id="org.eclipse.gef.sdk.feature.group" version="3.9.1.201308190730"/>
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.7.0.201306101425"/>
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.7.0.201306111432"/>
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="4.1.2.v20140202-2055"/>
-      <unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.10.2.v201402191554"/>
       <unit id="org.eclipse.epp.mpc.feature.group" version="1.2.1.v20140219-1000"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20140117-1004"/>
       <repository location="http://download.eclipse.org/releases/kepler"/>
     </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.edit.feature.group" version="2.10.0.v20140407-1058"/>
+      <repository location="http://download.eclipse.org/modeling/emf/emf/updates/warmup/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.uml.feature.group" version="5.0.0.v20140310-0733"/>
+      <unit id="org.eclipse.uml2.uml.edit.feature.group" version="5.0.0.v20140310-0733"/>
+      <unit id="org.eclipse.uml2.feature.group" version="5.0.0.v20140310-0733"/>
+      <repository location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.0milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sysml" version="1.0.0.v201403121345"/>
+      <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/1.0/M6/main"/>
+    </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.forms.feature.group" version="2.2.1.201402241301"/>
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>

releng/org.obeonetwork.dsl.sysml.target/sysmldesigner-kepler.targetplatform

@@ -2,23 +2,37 @@ target "SysMLDesigner-kepler"
 
 with source, requirements
 
+// Eclipse
+
 location "http://download.eclipse.org/releases/kepler" {
 	org.eclipse.platform.feature.group
 	org.eclipse.sdk.feature.group
-	org.eclipse.draw2d.sdk.feature.group
-	org.eclipse.emf.sdk.feature.group
-	org.eclipse.emf.transaction.sdk.feature.group
-	org.eclipse.emf.validation.sdk.feature.group
-	org.eclipse.gef.sdk.feature.group
-	org.eclipse.gmf.runtime.notation.sdk.feature.group
-	org.eclipse.gmf.runtime.sdk.feature.group
-	org.eclipse.uml2.sdk.feature.group
-	org.eclipse.papyrus.sysml.feature.feature.group
 	org.eclipse.epp.mpc.feature.group
 	org.eclipse.equinox.executable.feature.group
 }
 
+// EMF
+
+location "http://download.eclipse.org/modeling/emf/emf/updates/warmup/" {
+	org.eclipse.emf.edit.feature.group
+}
+
+// UML
+
+location "http://download.eclipse.org/modeling/mdt/uml2/updates/5.0milestones" {
+	org.eclipse.uml2.uml.feature.group
+	org.eclipse.uml2.uml.edit.feature.group
+	org.eclipse.uml2.feature.group
+}
+
+// SysML
+
+location "http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/1.0/M6/main" {
+	org.eclipse.papyrus.sysml
+}
+
 // SWTBot
+
 location "http://download.eclipse.org/technology/swtbot/releases/latest/" {
 	org.eclipse.swtbot.forms.feature.group
 	org.eclipse.swtbot.eclipse.feature.group
@@ -29,27 +43,31 @@ location "http://download.eclipse.org/technology/swtbot/releases/latest/" {
 }
 
 // Orbit
+
 location "http://download.eclipse.org/tools/orbit/downloads/drops/S20130914154012/repository/" {
 	com.google.guava;version=[11.0.2,12.0.0)
 	org.junit;version=[4.11.0,5.0.0)
-//	org.junit4
+	//	org.junit4
 	org.hamcrest.core;version=[1.3.0,2.0.0)
 	org.hamcrest.library;version=[1.3.0,2.0.0)
 	org.apache.log4j;version=[1.2.0,1.3.0)
 }
 
 // Acceleo 3
+
 location "http://download.eclipse.org/modeling/m2t/acceleo/updates/releases/3.4/" {
 	org.eclipse.acceleo.feature.group
 	org.eclipse.acceleo.runtime.feature.group
 }
 
 // EEF 1.3
+
 location "http://download.eclipse.org/modeling/emft/eef/updates/releases/1.3/R201311221533" {
 	org.eclipse.emf.eef.runtime
 }
 
 // Sirius
+
 location "http://download.eclipse.org/sirius/updates/milestones/1.0.0M6/kepler" {
 	org.eclipse.sirius.runtime.feature.group;version=lazy
 	org.eclipse.sirius.runtime.acceleo.feature.group;version=lazy