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 /tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests | |
| 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 'tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests')
4 files changed, 6 insertions, 8 deletions
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF index 323e85c02fc..2a54e8a67fe 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.100.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests.Activator diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/pom.xml index 904d916f476..02a8c34cbb7 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/pom.xml @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<?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> <parent> <groupId>org.eclipse.papyrus.tests</groupId> @@ -9,6 +7,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project> +</project>
\ No newline at end of file diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/Model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/Model.notation index 221df6bc5c9..19c2d154cb6 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/Model.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/Model.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:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_OJb1UMpxEeSjn_SJapR5PA" type="PapyrusUMLClassDiagram" name="TestPalette" measurementUnit="Pixel"> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_OJb1UMpxEeSjn_SJapR5PA" type="PapyrusUMLClassDiagram" name="TestPalette" measurementUnit="Pixel"> <styles xmi:type="notation:StringValueStyle" xmi:id="_OJb1UcpxEeSjn_SJapR5PA" name="diagram_compatibility_version" stringValue="1.0.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_OJb1UspxEeSjn_SJapR5PA"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_OJb1U8pxEeSjn_SJapR5PA"> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/TestPalette.profile.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/TestPalette.profile.notation index d8cd4f19f60..bebf2f8ef84 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/TestPalette.profile.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/resources/TestPalette.profile.notation @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" 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/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" 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/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> <notation:Diagram xmi:id="_V92M0MpxEeSjn_SJapR5PA" type="PapyrusUMLProfileDiagram" name="Main" measurementUnit="Pixel"> <children xmi:type="notation:Shape" xmi:id="_PZ47IMpyEeSjn_SJapR5PA" type="1026"> <children xmi:type="notation:DecorationNode" xmi:id="_PaA28MpyEeSjn_SJapR5PA" type="1034"/> |