Merge branch '429744-uml2.5'

10 files changed, 10 insertions, 10 deletions

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/src/org/eclipse/papyrus/uml/textedit/collaborationuse/xtext/UmlCollaborationUse.xtext b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/src/org/eclipse/papyrus/uml/textedit/collaborationuse/xtext/UmlCollaborationUse.xtext
index 01919719c7d..27d100ba38d 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/src/org/eclipse/papyrus/uml/textedit/collaborationuse/xtext/UmlCollaborationUse.xtext
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/src/org/eclipse/papyrus/uml/textedit/collaborationuse/xtext/UmlCollaborationUse.xtext
@@ -1,7 +1,7 @@
 grammar org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.UmlCollaborationUse with org.eclipse.papyrus.uml.textedit.common.xtext.UmlCommon
 
 
-import "http://www.eclipse.org/uml2/4.0.0/UML" as uml
+import "http://www.eclipse.org/uml2/5.0.0/UML" as uml
 
 generate umlCollaborationUse "http://www.eclipse.org/papyrus/uml/textedit/collaborationuse/xtext/UmlCollaborationUse"
 
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/src/org/eclipse/papyrus/uml/textedit/common/xtext/UmlCommon.xtext b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/src/org/eclipse/papyrus/uml/textedit/common/xtext/UmlCommon.xtext
index c5c1eec0ac1..16a56f9ff05 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/src/org/eclipse/papyrus/uml/textedit/common/xtext/UmlCommon.xtext
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/src/org/eclipse/papyrus/uml/textedit/common/xtext/UmlCommon.xtext
@@ -1,6 +1,6 @@
 grammar org.eclipse.papyrus.uml.textedit.common.xtext.UmlCommon with org.eclipse.papyrus.uml.alf.Common
 
-import "http://www.eclipse.org/uml2/4.0.0/UML" as uml
+import "http://www.eclipse.org/uml2/5.0.0/UML" as uml
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 
 
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/src/org/eclipse/papyrus/uml/textedit/connectionpointreference/xtext/UMLConnectionPointReference.xtext b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/src/org/eclipse/papyrus/uml/textedit/connectionpointreference/xtext/UMLConnectionPointReference.xtext
index eef2168c8e0..fece8a58b24 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/src/org/eclipse/papyrus/uml/textedit/connectionpointreference/xtext/UMLConnectionPointReference.xtext
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/src/org/eclipse/papyrus/uml/textedit/connectionpointreference/xtext/UMLConnectionPointReference.xtext
@@ -14,7 +14,7 @@
 
 grammar org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.UMLConnectionPointReference with org.eclipse.papyrus.uml.alf.Common
 
-import "http://www.eclipse.org/uml2/4.0.0/UML" as uml
+import "http://www.eclipse.org/uml2/5.0.0/UML" as uml
 
 generate uMLConnectionPointReference "http://www.eclipse.org/papyrus/uml/textedit/connectionpointreference/xtext/UMLConnectionPointReference"
 
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.xtext b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.xtext
index bc351c03290..7bfc1b96a17 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.xtext
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.xtext
@@ -1,6 +1,6 @@
 grammar org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage with org.eclipse.papyrus.uml.alf.Common
 
-import "http://www.eclipse.org/uml2/4.0.0/UML" as uml
+import "http://www.eclipse.org/uml2/5.0.0/UML" as uml
 
 generate umlMessage "http://www.eclipse.org/papyrus/uml/textedit/message/xtext/UmlMessage"
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/src/org/eclipse/papyrus/uml/textedit/parameter/xtext/UmlParameter.xtext b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/src/org/eclipse/papyrus/uml/textedit/parameter/xtext/UmlParameter.xtext
index 2ff5145ebf1..f1b5e1e40a9 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/src/org/eclipse/papyrus/uml/textedit/parameter/xtext/UmlParameter.xtext
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/src/org/eclipse/papyrus/uml/textedit/parameter/xtext/UmlParameter.xtext
@@ -1,7 +1,7 @@
 grammar org.eclipse.papyrus.uml.textedit.parameter.xtext.UmlParameter //with org.eclipse.xtext.common.Terminals
 with org.eclipse.papyrus.uml.textedit.common.xtext.UmlCommon
 
-import "http://www.eclipse.org/uml2/4.0.0/UML" as uml
+import "http://www.eclipse.org/uml2/5.0.0/UML" as uml
 import "http://www.eclipse.org/papyrus/uml/textedit/common/xtext/UmlCommon" as common
 
 generate umlParameter "http://www.eclipse.org/papyrus/uml/textedit/parameter/xtext/UmlParameter"
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src/org/eclipse/papyrus/uml/textedit/port/xtext/UmlPort.xtext b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src/org/eclipse/papyrus/uml/textedit/port/xtext/UmlPort.xtext
index d825ec05763..aec06a322e0 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src/org/eclipse/papyrus/uml/textedit/port/xtext/UmlPort.xtext
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/src/org/eclipse/papyrus/uml/textedit/port/xtext/UmlPort.xtext
@@ -14,7 +14,7 @@
 

 grammar org.eclipse.papyrus.uml.textedit.port.xtext.UmlPort with org.eclipse.papyrus.uml.alf.Common

 

-import "http://www.eclipse.org/uml2/4.0.0/UML" as uml

+import "http://www.eclipse.org/uml2/5.0.0/UML" as uml

 import "http://www.eclipse.org/emf/2002/Ecore" as ecore

 

 

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src/org/eclipse/papyrus/uml/textedit/property/xtext/UmlProperty.xtext b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src/org/eclipse/papyrus/uml/textedit/property/xtext/UmlProperty.xtext
index 09ad5ba9475..22f98025771 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src/org/eclipse/papyrus/uml/textedit/property/xtext/UmlProperty.xtext
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/src/org/eclipse/papyrus/uml/textedit/property/xtext/UmlProperty.xtext
@@ -14,7 +14,7 @@
 
 grammar org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty with org.eclipse.papyrus.uml.alf.Common
 
-import "http://www.eclipse.org/uml2/4.0.0/UML" as uml
+import "http://www.eclipse.org/uml2/5.0.0/UML" as uml
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 
 
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.xtext b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.xtext
index 1ff039271c8..7ea85c7c967 100755
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.xtext
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.xtext
@@ -14,7 +14,7 @@
 
 grammar org.eclipse.papyrus.uml.textedit.state.xtext.UmlState with org.eclipse.papyrus.uml.alf.Common
 
-import "http://www.eclipse.org/uml2/4.0.0/UML" as uml
+import "http://www.eclipse.org/uml2/5.0.0/UML" as uml
 
 generate umlState "http://www.eclipse.org/papyrus/uml/textedit/state/xtext/UmlState"
 
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/AppliedStereotypeProperty.xtext b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/AppliedStereotypeProperty.xtext
index dde8db8a2f4..bdb1f7ee722 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/AppliedStereotypeProperty.xtext
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/src/org/eclipse/papyrus/uml/textedit/stereotypeproperty/xtext/AppliedStereotypeProperty.xtext
@@ -1,7 +1,7 @@
 grammar org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.AppliedStereotypeProperty with org.eclipse.papyrus.uml.alf.Alf
 
 
-import "http://www.eclipse.org/uml2/4.0.0/UML" as uml
+import "http://www.eclipse.org/uml2/5.0.0/UML" as uml
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 import "http://www.eclipse.org/papyrus/alf/Alf" as alf
 
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/src/org/eclipse/papyrus/uml/textedit/transition/xtext/UmlTransition.xtext b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/src/org/eclipse/papyrus/uml/textedit/transition/xtext/UmlTransition.xtext
index 52dc1decbaf..f120788f757 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/src/org/eclipse/papyrus/uml/textedit/transition/xtext/UmlTransition.xtext
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/src/org/eclipse/papyrus/uml/textedit/transition/xtext/UmlTransition.xtext
@@ -1,7 +1,7 @@
 grammar org.eclipse.papyrus.uml.textedit.transition.xtext.UmlTransition
 		with org.eclipse.papyrus.uml.alf.Common
 		
-import "http://www.eclipse.org/uml2/4.0.0/UML" as uml
+import "http://www.eclipse.org/uml2/5.0.0/UML" as uml
 
 generate umlTransition "http://www.eclipse.org/papyrus/uml/textedit/transition/xtext/UmlTransition"