Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian NOYRIT2020-05-12 12:23:37 -0400
committerjeremie.tatibouet2020-06-05 02:50:35 -0400
commitbc6f2cce7ac110d6684666171d599348888bbb15 (patch)
tree0b2411dcb15612b48db22292dae124a6a3101251 /plugins/infra/gmfdiag/css
parent9cf1207aaf7387a748d6edda8eb5d2c68d1306cc (diff)
downloadorg.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/infra/gmfdiag/css')
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/css.ctx6
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml8
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF1
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/plugin.xml2
5 files changed, 8 insertions, 11 deletions
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
index 9b0308b7013..460fe01849d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4
org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)"
Bundle-Vendor: Eclipse Modeling Project
Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.100.qualifier
Bundle-Name: CSS Properties
Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.properties.Activator
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/css.ctx b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/css.ctx
index 1b6ded15f5c..6890a54bbc8 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/css.ctx
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/css.ctx
@@ -23,21 +23,21 @@
<views xmi:id="_8MqbNYk1EeWBadfj_-2HEQ" name="SingleStylableElement" sections="_8Mp0Iok1EeWBadfj_-2HEQ">
<constraints xsi:type="constraints:SimpleConstraint" xmi:id="_8MqbNok1EeWBadfj_-2HEQ" name="isSingleStylableElement" overrideable="false" overriddenConstraints="_8MqbOok1EeWBadfj_-2HEQ">
<constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="constraints:ValueProperty" xmi:id="_8MqbN4k1EeWBadfj_-2HEQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+ <properties xsi:type="constraints:ValueProperty" xmi:id="_8MqbN4k1EeWBadfj_-2HEQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.3/notation"/>
<properties xsi:type="constraints:ValueProperty" xmi:id="_8MqbOIk1EeWBadfj_-2HEQ" name="className" value="View"/>
</constraints>
</views>
<views xmi:id="_8MqbOYk1EeWBadfj_-2HEQ" elementMultiplicity="-1" name="MultipleStylableElement" sections="_8MqbMIk1EeWBadfj_-2HEQ">
<constraints xsi:type="constraints:SimpleConstraint" xmi:id="_8MqbOok1EeWBadfj_-2HEQ" name="isMultipleStylableElement" overrideable="false">
<constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="constraints:ValueProperty" xmi:id="_8MqbO4k1EeWBadfj_-2HEQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+ <properties xsi:type="constraints:ValueProperty" xmi:id="_8MqbO4k1EeWBadfj_-2HEQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.3/notation"/>
<properties xsi:type="constraints:ValueProperty" xmi:id="_8MqbPIk1EeWBadfj_-2HEQ" name="className" value="View"/>
</constraints>
</views>
<views xmi:id="_8MqbPYk1EeWBadfj_-2HEQ" name="Diagram" sections="_8MqbMYk1EeWBadfj_-2HEQ">
<constraints xsi:type="constraints:SimpleConstraint" xmi:id="_8MqbPok1EeWBadfj_-2HEQ" name="isDiagram" overrideable="false" overriddenConstraints="_8MqbNok1EeWBadfj_-2HEQ _8MqbOok1EeWBadfj_-2HEQ">
<constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
- <properties xsi:type="constraints:ValueProperty" xmi:id="_8MqbP4k1EeWBadfj_-2HEQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+ <properties xsi:type="constraints:ValueProperty" xmi:id="_8MqbP4k1EeWBadfj_-2HEQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.3/notation"/>
<properties xsi:type="constraints:ValueProperty" xmi:id="_8MqbQIk1EeWBadfj_-2HEQ" name="className" value="Diagram"/>
</constraints>
</views>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml
index fce2cd748ac..822e8974b37 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml
@@ -1,6 +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>
<parent>
<groupId>org.eclipse.papyrus</groupId>
@@ -8,6 +6,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.properties</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
+</project> \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
index 2099ec6dee2..ea3811de140 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
@@ -26,7 +26,6 @@ Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
org.eclipse.papyrus.infra.emf.appearance;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",
org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/plugin.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/plugin.xml
index 6b53a6f599c..2bd4a64689d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/plugin.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/plugin.xml
@@ -8,7 +8,7 @@
<extension point="org.eclipse.emf.ecore.factory_override">
<factory
class="org.eclipse.papyrus.infra.gmfdiag.css.factory.CSSNotationFactory"
- uri="http://www.eclipse.org/gmf/runtime/1.0.2/notation">
+ uri="http://www.eclipse.org/gmf/runtime/1.0.3/notation">
</factory>
</extension>
<extension

Back to the top