diff options
| author | Florian NOYRIT | 2020-05-12 16:23:37 +0000 |
|---|---|---|
| committer | jeremie.tatibouet | 2020-06-05 06:50:35 +0000 |
| commit | bc6f2cce7ac110d6684666171d599348888bbb15 (patch) | |
| tree | 0b2411dcb15612b48db22292dae124a6a3101251 /plugins/uml/properties | |
| parent | 9cf1207aaf7387a748d6edda8eb5d2c68d1306cc (diff) | |
| download | org.eclipse.papyrus-bc6f2cce7ac110d6684666171d599348888bbb15.tar.gz org.eclipse.papyrus-bc6f2cce7ac110d6684666171d599348888bbb15.tar.xz org.eclipse.papyrus-bc6f2cce7ac110d6684666171d599348888bbb15.zip | |
Bug 562935 - Migration to GMF Notation 1.13.0
Migrate dependencies to org.eclipse.gmf.runtime.notation to
[1.10.0,2.0.0)
Migrate dependencies to org.eclipse.gmf.runtime.notation.edit to
[1.8.0,2.0.0)
Changed all occurences of
http://www.eclipse.org/gmf/runtime/1.0.2/notation
to http://www.eclipse.org/gmf/runtime/1.0.3/notation
Updated the copy of the notation metamodel in
oep.infra.gmfdiag.properties/model to the new 1.10.0 metamodel
Fixed some building issues in tests
Change-Id: I9bb53de2558b67076f6fa423da522bdcedeb794b
Signed-off-by: Florian NOYRIT <florian.noyrit@cea.fr>
Diffstat (limited to 'plugins/uml/properties')
3 files changed, 4 insertions, 7 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/META-INF/MANIFEST.MF index 836c502a193..9028fa8fc6c 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/META-INF/MANIFEST.MF +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-ClassPath: ., bin -Bundle-Version: 2.1.100.qualifier +Bundle-Version: 2.1.200.qualifier Eclipse-BuddyPolicy: dependent Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/pom.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/pom.xml index 415fa1310b4..dc7fee22eed 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/pom.xml +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/pom.xml @@ -1,7 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <!-- This plugin is not released ouside of the Toolsmith feature and therefore @@ -13,6 +10,6 @@ <relativePath>../../../toolsmiths/pom.xml</relativePath> </parent> <artifactId>org.eclipse.papyrus.uml.properties.generation</artifactId> - <version>2.1.100-SNAPSHOT</version> + <version>2.1.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/requirements/Bug519090Requirements.profile.notation b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/requirements/Bug519090Requirements.profile.notation index b88014e81ed..8e223f7c51f 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/requirements/Bug519090Requirements.profile.notation +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/requirements/Bug519090Requirements.profile.notation @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<notation:Diagram 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:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_HiEtwG4cEeelBN-Z-dPmAg" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel"> +<notation:Diagram 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:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_HiEtwG4cEeelBN-Z-dPmAg" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel"> <children xmi:type="notation:Shape" xmi:id="_I7YDAG4cEeelBN-Z-dPmAg" type="Stereotype_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_I7ZRIG4cEeelBN-Z-dPmAg" type="Stereotype_NameLabel"/> <children xmi:type="notation:BasicCompartment" xmi:id="_I7ZRIW4cEeelBN-Z-dPmAg" type="Stereotype_AttributeCompartment"> |