429744: [UML 2.5] Migrate Papyrus to UML 2.5

https://bugs.eclipse.org/bugs/show_bug.cgi?id=429744

The following URIs have been updated in all Papyrus plug-ins (Excluding
extra):

- http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2
-> http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard

- http://www.eclipse.org/uml2/4.0.0/UML
-> http://www.eclipse.org/uml2/5.0.0/UML

- http://www.eclipse.org/uml2/4.0.0/Types
-> http://www.eclipse.org/uml2/5.0.0/Types

8 files changed, 19 insertions, 20 deletions

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
index 1e8cbebb084..f96efcad785 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
@@ -1435,7 +1435,7 @@
 <!-- Diagram specific advices -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
 
-	<metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
+	<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
 
 	<!-- Delete moved views advice -->		
 	<adviceBinding id="org.eclipse.papyrus.sysml.diagram.blockdefinition.DeleteViewDuringMoveHelperAdvice"
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
index fc09459dd17..4c28c5165b4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
@@ -484,7 +484,7 @@
 <!-- Diagram specific advices -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
 
-	<metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
+	<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
 
 	<!-- Property specific advices (remove inconsistent views when a Property type is set) -->		
 	<adviceBinding id="org.eclipse.papyrus.sysml.diagram.internalblock.PropertyHelperAdvice" class="org.eclipse.papyrus.sysml.diagram.internalblock.helper.advice.PropertyHelperAdvice" inheritance="all" typeId="org.eclipse.papyrus.uml.Property">
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
index 5e3687cde0f..5d692b0f0e7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
@@ -699,7 +699,7 @@
 
 	<!-- Diagram specific advices -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-	<metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
+	<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
 		<!-- specific advices (pop up on creation) -->		
 		<adviceBinding id="org.eclipse.papyrus.sysml.service.types.helper.ConstraintParameterEditHelperAdvice" 
 			class="org.eclipse.papyrus.sysml.service.types.helper.ConstraintParameterEditHelperAdvice" 
@@ -717,7 +717,7 @@
 </extension>
 
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-   <metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
+   <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
       <specializationType
             id="org.eclipse.papyrus.uml.diagram.parametric.ContextLink"
             name="ContextLink"
@@ -726,7 +726,7 @@
             <param name="semanticHint" value="8500"/>
       </specializationType>
    </metamodel>
-   <metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
+   <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
       <specializationType
             id="org.eclipse.papyrus.uml.diagram.parametric.ContextLinkAppliedStereotype"
             name="ContextLinkAppliedStereotype"
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerCustomization.uiCustom b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerCustomization.uiCustom
index b4d90abcd3c..1eb5f7b83be 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerCustomization.uiCustom
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerCustomization.uiCustom
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML">
+<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/uml2/5.0.0/UML">
   <types metaclassName="uml.Element">
     <customizedFeatures customizedFeature="icon">
       <valueCases>
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerQueries.querySet b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerQueries.querySet
index 56733b2bf6b..2e98c0c32fc 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerQueries.querySet
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerQueries.querySet
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <query:ModelQuerySet xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="SysMLDefaultExplorerQueries">
-  <associatedMetamodels href="http://www.eclipse.org/uml2/4.0.0/UML#/"/>
-  <associatedMetamodels href="http://www.eclipse.org/uml2/4.0.0/Types#/"/>
+  <associatedMetamodels href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
+  <associatedMetamodels href="http://www.eclipse.org/uml2/5.0.0/Types#/"/>
   <queries xsi:type="query:JavaModelQuery" name="getLabel" description="Basic label provider for named elements" lowerBound="1" implementationClassName="org.eclipse.papyrus.sysml.modelexplorer.query.GetLabelQuery">
-    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
-    <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
+    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+    <scope href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
   </queries>
   <queries xsi:type="query:JavaModelQuery" name="getImage" description="SysML icon provider" implementationClassName="org.eclipse.papyrus.sysml.modelexplorer.query.GetImageQuery">
-    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
-    <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+    <scope href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
   </queries>
   <queries xsi:type="query:JavaModelQuery" name="hasImage" description="SysML icon tester" implementationClassName="org.eclipse.papyrus.sysml.modelexplorer.query.HasImageQuery">
-    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>
-    <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+    <scope href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
   </queries>
 </query:ModelQuerySet>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
index c145eb447d2..c1266953802 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
@@ -1,14 +1,13 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.uml2.uml;bundle-version="3.1.0",

+ org.eclipse.uml2.uml;bundle-version="5.0.0",

  org.eclipse.papyrus.sysml;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

  org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.uml2.uml.profile.l2;bundle-version="1.0.0",

  org.eclipse.core.expressions,

  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
index 8d3211aca15..b2767f04ffa 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
@@ -5,7 +5,7 @@
 <!-- SysML ElementTypes declarations -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
 
-	<metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
+	<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
 	
 	<!-- Declaration of IElementTypes -->
 	
@@ -387,7 +387,7 @@
 <!-- Helper advice declarations -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
 
-	<metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
+	<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
 	
 	<!-- Helper advice for Property created in the context of a ConstraintBlock -->
 	<adviceBinding id="org.eclipse.papyrus.sysml.advice.ConstraintBlockPropertyHelperAdvice"
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/xmlElementTypes.xml b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/xmlElementTypes.xml
index 41bead15f1a..3fadbebcf8e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/xmlElementTypes.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/xmlElementTypes.xml
@@ -5,7 +5,7 @@
 <!-- SysML ElementTypes declarations -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
 
-	<metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
+	<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
 	
 	<!-- Declaration of IElementTypes -->
 	
@@ -377,7 +377,7 @@
 <!-- Helper advice declarations -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
 
-	<metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
+	<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
 	
 	<!-- Helper advice for Property -->
 	<adviceBinding id="org.eclipse.papyrus.sysml.advice.ConstraintBlockPropertyHelperAdvice"