Bug 517488: [Interoperability][SysML] Manage SysML Migration for Oxygen
https://bugs.eclipse.org/bugs/show_bug.cgi?id=517488
- Modify the SysML interoperability plugins ids (0.10.1 to 0.11.0)
- Manage the build for SysML interoperability
- Integrate the SysML interoperability into the buildAll main and tests
builds
- Change some code for correct build
- Change the SysML transformation to manage the new architecture
framework
- Change the target platform definitions (to build SysML
interoperability on oxygen and after the SysML 1.1 new repository)
Change-Id: I4180d6a59888f18a82c4db6b3a4adcd8b88ccd41
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>
diff --git a/releng/Papyrus - SysML14 - Main.launch b/releng/Papyrus - SysML14 - Main.launch
index 1c1dd0c..1563f19 100644
--- a/releng/Papyrus - SysML14 - Main.launch
+++ b/releng/Papyrus - SysML14 - Main.launch
@@ -4,7 +4,7 @@
<stringAttribute key="M2_GOALS" value="clean install"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="SysMl14"/>
+<stringAttribute key="M2_PROFILES" value="SysML14"/>
<listAttribute key="M2_PROPERTIES">
<listEntry value="eclipse.p2.mirrors=false"/>
</listAttribute>
diff --git a/releng/main/pom.xml b/releng/main/pom.xml
index 7ac20ea..566e950 100644
--- a/releng/main/pom.xml
+++ b/releng/main/pom.xml
@@ -248,8 +248,8 @@
<module>../../rpy/features/org.eclipse.papyrus.interoperability.rpy.feature</module>
<module>../../rsa/plugins</module>
<module>../../rsa/features/org.eclipse.papyrus.interoperability.rsa.feature</module>
- <!--module>../../sysml14/plugins</module>
- <module>../../sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature</module-->
+ <module>../../sysml14/plugins</module>
+ <module>../../sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature</module>
<module>../../diagram-definition/plugins</module>
<module>../../diagram-definition/features/org.eclipse.papyrus.interoperability.dd.feature</module>
<module>../org.eclipse.papyrus.interoperability.all.p2</module>
@@ -353,7 +353,7 @@
<properties>
<target.platform>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen</target.platform>
<target.platform.groupid>org.eclipse.papyrus.interoperability</target.platform.groupid>
- <target.version>0.10.1-SNAPSHOT</target.version>
+ <target.version>0.11.0-SNAPSHOT</target.version>
</properties>
<modules>
diff --git a/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target b/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
index abd4dd2..a9a2c8e 100644
--- a/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
+++ b/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
@@ -23,7 +23,7 @@
<unit id="org.eclipse.papyrus.sysml.nattable.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.properties.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.properties.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/extra/"/>
+<repository location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201606071631"/>
@@ -51,6 +51,11 @@
<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.sysml14.feature.source.feature.group" version="0.0.0"/>
+<repository location="https://hudson.eclipse.org/papyrus/job/papyrus-sysml-oxygen/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
diff --git a/releng/org.eclipse.papyrus.interoperability.all.p2/category.xml b/releng/org.eclipse.papyrus.interoperability.all.p2/category.xml
index a7bc37e..5a2a65c 100644
--- a/releng/org.eclipse.papyrus.interoperability.all.p2/category.xml
+++ b/releng/org.eclipse.papyrus.interoperability.all.p2/category.xml
@@ -9,6 +9,9 @@
<feature url="features/org.eclipse.papyrus.interoperability.rsa.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.interoperability.rsa.feature" version="1.2.0.qualifier">
<category name="org.eclipse.papyrus.category"/>
</feature>
+ <feature url="features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature_0.11.0.qualifier.jar" id="org.eclipse.papyrus.interoperability.sysml14.sysml.feature" version="0.11.0.qualifier">
+ <category name="org.eclipse.papyrus.category"/>
+ </feature>
<feature url="features/org.eclipse.papyrus.interoperability.main.feature_1.0.0.qualifier.jar" id="org.eclipse.papyrus.interoperability.main.feature" version="1.0.0.qualifier">
<category name="org.eclipse.papyrus.category"/>
</feature>
diff --git a/releng/tests/pom.xml b/releng/tests/pom.xml
index 94794c3..70714a8 100644
--- a/releng/tests/pom.xml
+++ b/releng/tests/pom.xml
@@ -413,7 +413,7 @@
<properties>
<target.platform>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen</target.platform>
<target.platform.groupid>org.eclipse.papyrus.interoperability.tests</target.platform.groupid>
- <target.version>0.10.1-SNAPSHOT</target.version>
+ <target.version>0.11.0-SNAPSHOT</target.version>
</properties>
<modules>
@@ -448,7 +448,7 @@
<properties>
<target.platform>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen</target.platform>
<target.platform.groupid>org.eclipse.papyrus.interoperability.tests</target.platform.groupid>
- <target.version>0.10.1-SNAPSHOT</target.version>
+ <target.version>0.11.0-SNAPSHOT</target.version>
</properties>
<modules>
diff --git a/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target b/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
index f6cb562..cc719c8 100644
--- a/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
+++ b/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
@@ -19,7 +19,7 @@
<unit id="org.eclipse.papyrus.sysml.nattable.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.nattable.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/extra/"/>
+<repository location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201606071631"/>
@@ -48,6 +48,11 @@
<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.sysml14.feature.source.feature.group" version="0.0.0"/>
+<repository location="https://hudson.eclipse.org/papyrus/job/papyrus-sysml-oxygen/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.junit.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.uml.m2m.qvto.tests.tools.feature.feature.group" version="0.0.0"/>
diff --git a/rpy/plugins/org.eclipse.papyrus.interoperability.rpy/src/org/eclipse/papyrus/interoperability/rpy/transformations/RpyImportTransformation.java b/rpy/plugins/org.eclipse.papyrus.interoperability.rpy/src/org/eclipse/papyrus/interoperability/rpy/transformations/RpyImportTransformation.java
index c8e44ea..86a81d6 100644
--- a/rpy/plugins/org.eclipse.papyrus.interoperability.rpy/src/org/eclipse/papyrus/interoperability/rpy/transformations/RpyImportTransformation.java
+++ b/rpy/plugins/org.eclipse.papyrus.interoperability.rpy/src/org/eclipse/papyrus/interoperability/rpy/transformations/RpyImportTransformation.java
@@ -338,7 +338,7 @@
if (null == this.propertiesResource) {
this.propertiesResource = new InternationalizationResource(propertyURI);
this.propertiesResource.getDefaultSaveOptions().put(InternationalizationResourceOptionsConstants.SAVE_OPTION_SORT, Boolean.TRUE);
- this.propertiesResource.getDefaultSaveOptions().put(InternationalizationResourceOptionsConstants.LOAD_SAVE_OPTION_KEY_RESOLVER, UMLInternationalizationKeyResolver.getInstance());
+ this.propertiesResource.getDefaultSaveOptions().put(InternationalizationResourceOptionsConstants.LOAD_SAVE_OPTION_KEY_RESOLVER, new UMLInternationalizationKeyResolver());
}
return this.propertiesResource;
}
diff --git a/rpy/releng/main/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target b/rpy/releng/main/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target
index 26a2582..90d72e5 100755
--- a/rpy/releng/main/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target
+++ b/rpy/releng/main/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target
@@ -21,7 +21,7 @@
<unit id="org.eclipse.papyrus.sysml.nattable.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.properties.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.properties.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/extra/"/>
+<repository location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/mylyn/drops/3.21.1/v20161129-2023"/>
diff --git a/rpy/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target b/rpy/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target
index 98a3856..de4acec 100644
--- a/rpy/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target
+++ b/rpy/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target
@@ -19,7 +19,7 @@
<unit id="org.eclipse.papyrus.sysml.nattable.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.properties.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.properties.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/extra/"/>
+<repository location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201606071631"/>
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/feature.xml b/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/feature.xml
index 05f2828..d2c9318 100644
--- a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/feature.xml
+++ b/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.papyrus.interoperability.sysml14.sysml.feature"
label="Papyrus SysML1.1 to SysML1.4 Interoperability Feature"
- version="0.10.1.qualifier"
+ version="0.11.0.qualifier"
provider-name="Eclipse Modeling Project">
<copyright url="http://www.eclipse.org/legal/epl-v10.html">
@@ -41,6 +41,20 @@
<includes
id="org.eclipse.papyrus.sysml14.feature"
version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.m2m.qvto.common"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.eclipse.papyrus.interoperability.sysml14.sysml"
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/pom.xml b/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/pom.xml
index 010ff94..0dfd148 100644
--- a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/pom.xml
+++ b/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/pom.xml
@@ -9,6 +9,6 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.feature</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
\ No newline at end of file
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature/feature.xml b/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature/feature.xml
index ccdcd0d..99462f6 100644
--- a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature/feature.xml
+++ b/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature"
label="Papyrus SysML1.1 to SysML1.4 Interoperability Tests Feature"
- version="0.10.1.qualifier"
+ version="0.11.0.qualifier"
provider-name="Eclipse Modeling Project">
<copyright url="http://www.eclipse.org/legal/epl-v10.html">
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature/pom.xml b/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature/pom.xml
index 5291041..c73dfeb 100644
--- a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature/pom.xml
+++ b/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature/pom.xml
@@ -5,10 +5,10 @@
<parent>
<groupId>org.eclipse.papyrus.interoperability.tests</groupId>
<artifactId>org.eclipse.papyrus.interoperability.tests.releng</artifactId>
- <relativePath>../../../releng/main/pom.xml</relativePath>
+ <relativePath>../../../releng/tests/pom.xml</relativePath>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
\ No newline at end of file
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.blackboxes/META-INF/MANIFEST.MF b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.blackboxes/META-INF/MANIFEST.MF
index 27cdc58..d7d7439 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.blackboxes/META-INF/MANIFEST.MF
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.blackboxes/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.interoperability.sysml14.sysml.blackboxes;singleton:=true
-Bundle-Version: 0.10.1.qualifier
+Bundle-Version: 0.11.0.qualifier
Bundle-Activator: org.eclipse.papyrus.interoperability.sysml14.sysml.blackboxes.Activator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.interoperability.sysml14.sysml;bundle-version="[0.10.1,1.0.0)",
+ org.eclipse.papyrus.interoperability.sysml14.sysml;bundle-version="[0.11.0,1.0.0)",
org.eclipse.m2m.qvt.oml;bundle-version="[3.7.0,4.0.0)",
org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.blackboxes/pom.xml b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.blackboxes/pom.xml
index 451917c..0a8cf21 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.blackboxes/pom.xml
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.blackboxes/pom.xml
@@ -5,9 +5,8 @@
<parent>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.plugins</artifactId>
<groupId>org.eclipse.papyrus.interoperability</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.blackboxes</artifactId>
- <version>0.10.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.doc/META-INF/MANIFEST.MF b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.doc/META-INF/MANIFEST.MF
index 90aab6b..f62048c 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.doc/META-INF/MANIFEST.MF
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Papyrus SysML Migration Documentation
Bundle-SymbolicName: org.eclipse.papyrus.interoperability.sysml14.sysml.doc;singleton:=true
-Bundle-Version: 0.10.1.qualifier
+Bundle-Version: 0.11.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)",
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.doc/pom.xml b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.doc/pom.xml
index e450242..e724b0f 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.doc/pom.xml
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.doc/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.plugins</artifactId>
<groupId>org.eclipse.papyrus.interoperability</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.doc</artifactId>
<packaging>eclipse-plugin</packaging>
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/META-INF/MANIFEST.MF b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/META-INF/MANIFEST.MF
index b2e8a88..848013e 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/META-INF/MANIFEST.MF
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.interoperability.sysml14.sysml;singleton:=true
-Bundle-Version: 0.10.1.qualifier
+Bundle-Version: 0.11.0.qualifier
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.papyrus.interoperability.sysml14.sysml.Activator
Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
@@ -30,3 +30,4 @@
org.eclipse.papyrus.interoperability.sysml14.sysml.utils,
org.eclipse.papyrus.interoperability.sysml14.sysml.wizard,
org.eclipse.papyrus.interoperability.sysml14.sysml.xmi.helper
+Import-Package: com.google.common.collect
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/pom.xml b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/pom.xml
index 08ee87a..3b53596 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/pom.xml
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/pom.xml
@@ -5,9 +5,8 @@
<parent>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.plugins</artifactId>
<groupId>org.eclipse.papyrus.interoperability</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml</artifactId>
- <version>0.10.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/src/org/eclipse/papyrus/interoperability/sysml14/sysml/transformations/SysMLImportTransformation.java b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/src/org/eclipse/papyrus/interoperability/sysml14/sysml/transformations/SysMLImportTransformation.java
index 283c9ad..194dd94 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/src/org/eclipse/papyrus/interoperability/sysml14/sysml/transformations/SysMLImportTransformation.java
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/src/org/eclipse/papyrus/interoperability/sysml14/sysml/transformations/SysMLImportTransformation.java
@@ -429,18 +429,13 @@
*/
protected List<ModelExtent> getDiagramsModelExtents() {
final List<ModelExtent> allExtents = new LinkedList<ModelExtent>();
- allExtents.add(getInBlockDefinitionViewpoint());
- allExtents.add(getInInternalBlockViewpoint());
- allExtents.add(getInParametricViewpoint());
- allExtents.add(getInRequirementViewpoint());
+ allExtents.add(getInSysML1_4Architecture());
allExtents.add(getOutUMLModelForDiagrams());
allExtents.add(getInSysML1_4Profile());
allExtents.add(getInRequirementNatTableSysML11());
allExtents.add(getInAllocationNatTableSysML11());
allExtents.add(getInRequirementNatTableSysML14());
allExtents.add(getInAllocationNatTableSysML14());
- allExtents.add(getInRequirementConfigurationSysML14());
- allExtents.add(getInAllocationConfigurationSysML14());
allExtents.add(getInoutNotationModel());
return allExtents;
}
@@ -496,48 +491,13 @@
*
* @return The model extent with the block definition viewpoint.
*/
- protected ModelExtent getInBlockDefinitionViewpoint() {
- final URI sysMLProfile = URI.createURI("platform:/plugin/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/configuration/blockDefinitionDiagram.configuration");
+ protected ModelExtent getInSysML1_4Architecture() {
+ final URI sysMLProfile = URI.createURI("platform:/plugin/org.eclipse.papyrus.sysml14.architecture/model/sysml14.architecture");
final Resource fCMProfile = resourceSet.getResource(sysMLProfile, true);
blockDefinitionViewpoint = new BasicModelExtent(fCMProfile.getContents());
return blockDefinitionViewpoint;
}
- /**
- * Get the model extent with the internal block viewpoint.
- *
- * @return The model extent with the internal block viewpoint.
- */
- protected ModelExtent getInInternalBlockViewpoint() {
- final URI sysMLProfile = URI.createURI("platform:/plugin/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/configuration/internalBlockDiagram.configuration");
- final Resource fCMProfile = resourceSet.getResource(sysMLProfile, true);
- internalBlockViewpoint = new BasicModelExtent(fCMProfile.getContents());
- return internalBlockViewpoint;
- }
-
- /**
- * Get the model extent with the parametric viewpoint.
- *
- * @return The model extent with the parametric viewpoint.
- */
- protected ModelExtent getInParametricViewpoint() {
- final URI sysMLProfile = URI.createURI("platform:/plugin/org.eclipse.papyrus.sysml14.diagram.parametric/resources/configuration/parametricDiagram.configuration");
- final Resource fCMProfile = resourceSet.getResource(sysMLProfile, true);
- parametricViewpoint = new BasicModelExtent(fCMProfile.getContents());
- return parametricViewpoint;
- }
-
- /**
- * Get the model extent with the requirement viewpoint.
- *
- * @return The model extent with the requirement viewpoint.
- */
- protected ModelExtent getInRequirementViewpoint() {
- final URI sysMLProfile = URI.createURI("platform:/plugin/org.eclipse.papyrus.sysml14.diagram.requirement/resources/configuration/requirementDiagram.configuration");
- final Resource fCMProfile = resourceSet.getResource(sysMLProfile, true);
- requirementViewpoint = new BasicModelExtent(fCMProfile.getContents());
- return requirementViewpoint;
- }
/**
* Get the model extent for the SysML1.4 profile.
@@ -636,30 +596,6 @@
}
/**
- * Get the model extent with the Requirement Table viewpoint.
- *
- * @return The model extent with the Requirement Table viewpoint.
- */
- protected ModelExtent getInRequirementConfigurationSysML14() {
- final URI sysMLProfile = URI.createURI("platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/resources/configuration/requirementTable.configuration");
- final Resource fCMProfile = resourceSet.getResource(sysMLProfile, true);
- requirementTableViewpoint = new BasicModelExtent(fCMProfile.getContents());
- return requirementTableViewpoint;
- }
-
- /**
- * Get the model extent with the Allocation Table viewpoint.
- *
- * @return The model extent with the Allocation Table viewpoint.
- */
- protected ModelExtent getInAllocationConfigurationSysML14() {
- final URI sysMLProfile = URI.createURI("platform:/plugin/org.eclipse.papyrus.sysml14.nattable.allocation/resources/configuration/allocationTable.configuration");
- final Resource fCMProfile = resourceSet.getResource(sysMLProfile, true);
- allocationTableViewpoint = new BasicModelExtent(fCMProfile.getContents());
- return allocationTableViewpoint;
- }
-
- /**
* {@inheritDoc}
*
* @see org.eclipse.papyrus.migration.common.transformation.AbstractImportTransformation#convertToPapyrus(org.eclipse.emf.common.util.URI, java.lang.String)
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/src/org/eclipse/papyrus/interoperability/sysml14/sysml/xmi/helper/SysMLXMIIDHelper.java b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/src/org/eclipse/papyrus/interoperability/sysml14/sysml/xmi/helper/SysMLXMIIDHelper.java
index f9c79f6..d3abd82 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/src/org/eclipse/papyrus/interoperability/sysml14/sysml/xmi/helper/SysMLXMIIDHelper.java
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/src/org/eclipse/papyrus/interoperability/sysml14/sysml/xmi/helper/SysMLXMIIDHelper.java
@@ -23,8 +23,9 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.papyrus.infra.core.architecture.Stakeholder;
import org.eclipse.papyrus.sysml14.modelelements.Conform;
+import org.eclipse.papyrus.sysml14.modelelements.Stakeholder;
+import org.eclipse.papyrus.sysml14.modelelements.View;
import org.eclipse.papyrus.sysml14.modelelements.Viewpoint;
import org.eclipse.papyrus.uml.tools.utils.UMLUtil;
import org.eclipse.uml2.uml.Comment;
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLAllocationTable.qvto b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLAllocationTable.qvto
index f211cdb..4007213 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLAllocationTable.qvto
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLAllocationTable.qvto
@@ -17,15 +17,17 @@
modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
modeltype UML "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
-modeltype viewpoint "strict" uses 'http://www.eclipse.org/papyrus/infra/viewpoints/configuration';
+modeltype architecture "strict" uses 'http://www.eclipse.org/papyrus/infra/core/architecture';
modeltype SysML11 "strict" uses 'http://www.eclipse.org/papyrus/0.7.0/SysML';
modeltype SysML14 "strict" uses 'http://www.eclipse.org/papyrus/sysml/1.4/SysML';
modeltype nattable "strict" uses 'http://www.eclipse.org/papyrus/nattable/model';
+modeltype nattablerepresentation "strict" uses 'http://www.eclipse.org/papyrus/infra/nattable/representation';
-transformation SysMLAllocationTable(in blockDefinitionViewpoint : viewpoint, in internalBlockViewpoint : viewpoint, in parametricViewpoint : viewpoint, in requirementViewpoint : viewpoint, in umlFile : UML, in inS14Profile : SysML14, in requirementNatTableS11 : nattable, in allocationNatTableS11 : nattable, in requirementNatTableS14 : nattable, in allocationNatTableS14 : nattable, in requirementTableViewPoint : viewpoint, in allocationTableViewPoint : viewpoint, inout notationFile : notation);
+transformation SysMLAllocationTable(in sysml14architecture : architecture, in umlFile : UML, in inS14Profile : SysML14, in requirementNatTableS11 : nattable, in allocationNatTableS11 : nattable, in requirementNatTableS14 : nattable, in allocationNatTableS14 : nattable, inout notationFile : notation);
property rootTableConfigurationS11:nattable::nattableconfiguration::TableConfiguration = requirementNatTableS11.rootObjects()[nattable::nattableconfiguration::TableConfiguration]->any(true);
+property tableRepresentationKindName:String = "SysML 1.4 Allocation Table";
mapping nattable::Table::fromSysML11AllocationTable() : nattable::Table when {self.tableConfiguration.name = "AllocationTable" and self.tableConfiguration.type = "PapyrusSysMLAllocationTable"} {
init{
@@ -36,7 +38,7 @@
var model:UML::Model := umlFile.rootObjects()[uml::Model]->any(true);
result.eAnnotations += model.createEAnnotationForVersioning();
- prototype := getPrototypeInS14Viewpoint(allocationTableViewPoint.rootObjects()->any(true).oclAsType(viewpoint::PapyrusConfiguration));
+ prototype := sysml14architecture.objects()->selectByType(nattablerepresentation::PapyrusTable)->any(curr | curr.name = tableRepresentationKindName).oclAsType(ecore::EObject);
var rootAllocationTableS14 := allocationNatTableS14.rootObjects()->any(true);
if (rootAllocationTableS14.oclIsKindOf(nattable::nattableconfiguration::TableConfiguration)) {
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLBlockDefinitionDiagram.qvto b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLBlockDefinitionDiagram.qvto
index 80c07fe..5694014 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLBlockDefinitionDiagram.qvto
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLBlockDefinitionDiagram.qvto
@@ -19,17 +19,18 @@
modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
modeltype UML "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
-modeltype viewpoint "strict" uses 'http://www.eclipse.org/papyrus/infra/viewpoints/configuration';
+modeltype architecture "strict" uses 'http://www.eclipse.org/papyrus/infra/core/architecture';
modeltype SysML11 "strict" uses 'http://www.eclipse.org/papyrus/0.7.0/SysML';
modeltype SysML14 "strict" uses 'http://www.eclipse.org/papyrus/sysml/1.4/SysML';
modeltype nattable "strict" uses 'http://www.eclipse.org/papyrus/nattable/model';
+modeltype gmfdiagrepresentation "strict" uses 'http://www.eclipse.org/papyrus/infra/gmfdiag/representation';
-transformation SysMLBlockDefinitionDiagram(in blockDefinitionViewpoint : viewpoint, in internalBlockViewpoint : viewpoint, in parametricViewpoint : viewpoint, in requirementViewpoint : viewpoint, in umlFile : UML, in inS14Profile : SysML14, in requirementNatTableS11 : nattable, in allocationNatTableS11 : nattable, in requirementNatTableS14 : nattable, in allocationNatTableS14 : nattable, in requirementTableViewPoint : viewpoint, in allocationTableViewPoint : viewpoint, inout notationFile : notation);
+transformation SysMLBlockDefinitionDiagram(in sysml14architecture : architecture, in umlFile : UML, in inS14Profile : SysML14, in requirementNatTableS11 : nattable, in allocationNatTableS11 : nattable, in requirementNatTableS14 : nattable, in allocationNatTableS14 : nattable, inout notationFile : notation);
// Define needed constants
property diagramName:String = "BlockDefinition";
-property diagramConfigurationName:String = "SysML 1.4 Block Definition";
+property diagramRepresentationKindName:String = "SysML 1.4 Block Definition";
property model:UML::Model = umlFile.rootObjects()[uml::Model]->any(true);
property rootDiagram:notation::Diagram;
@@ -57,7 +58,7 @@
setOrCreateCompatibilityVersion(result);
// Add the viewpoint configuration to the papyrus view style
- addPapyrusViewStyleConfiguration(result, model, getBlockDefinitionPapyrusDiagramConfiguration());
+ addPapyrusDiagramStyleConfiguration(result, model, getBlockDefinitionPapyrusDiagram());
// Remove the needed children
childrenToRemove->forEach(childToRemove){
@@ -70,8 +71,8 @@
}
// Get the requirement papyrus diagram configuration from the viewpoint file
-helper getBlockDefinitionPapyrusDiagramConfiguration() : viewpoint::PapyrusDiagram {
- return blockDefinitionViewpoint.objects()->selectByType(viewpoint::PapyrusDiagram)->any(curr | curr.name = diagramConfigurationName);
+helper getBlockDefinitionPapyrusDiagram() : gmfdiagrepresentation::PapyrusDiagram {
+ return sysml14architecture.objects()->selectByType(gmfdiagrepresentation::PapyrusDiagram)->any(curr | curr.name = diagramRepresentationKindName);
}
// Nodes ans shapes management
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLDiagramsUtils.qvto b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLDiagramsUtils.qvto
index d7575aa..3922380 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLDiagramsUtils.qvto
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLDiagramsUtils.qvto
@@ -16,8 +16,9 @@
modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
modeltype UML "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
-modeltype viewpoint "strict" uses 'http://www.eclipse.org/papyrus/infra/viewpoints/configuration';
-modeltype style "strict" uses 'http://www.eclipse.org/papyrus/infra/viewpoints/policy/style';
+modeltype architecture "strict" uses 'http://www.eclipse.org/papyrus/infra/core/architecture';
+modeltype style "strict" uses 'http://www.eclipse.org/papyrus/infra/gmfdiag/style';
+modeltype gmfdiagrepresentation "strict" uses "http://www.eclipse.org/papyrus/infra/gmfdiag/representation";
/**
* This file provides useful method for SysML diagrams.
@@ -461,23 +462,23 @@
};
diagram.styles+= compatibilityVersionStyle;
};
- compatibilityVersionStyle.stringValue := "1.2.0";
+ compatibilityVersionStyle.stringValue := "1.3.0";
}
/**
* This allows to modify the papyrus view style to add the needed configuration
**/
-helper addPapyrusViewStyleConfiguration(inout diagram:notation::Diagram, in model:UML::Model, in config:viewpoint::PapyrusDiagram){
- // Search the papyrus view style, if not exist, create it
- var requirementPapyrusViewStyle:style::PapyrusViewStyle := diagram.styles->selectByType(style::PapyrusViewStyle)->any(true);
- if (requirementPapyrusViewStyle.oclIsUndefined()) {
- // add the papyrus view style
- requirementPapyrusViewStyle := object style::PapyrusViewStyle{
+helper addPapyrusDiagramStyleConfiguration(inout diagram:notation::Diagram, in model:UML::Model, in papyrusDiagram:gmfdiagrepresentation::PapyrusDiagram){
+ // Search the papyrus diagram style, if not exist, create it
+ var papyrusDiagramStyle:style::PapyrusDiagramStyle := diagram.styles->selectByType(style::PapyrusDiagramStyle)->any(true);
+ if (papyrusDiagramStyle.oclIsUndefined()) {
+ // add the papyrus diagram style
+ papyrusDiagramStyle := object style::PapyrusDiagramStyle{
owner := model.oclAsType(ecore::EObject);
};
- diagram.styles += requirementPapyrusViewStyle;
+ diagram.styles += papyrusDiagramStyle;
};
- requirementPapyrusViewStyle._configuration := config;
+ papyrusDiagramStyle.diagramKind := papyrusDiagram;
}
/**
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLInternalBlockDiagram.qvto b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLInternalBlockDiagram.qvto
index c054fe0..5f868d8 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLInternalBlockDiagram.qvto
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLInternalBlockDiagram.qvto
@@ -19,17 +19,18 @@
modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
modeltype UML "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
-modeltype viewpoint "strict" uses 'http://www.eclipse.org/papyrus/infra/viewpoints/configuration';
+modeltype architecture "strict" uses 'http://www.eclipse.org/papyrus/infra/core/architecture';
modeltype SysML11 "strict" uses 'http://www.eclipse.org/papyrus/0.7.0/SysML';
modeltype SysML14 "strict" uses 'http://www.eclipse.org/papyrus/sysml/1.4/SysML';
modeltype nattable "strict" uses 'http://www.eclipse.org/papyrus/nattable/model';
+modeltype gmfdiagrepresentation "strict" uses 'http://www.eclipse.org/papyrus/infra/gmfdiag/representation';
-transformation SysMLInternalBlockDiagram(in blockDefinitionViewpoint : viewpoint, in internalBlockViewpoint : viewpoint, in parametricViewpoint : viewpoint, in requirementViewpoint : viewpoint, in umlFile : UML, in inS14Profile : SysML14, in requirementNatTableS11 : nattable, in allocationNatTableS11 : nattable, in requirementNatTableS14 : nattable, in allocationNatTableS14 : nattable, in requirementTableViewPoint : viewpoint, in allocationTableViewPoint : viewpoint, inout notationFile : notation);
+transformation SysMLInternalBlockDiagram(in sysml14architecture : architecture, in umlFile : UML, in inS14Profile : SysML14, in requirementNatTableS11 : nattable, in allocationNatTableS11 : nattable, in requirementNatTableS14 : nattable, in allocationNatTableS14 : nattable, inout notationFile : notation);
// Define needed constants
property diagramName:String = "InternalBlock";
-property diagramConfigurationName:String = "SysML 1.4 Internal Block";
+property diagramRepresentationKindName:String = "SysML 1.4 Internal Block";
property model:UML::Model = umlFile.rootObjects()[uml::Model]->any(true);
property rootDiagram:notation::Diagram;
@@ -57,7 +58,7 @@
setOrCreateCompatibilityVersion(result);
// Add the viewpoint configuration to the papyrus view style
- addPapyrusViewStyleConfiguration(result, model, getInternalBlockPapyrusDiagramConfiguration());
+ addPapyrusDiagramStyleConfiguration(result, model, getInternalBlockPapyrusDiagram());
// Remove the needed children
childrenToRemove->forEach(childToRemove){
@@ -70,8 +71,8 @@
}
// Get the requirement papyrus diagram configuration from the viewpoint file
-helper getInternalBlockPapyrusDiagramConfiguration() : viewpoint::PapyrusDiagram {
- return internalBlockViewpoint.objects()->selectByType(viewpoint::PapyrusDiagram)->any(curr | curr.name = diagramConfigurationName);
+helper getInternalBlockPapyrusDiagram() : gmfdiagrepresentation::PapyrusDiagram {
+ return sysml14architecture.objects()->selectByType(gmfdiagrepresentation::PapyrusDiagram)->any(curr | curr.name = diagramRepresentationKindName);
}
// Nodes ans shapes management
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLNotation.qvto b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLNotation.qvto
index d2901ae..253319d 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLNotation.qvto
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLNotation.qvto
@@ -21,13 +21,15 @@
modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
modeltype UML "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
-modeltype viewpoint "strict" uses 'http://www.eclipse.org/papyrus/infra/viewpoints/configuration';
+modeltype architecture "strict" uses 'http://www.eclipse.org/papyrus/infra/core/architecture';
modeltype SysML11 "strict" uses 'http://www.eclipse.org/papyrus/0.7.0/SysML';
modeltype SysML14 "strict" uses 'http://www.eclipse.org/papyrus/sysml/1.4/SysML';
modeltype nattable "strict" uses 'http://www.eclipse.org/papyrus/nattable/model';
+modeltype gmfdiagrepresentation "strict" uses 'http://www.eclipse.org/papyrus/infra/gmfdiag/representation';
+modeltype nattablerepresentation "strict" uses 'http://www.eclipse.org/papyrus/infra/nattable/representation';
-transformation SysMLNotation(in blockDefinitionViewpoint : viewpoint, in internalBlockViewpoint : viewpoint, in parametricViewpoint : viewpoint, in requirementViewpoint : viewpoint, in umlFile : UML, in inS14Profile : SysML14, in requirementNatTableS11 : nattable, in allocationNatTableS11 : nattable, in requirementNatTableS14 : nattable, in allocationNatTableS14 : nattable, in requirementTableViewPoint : viewpoint, in allocationTableViewPoint : viewpoint, inout notationFile : notation);
+transformation SysMLNotation(in sysml14architecture : architecture, in umlFile : UML, in inS14Profile : SysML14, in requirementNatTableS11 : nattable, in allocationNatTableS11 : nattable, in requirementNatTableS14 : nattable, in allocationNatTableS14 : nattable, inout notationFile : notation);
main() {
notationFile.objects()[notation::Diagram]->map filterSysMLDiagrams();
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLParametricDiagram.qvto b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLParametricDiagram.qvto
index 0b77bfa..97b7f0a 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLParametricDiagram.qvto
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLParametricDiagram.qvto
@@ -19,17 +19,18 @@
modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
modeltype UML "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
-modeltype viewpoint "strict" uses 'http://www.eclipse.org/papyrus/infra/viewpoints/configuration';
+modeltype architecture "strict" uses 'http://www.eclipse.org/papyrus/infra/core/architecture';
modeltype SysML11 "strict" uses 'http://www.eclipse.org/papyrus/0.7.0/SysML';
modeltype SysML14 "strict" uses 'http://www.eclipse.org/papyrus/sysml/1.4/SysML';
modeltype nattable "strict" uses 'http://www.eclipse.org/papyrus/nattable/model';
+modeltype gmfdiagrepresentation "strict" uses 'http://www.eclipse.org/papyrus/infra/gmfdiag/representation';
-transformation SysMLParametricDiagram(in blockDefinitionViewpoint : viewpoint, in internalBlockViewpoint : viewpoint, in parametricViewpoint : viewpoint, in requirementViewpoint : viewpoint, in umlFile : UML, in inS14Profile : SysML14, in requirementNatTableS11 : nattable, in allocationNatTableS11 : nattable, in requirementNatTableS14 : nattable, in allocationNatTableS14 : nattable, in requirementTableViewPoint : viewpoint, in allocationTableViewPoint : viewpoint, inout notationFile : notation);
+transformation SysMLParametricDiagram(in sysml14architecture : architecture, in umlFile : UML, in inS14Profile : SysML14, in requirementNatTableS11 : nattable, in allocationNatTableS11 : nattable, in requirementNatTableS14 : nattable, in allocationNatTableS14 : nattable, inout notationFile : notation);
// Define needed constants
property diagramName:String = "Parametric";
-property diagramConfigurationName:String = "SysML 1.4 Parametric";
+property diagramRepresentationKindName:String = "SysML 1.4 Parametric";
property model:UML::Model = umlFile.rootObjects()[uml::Model]->any(true);
property rootDiagram:notation::Diagram;
@@ -57,7 +58,7 @@
setOrCreateCompatibilityVersion(result);
// Add the viewpoint configuration to the papyrus view style
- addPapyrusViewStyleConfiguration(result, model, getParametricPapyrusDiagramConfiguration());
+ addPapyrusDiagramStyleConfiguration(result, model, getParametricPapyrusDiagram());
// Remove the needed children
childrenToRemove->forEach(childToRemove){
@@ -70,8 +71,8 @@
}
// Get the requirement papyrus diagram configuration from the viewpoint file
-helper getParametricPapyrusDiagramConfiguration() : viewpoint::PapyrusDiagram {
- return parametricViewpoint.objects()->selectByType(viewpoint::PapyrusDiagram)->any(curr | curr.name = diagramConfigurationName);
+helper getParametricPapyrusDiagram() : gmfdiagrepresentation::PapyrusDiagram {
+ return sysml14architecture.objects()->selectByType(gmfdiagrepresentation::PapyrusDiagram)->any(curr | curr.name = diagramRepresentationKindName);
}
// Nodes ans shapes management
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLRequirementDiagram.qvto b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLRequirementDiagram.qvto
index a3d63d7..c8ca093 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLRequirementDiagram.qvto
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLRequirementDiagram.qvto
@@ -19,17 +19,18 @@
modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
modeltype UML "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
-modeltype viewpoint "strict" uses 'http://www.eclipse.org/papyrus/infra/viewpoints/configuration';
+modeltype architecture "strict" uses 'http://www.eclipse.org/papyrus/infra/core/architecture';
modeltype SysML11 "strict" uses 'http://www.eclipse.org/papyrus/0.7.0/SysML';
modeltype SysML14 "strict" uses 'http://www.eclipse.org/papyrus/sysml/1.4/SysML';
modeltype nattable "strict" uses 'http://www.eclipse.org/papyrus/nattable/model';
+modeltype gmfdiagrepresentation "strict" uses 'http://www.eclipse.org/papyrus/infra/gmfdiag/representation';
-transformation SysMLRequirementDiagram(in blockDefinitionViewpoint : viewpoint, in internalBlockViewpoint : viewpoint, in parametricViewpoint : viewpoint, in requirementViewpoint : viewpoint, in umlFile : UML, in inS14Profile : SysML14, in requirementNatTableS11 : nattable, in allocationNatTableS11 : nattable, in requirementNatTableS14 : nattable, in allocationNatTableS14 : nattable, in requirementTableViewPoint : viewpoint, in allocationTableViewPoint : viewpoint, inout notationFile : notation);
+transformation SysMLRequirementDiagram(in sysml14architecture : architecture, in umlFile : UML, in inS14Profile : SysML14, in requirementNatTableS11 : nattable, in allocationNatTableS11 : nattable, in requirementNatTableS14 : nattable, in allocationNatTableS14 : nattable, inout notationFile : notation);
// Define needed constants
property diagramName:String = "RequirementDiagram";
-property diagramConfigurationName:String = "SysML 1.4 Requirement";
+property diagramRepresentationKindName:String = "SysML 1.4 Requirement";
property model:UML::Model = umlFile.rootObjects()[uml::Model]->any(true);
property rootDiagram:notation::Diagram;
@@ -58,7 +59,7 @@
setOrCreateCompatibilityVersion(result);
// Add the viewpoint configuration to the papyrus view style
- addPapyrusViewStyleConfiguration(result, model, getRequirementPapyrusDiagramConfiguration());
+ addPapyrusDiagramStyleConfiguration(result, model, getRequirementPapyrusDiagram());
// Remove the needed children
childrenToRemove->forEach(childToRemove){
@@ -71,8 +72,8 @@
}
// Get the requirement papyrus diagram configuration from the viewpoint file
-helper getRequirementPapyrusDiagramConfiguration() : viewpoint::PapyrusDiagram {
- return requirementViewpoint.objects()->selectByType(viewpoint::PapyrusDiagram)->any(curr | curr.name = diagramConfigurationName);
+helper getRequirementPapyrusDiagram() : gmfdiagrepresentation::PapyrusDiagram {
+ return sysml14architecture.objects()->selectByType(gmfdiagrepresentation::PapyrusDiagram)->any(curr | curr.name = diagramRepresentationKindName);
}
// Nodes ans shapes management
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLRequirementTable.qvto b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLRequirementTable.qvto
index 31f69e8..da62915 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLRequirementTable.qvto
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLRequirementTable.qvto
@@ -17,15 +17,17 @@
modeltype notation "strict" uses 'http://www.eclipse.org/gmf/runtime/1.0.2/notation';
modeltype UML "strict" uses 'http://www.eclipse.org/uml2/5.0.0/UML';
modeltype ecore "strict" uses 'http://www.eclipse.org/emf/2002/Ecore';
-modeltype viewpoint "strict" uses 'http://www.eclipse.org/papyrus/infra/viewpoints/configuration';
+modeltype architecture "strict" uses 'http://www.eclipse.org/papyrus/infra/core/architecture';
modeltype SysML11 "strict" uses 'http://www.eclipse.org/papyrus/0.7.0/SysML';
modeltype SysML14 "strict" uses 'http://www.eclipse.org/papyrus/sysml/1.4/SysML';
modeltype nattable "strict" uses 'http://www.eclipse.org/papyrus/nattable/model';
+modeltype nattablerepresentation "strict" uses 'http://www.eclipse.org/papyrus/infra/nattable/representation';
-transformation SysMLRequirementTable(in blockDefinitionViewpoint : viewpoint, in internalBlockViewpoint : viewpoint, in parametricViewpoint : viewpoint, in requirementViewpoint : viewpoint, in umlFile : UML, in inS14Profile : SysML14, in requirementNatTableS11 : nattable, in allocationNatTableS11 : nattable, in requirementNatTableS14 : nattable, in allocationNatTableS14 : nattable, in requirementTableViewPoint : viewpoint, in allocationTableViewPoint : viewpoint, inout notationFile : notation);
+transformation SysMLRequirementTable(in sysml14architecture : architecture, in umlFile : UML, in inS14Profile : SysML14, in requirementNatTableS11 : nattable, in allocationNatTableS11 : nattable, in requirementNatTableS14 : nattable, in allocationNatTableS14 : nattable, inout notationFile : notation);
property rootTableConfigurationS11:nattable::nattableconfiguration::TableConfiguration = requirementNatTableS11.rootObjects()[nattable::nattableconfiguration::TableConfiguration]->any(true);
+property tableRepresentationKindName:String = "SysML 1.4 Requirement Table";
mapping nattable::Table::fromSysML11RequirementTable() : nattable::Table when {self.tableConfiguration.name = "RequirementTable" and self.tableConfiguration.type = "PapyrusSysMLRequirementTable"} {
init{
@@ -41,7 +43,7 @@
tableConfiguration := rootReqTableS14.oclAsType(nattable::nattableconfiguration::TableConfiguration);
};
- prototype := getPrototypeInS14Viewpoint(requirementTableViewPoint.rootObjects()->any(true).oclAsType(viewpoint::PapyrusConfiguration));
+ prototype := sysml14architecture.objects()->selectByType(nattablerepresentation::PapyrusTable)->any(curr | curr.name = tableRepresentationKindName).oclAsType(ecore::EObject);
rowAxisProvidersHistory->forEach(rowAxisProvider){
if (rowAxisProvider.oclIsKindOf(nattable::nattableaxisprovider::AxisProvider)){
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLTablesUtils.qvto b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLTablesUtils.qvto
index 18f5720..4e50346 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLTablesUtils.qvto
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/transform/SysMLTablesUtils.qvto
@@ -30,11 +30,4 @@
*/
helper getManagerInS14Configuration(existingAxisManagerRepresentations:Set(nattableaxisconfiguration::AxisManagerRepresentation), oldManager:nattableaxisconfiguration::AxisManagerRepresentation) : nattableaxisconfiguration::AxisManagerRepresentation {
return existingAxisManagerRepresentations->any(curr | curr.axisManagerId = oldManager.axisManagerId);
-}
-
-/**
- * Get the first model kind in the papyrus configuration.
- **/
-helper getPrototypeInS14Viewpoint(rootS14Prototype:viewpoint::PapyrusConfiguration) : ecore::EObject {
- return rootS14Prototype.viewpoints->any(true).modelKinds->any(true).oclAsType(ecore::EObject);
}
\ No newline at end of file
diff --git a/sysml14/plugins/pom.xml b/sysml14/plugins/pom.xml
index 8ef1969..075e7ed 100644
--- a/sysml14/plugins/pom.xml
+++ b/sysml14/plugins/pom.xml
@@ -11,7 +11,7 @@
</parent>
<name>Papyrus Interoperability SysML1.1 to SysML1.4 Plugins</name>
<description>The top container of SysML Migration plug-ins for the Interoperability.</description>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<modules>
<module>org.eclipse.papyrus.interoperability.sysml14.sysml</module>
diff --git a/sysml14/releng/main/pom.xml b/sysml14/releng/main/pom.xml
index d31f35c..0ba18bf 100644
--- a/sysml14/releng/main/pom.xml
+++ b/sysml14/releng/main/pom.xml
@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.releng</artifactId>
<packaging>pom</packaging>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<parent>
<groupId>org.eclipse.papyrus.interoperability</groupId>
- <artifactId>org.eclipse.papyrus.interoperability.all</artifactId>
+ <artifactId>org.eclipse.papyrus.interoperability.releng</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../../releng/main/pom.xml</relativePath>
</parent>
diff --git a/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target b/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target
index e507b25..1719461 100644
--- a/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target
+++ b/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target
@@ -19,7 +19,7 @@
<unit id="org.eclipse.papyrus.sysml.nattable.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.properties.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.properties.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/extra/"/>
+<repository location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201606071631"/>
@@ -46,6 +46,11 @@
<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.sysml14.feature.source.feature.group" version="0.0.0"/>
+<repository location="https://hudson.eclipse.org/papyrus/job/papyrus-sysml-oxygen/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
diff --git a/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/pom.xml b/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/pom.xml
index d256cd9..641cbd7 100644
--- a/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/pom.xml
+++ b/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.target.parent</artifactId>
<groupId>org.eclipse.papyrus.interoperability</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen</artifactId>
<packaging>eclipse-target-definition</packaging>
diff --git a/sysml14/releng/main/targetplatform/pom.xml b/sysml14/releng/main/targetplatform/pom.xml
index e130b06..e1b5c04 100644
--- a/sysml14/releng/main/targetplatform/pom.xml
+++ b/sysml14/releng/main/targetplatform/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.releng</artifactId>
<groupId>org.eclipse.papyrus.interoperability</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.target.parent</artifactId>
diff --git a/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/category.xml b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/category.xml
index 7e90914..9d25ec7 100644
--- a/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/category.xml
+++ b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/category.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature_0.10.1.qualifier.jar" id="org.eclipse.papyrus.interoperability.sysml14.sysml.feature" version="0.10.1.qualifier">
+ <feature url="features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature_0.11.0.qualifier.jar" id="org.eclipse.papyrus.interoperability.sysml14.sysml.feature" version="0.11.0.qualifier">
<category name="org.eclipse.papyrus.category"/>
</feature>
- <feature url="features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature.source_0.10.1.qualifier.jar" id="org.eclipse.papyrus.interoperability.sysml14.sysml.feature.source" version="0.10.1.qualifier">
+ <feature url="features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature.source_0.11.0.qualifier.jar" id="org.eclipse.papyrus.interoperability.sysml14.sysml.feature.source" version="0.11.0.qualifier">
<category name="org.eclipse.papyrus.category"/>
</feature>
<category-def name="org.eclipse.papyrus.category" label="Papyrus SysML Interoperability">
diff --git a/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/pom.xml b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/pom.xml
index ffb103a..909979e 100644
--- a/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/pom.xml
+++ b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/pom.xml
@@ -60,6 +60,7 @@
</dependencies>
</plugin>
</plugins>
- </build>=
+ </build>
<description>This plugin defines the update site of Papyrus Interoperability SysML14 plugins and feature.</description>
+ <version>0.11.0-SNAPSHOT</version>
</project>
\ No newline at end of file
diff --git a/sysml14/releng/tests/pom.xml b/sysml14/releng/tests/pom.xml
index 3cf49f3..87c4cbf 100644
--- a/sysml14/releng/tests/pom.xml
+++ b/sysml14/releng/tests/pom.xml
@@ -9,7 +9,7 @@
</parent>
<groupId>org.eclipse.papyrus.interoperability.tests</groupId>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.tests.releng</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>targetplatform</module>
diff --git a/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target b/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target
index d70b29a..3bc6145 100644
--- a/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target
+++ b/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target
@@ -19,7 +19,7 @@
<unit id="org.eclipse.papyrus.sysml.nattable.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.properties.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.properties.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/extra/"/>
+<repository location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201606071631"/>
@@ -49,11 +49,16 @@
<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.sysml14.feature.source.feature.group" version="0.0.0"/>
+<repository location="https://hudson.eclipse.org/papyrus/job/papyrus-sysml-oxygen/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.junit.feature.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.uml.m2m.qvto.common.tests.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.uml.m2m.qvto.common.tests.feature.source.feature.group" version="0.0.0"/>
-<repository location="https://hudson.eclipse.org/papyrus/view/Oxygen%20(Master)/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
+<unit id="org.eclipse.papyrus.uml.m2m.qvto.tests.tools.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.uml.m2m.qvto.tests.tools.feature.source.feature.group" version="0.0.0"/>
+<repository location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
diff --git a/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/pom.xml b/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/pom.xml
index fc9210a..fcc17c0 100644
--- a/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/pom.xml
+++ b/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/pom.xml
@@ -2,11 +2,11 @@
<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>
- <artifactId>org.eclipse.papyrus.interoperability.tests.target.parent</artifactId>
+ <artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.tests.target.parent</artifactId>
<groupId>org.eclipse.papyrus.interoperability.tests</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.papyrus.interoperability.targetplatform.oxygen</artifactId>
+ <artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen</artifactId>
<packaging>eclipse-target-definition</packaging>
<name>Interoperability Oxygen Target Definition</name>
<description>This plug-in contains the target definition for Papyrus Interoperability in Oxygen</description>
diff --git a/sysml14/releng/tests/targetplatform/pom.xml b/sysml14/releng/tests/targetplatform/pom.xml
index dd6354d..f15ef47 100644
--- a/sysml14/releng/tests/targetplatform/pom.xml
+++ b/sysml14/releng/tests/targetplatform/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.tests.releng</artifactId>
<groupId>org.eclipse.papyrus.interoperability.tests</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.tests.target.parent</artifactId>
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/META-INF/MANIFEST.MF b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/META-INF/MANIFEST.MF
index f71954f..fa476fe 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/META-INF/MANIFEST.MF
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.papyrus.interoperability.sysml14.sysml.tests;singleton:=true
-Bundle-Version: 0.10.1.qualifier
+Bundle-Version: 0.11.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
@@ -13,7 +13,7 @@
org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
org.eclipse.emf.compare;bundle-version="[3.4.0,4.0.0)",
org.eclipse.papyrus.uml.m2m.qvto.common;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.interoperability.sysml14.sysml;bundle-version="[0.10.1,1.0.0)",
+ org.eclipse.papyrus.interoperability.sysml14.sysml;bundle-version="[0.11.0,1.0.0)",
org.eclipse.papyrus.uml.m2m.qvto.tests.tools;bundle-version="[1.0.0,2.0.0)"
Bundle-Activator: org.eclipse.papyrus.interoperability.sysml14.sysml.tests.Activator
Bundle-ActivationPolicy: lazy
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/pom.xml b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/pom.xml
index 23e122e..b506395 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/pom.xml
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/pom.xml
@@ -5,11 +5,9 @@
<parent>
<groupId>org.eclipse.papyrus.interoperability.tests</groupId>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.tests.plugins</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</parent>
- <groupId>org.eclipse.papyrus.interoperability.tests</groupId>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.tests</artifactId>
- <version>0.10.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
<plugins>
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/AllocationTable/AllocationTable_converted.notation b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/AllocationTable/AllocationTable_converted.notation
index cfdc5c0..f4f7bbd 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/AllocationTable/AllocationTable_converted.notation
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/AllocationTable/AllocationTable_converted.notation
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_MRY5QPpwEeaCyZKNPXLxEw" name="AllocationTable0" currentRowAxisProvider="_MRZgVfpwEeaCyZKNPXLxEw" currentColumnAxisProvider="_MRZgUPpwEeaCyZKNPXLxEw">
+<nattable:Table 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:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablerepresentation="http://www.eclipse.org/papyrus/infra/nattable/representation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_MRY5QPpwEeaCyZKNPXLxEw" name="AllocationTable0" currentRowAxisProvider="_MRZgVfpwEeaCyZKNPXLxEw" currentColumnAxisProvider="_MRZgUPpwEeaCyZKNPXLxEw">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="Imported_From_SysML_1.1_Of__MRY5QPpwEeaCyZKNPXLxEw" source="Imported_From_SysML_1.1">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_Source_Model_Name_Of_Imported_From_SysML_1.1_Of__MRY5QPpwEeaCyZKNPXLxEw" key="Papyrus_Source_Model_Name" value="AllocationTable_converted"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of_Imported_From_SysML_1.1_Of__MRY5QPpwEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Date" value="20170228165646"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of_Imported_From_SysML_1.1_Of__MRY5QPpwEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.10.1.qualifier"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of_Imported_From_SysML_1.1_Of__MRY5QPpwEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Date" value="20170601102542"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of_Imported_From_SysML_1.1_Of__MRY5QPpwEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.11.0.qualifier"/>
</eAnnotations>
<context xmi:type="uml:Model" href="AllocationTable_converted.uml#_m5FkYPkiEeavtrWHCQ8Tnw"/>
<owner xmi:type="uml:Model" href="AllocationTable_converted.uml#_m5FkYPkiEeavtrWHCQ8Tnw"/>
- <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.allocation/resources/configuration/allocationTable.configuration#_j2LQIC7uEeWklMXvaoXzgQ"/>
+ <prototype xmi:type="nattablerepresentation:PapyrusTable" href="platform:/plugin/org.eclipse.papyrus.sysml14.architecture/model/sysml14.architecture#org.eclipse.papyrus.SysML14.architecture.allocationTable"/>
<tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.allocation/resources/allocation.nattableconfiguration#/"/>
<columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_MRZgUPpwEeaCyZKNPXLxEw" description="This provider provides the default columns for the SysML Allocation Table" name="SysMLAllocationFeatureProvider">
<axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_MRZgUfpwEeaCyZKNPXLxEw">
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/AllocationTable/AllocationTable_converted.uml b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/AllocationTable/AllocationTable_converted.uml
index 22b0042..f76264a 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/AllocationTable/AllocationTable_converted.uml
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/AllocationTable/AllocationTable_converted.uml
@@ -3,8 +3,8 @@
<uml:Model xmi:id="_m5FkYPkiEeavtrWHCQ8Tnw" name="RootElement">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="Imported_From_SysML_11_Of__m5FkYPkiEeavtrWHCQ8Tnw" source="Imported_From_SysML_1.1">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_Source_Model_Name_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_Source_Model_Name" value="AllocationTable"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Date" value="20170228165645"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.10.1.qualifier"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Date" value="20170601102539"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.11.0.qualifier"/>
</eAnnotations>
<ownedComment xmi:type="uml:Comment" xmi:id="_V8AtQPnoEeauDtoDZwIqjw"/>
<ownedComment xmi:type="uml:Comment" xmi:id="_cPVFcPnoEeauDtoDZwIqjw"/>
@@ -165,7 +165,7 @@
<standard:Create xmi:id="createStereotype_Of_createOperation_Of__fih7kPnoEeauDtoDZwIqjw" base_BehavioralFeature="createOperation_Of__fih7kPnoEeauDtoDZwIqjw"/>
<ModelElements:Stakeholder xmi:id="stakeholder2_Of__fih7kPnoEeauDtoDZwIqjw" base_Classifier="baseClassifier_Of_stakeholder2_Of__fih7kPnoEeauDtoDZwIqjw"/>
<ModelElements:Stakeholder xmi:id="stakeholder1_Of__fih7kPnoEeauDtoDZwIqjw" base_Classifier="baseClassifier_Of_stakeholder1_Of__fih7kPnoEeauDtoDZwIqjw"/>
- <ModelElements:Viewpoint xmi:id="_fih7kPnoEeauDtoDZwIqjw" base_Class="_fiW8cPnoEeauDtoDZwIqjw" concernList="concernList_1_Of__fih7kPnoEeauDtoDZwIqjw concernList_2_Of__fih7kPnoEeauDtoDZwIqjw" purpose="test1
test2
test3" stakeholder="stakeholder1_Of__fih7kPnoEeauDtoDZwIqjw stakeholder2_Of__fih7kPnoEeauDtoDZwIqjw">
+ <ModelElements:Viewpoint xmi:id="_fih7kPnoEeauDtoDZwIqjw" base_Class="_fiW8cPnoEeauDtoDZwIqjw" concernList="concernList_1_Of__fih7kPnoEeauDtoDZwIqjw concernList_2_Of__fih7kPnoEeauDtoDZwIqjw" purpose="test1
test2
test3" stakeholder="stakeholder2_Of__fih7kPnoEeauDtoDZwIqjw stakeholder1_Of__fih7kPnoEeauDtoDZwIqjw">
<language>C++</language>
<language>C</language>
<language>OCL</language>
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/BlockDefinitionDiagram/BlockDefinitionDiagram_converted.notation b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/BlockDefinitionDiagram/BlockDefinitionDiagram_converted.notation
index 38e152c..33117bc 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/BlockDefinitionDiagram/BlockDefinitionDiagram_converted.notation
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/BlockDefinitionDiagram/BlockDefinitionDiagram_converted.notation
@@ -1,9 +1,9 @@
<?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:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" 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:id="_j-e1IPp6EeaCyZKNPXLxEw" type="PapyrusUMLClassDiagram" name="New Block Definition 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:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:style_1="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_j-e1IPp6EeaCyZKNPXLxEw" type="PapyrusUMLClassDiagram" name="New Block Definition Diagram" measurementUnit="Pixel">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="Imported_From_SysML_1.1_Of__j-e1IPp6EeaCyZKNPXLxEw" source="Imported_From_SysML_1.1">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_Source_Model_Name_Of_Imported_From_SysML_1.1_Of__j-e1IPp6EeaCyZKNPXLxEw" key="Papyrus_Source_Model_Name" value="BlockDefinitionDiagram_converted"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of_Imported_From_SysML_1.1_Of__j-e1IPp6EeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Date" value="20170228165652"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of_Imported_From_SysML_1.1_Of__j-e1IPp6EeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.10.1.qualifier"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of_Imported_From_SysML_1.1_Of__j-e1IPp6EeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Date" value="20170601102604"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of_Imported_From_SysML_1.1_Of__j-e1IPp6EeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.11.0.qualifier"/>
</eAnnotations>
<children xmi:type="notation:Shape" xmi:id="_n4yukPp6EeaCyZKNPXLxEw" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_n40jwPp6EeaCyZKNPXLxEw" type="Class_NameLabel">
@@ -732,9 +732,12 @@
<styles xmi:type="notation:DiagramStyle" xmi:id="_j-e1Ifp6EeaCyZKNPXLxEw"/>
<styles xmi:type="style:PapyrusViewStyle" xmi:id="_j-e1Ivp6EeaCyZKNPXLxEw">
<owner xmi:type="uml:Model" href="BlockDefinitionDiagram_converted.uml#_m5FkYPkiEeavtrWHCQ8Tnw"/>
- <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/configuration/blockDefinitionDiagram.configuration#_ZrBf4JaBEeS8eNvSwD0lgA"/>
</styles>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_j--kYPp6EeaCyZKNPXLxEw" name="diagram_compatibility_version" stringValue="1.2.0"/>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_j--kYPp6EeaCyZKNPXLxEw" name="diagram_compatibility_version" stringValue="1.3.0"/>
+ <styles xmi:type="style_1:PapyrusDiagramStyle" xmi:id="PapyrusDiagramStyle_Of__j-e1IPp6EeaCyZKNPXLxEw">
+ <owner xmi:type="uml:Model" href="BlockDefinitionDiagram_converted.uml#_m5FkYPkiEeavtrWHCQ8Tnw"/>
+ <diagramKind xmi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.sysml14.architecture/model/sysml14.architecture#org.eclipse.papyrus.SysML14.architecture.bdd"/>
+ </styles>
<element xmi:type="uml:Model" href="BlockDefinitionDiagram_converted.uml#_m5FkYPkiEeavtrWHCQ8Tnw"/>
<edges xmi:type="notation:Connector" xmi:id="_4qQIgPqZEeaCyZKNPXLxEw" type="Dependency_Edge" source="_oc3sAPp6EeaCyZKNPXLxEw" target="_3fSiUPp6EeaCyZKNPXLxEw">
<children xmi:type="notation:DecorationNode" xmi:id="_4qQIg_qZEeaCyZKNPXLxEw" type="Dependency_StereotypeLabel">
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/BlockDefinitionDiagram/BlockDefinitionDiagram_converted.uml b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/BlockDefinitionDiagram/BlockDefinitionDiagram_converted.uml
index 25a60af..fcd6cb8 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/BlockDefinitionDiagram/BlockDefinitionDiagram_converted.uml
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/BlockDefinitionDiagram/BlockDefinitionDiagram_converted.uml
@@ -3,8 +3,8 @@
<uml:Model xmi:id="_m5FkYPkiEeavtrWHCQ8Tnw" name="RootElement">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="Imported_From_SysML_11_Of__m5FkYPkiEeavtrWHCQ8Tnw" source="Imported_From_SysML_1.1">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_Source_Model_Name_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_Source_Model_Name" value="BlockDefinitionDiagram"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Date" value="20170228165651"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.10.1.qualifier"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Date" value="20170601102601"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.11.0.qualifier"/>
</eAnnotations>
<ownedComment xmi:type="uml:Comment" xmi:id="_V8AtQPnoEeauDtoDZwIqjw" annotatedElement="_3NRlQPp6EeaCyZKNPXLxEw"/>
<ownedComment xmi:type="uml:Comment" xmi:id="_cPVFcPnoEeauDtoDZwIqjw"/>
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/InternalBlockDiagram/InternalBlockDiagram_converted.notation b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/InternalBlockDiagram/InternalBlockDiagram_converted.notation
index a716713..233f913 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/InternalBlockDiagram/InternalBlockDiagram_converted.notation
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/InternalBlockDiagram/InternalBlockDiagram_converted.notation
@@ -1,9 +1,9 @@
<?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:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" 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:id="_GKEAkPpuEeaCyZKNPXLxEw" type="CompositeStructure" name="New Internal Block 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:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:style_1="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_GKEAkPpuEeaCyZKNPXLxEw" type="CompositeStructure" name="New Internal Block Diagram" measurementUnit="Pixel">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="Imported_From_SysML_1.1_Of__GKEAkPpuEeaCyZKNPXLxEw" source="Imported_From_SysML_1.1">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_Source_Model_Name_Of_Imported_From_SysML_1.1_Of__GKEAkPpuEeaCyZKNPXLxEw" key="Papyrus_Source_Model_Name" value="InternalBlockDiagram_converted"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of_Imported_From_SysML_1.1_Of__GKEAkPpuEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Date" value="20170228165657"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of_Imported_From_SysML_1.1_Of__GKEAkPpuEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.10.1.qualifier"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of_Imported_From_SysML_1.1_Of__GKEAkPpuEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Date" value="20170601102632"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of_Imported_From_SysML_1.1_Of__GKEAkPpuEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.11.0.qualifier"/>
</eAnnotations>
<children xmi:type="notation:Shape" xmi:id="_GKEnoPpuEeaCyZKNPXLxEw" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_GKFOsPpuEeaCyZKNPXLxEw" type="Class_NameLabel">
@@ -283,9 +283,12 @@
<styles xmi:type="notation:DiagramStyle" xmi:id="_GKEAkfpuEeaCyZKNPXLxEw"/>
<styles xmi:type="style:PapyrusViewStyle" xmi:id="_GKEAkvpuEeaCyZKNPXLxEw">
<owner xmi:type="uml:Class" href="InternalBlockDiagram_converted.uml#_TIQzQPnoEeauDtoDZwIqjw"/>
- <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/configuration/internalBlockDiagram.configuration#_ZrBf4JaBEeS8eNvSwD0lgA"/>
</styles>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_GLNQEPpuEeaCyZKNPXLxEw" name="diagram_compatibility_version" stringValue="1.2.0"/>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_GLNQEPpuEeaCyZKNPXLxEw" name="diagram_compatibility_version" stringValue="1.3.0"/>
+ <styles xmi:type="style_1:PapyrusDiagramStyle" xmi:id="PapyrusDiagramStyle_Of__GKEAkPpuEeaCyZKNPXLxEw">
+ <owner xmi:type="uml:Model" href="InternalBlockDiagram_converted.uml#_m5FkYPkiEeavtrWHCQ8Tnw"/>
+ <diagramKind xmi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.sysml14.architecture/model/sysml14.architecture#org.eclipse.papyrus.SysML14.architecture.ibd"/>
+ </styles>
<element xmi:type="uml:Class" href="InternalBlockDiagram_converted.uml#_TIQzQPnoEeauDtoDZwIqjw"/>
<edges xmi:type="notation:Connector" xmi:id="_Tjqe8PpuEeaCyZKNPXLxEw" type="Connector_Edge" source="_S4pzEPpuEeaCyZKNPXLxEw" target="_RyHo0PpuEeaCyZKNPXLxEw">
<children xmi:type="notation:DecorationNode" xmi:id="_TjrGAPpuEeaCyZKNPXLxEw" type="Connector_StereotypeLabel">
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/InternalBlockDiagram/InternalBlockDiagram_converted.uml b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/InternalBlockDiagram/InternalBlockDiagram_converted.uml
index c448cb6..7738e4e 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/InternalBlockDiagram/InternalBlockDiagram_converted.uml
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/InternalBlockDiagram/InternalBlockDiagram_converted.uml
@@ -3,8 +3,8 @@
<uml:Model xmi:id="_m5FkYPkiEeavtrWHCQ8Tnw" name="RootElement">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="Imported_From_SysML_11_Of__m5FkYPkiEeavtrWHCQ8Tnw" source="Imported_From_SysML_1.1">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_Source_Model_Name_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_Source_Model_Name" value="InternalBlockDiagram"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Date" value="20170228165656"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.10.1.qualifier"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Date" value="20170601102630"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.11.0.qualifier"/>
</eAnnotations>
<ownedComment xmi:type="uml:Comment" xmi:id="_V8AtQPnoEeauDtoDZwIqjw"/>
<ownedComment xmi:type="uml:Comment" xmi:id="_cPVFcPnoEeauDtoDZwIqjw"/>
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/ParametricDiagram/ParametricDiagram_converted.notation b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/ParametricDiagram/ParametricDiagram_converted.notation
index 2c0df48..f36e292 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/ParametricDiagram/ParametricDiagram_converted.notation
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/ParametricDiagram/ParametricDiagram_converted.notation
@@ -1,9 +1,9 @@
<?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:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" 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:id="_GQBpMPpvEeaCyZKNPXLxEw" type="CompositeStructure" name="New Parametric 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:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:style_1="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_GQBpMPpvEeaCyZKNPXLxEw" type="CompositeStructure" name="New Parametric Diagram" measurementUnit="Pixel">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="Imported_From_SysML_1.1_Of__GQBpMPpvEeaCyZKNPXLxEw" source="Imported_From_SysML_1.1">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_Source_Model_Name_Of_Imported_From_SysML_1.1_Of__GQBpMPpvEeaCyZKNPXLxEw" key="Papyrus_Source_Model_Name" value="ParametricDiagram_converted"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of_Imported_From_SysML_1.1_Of__GQBpMPpvEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Date" value="20170228165700"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of_Imported_From_SysML_1.1_Of__GQBpMPpvEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.10.1.qualifier"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of_Imported_From_SysML_1.1_Of__GQBpMPpvEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Date" value="20170601102643"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of_Imported_From_SysML_1.1_Of__GQBpMPpvEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.11.0.qualifier"/>
</eAnnotations>
<children xmi:type="notation:Shape" xmi:id="_GQCQQPpvEeaCyZKNPXLxEw" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_GQCQQvpvEeaCyZKNPXLxEw" type="Class_NameLabel">
@@ -228,9 +228,12 @@
<styles xmi:type="notation:DiagramStyle" xmi:id="_GQBpMfpvEeaCyZKNPXLxEw"/>
<styles xmi:type="style:PapyrusViewStyle" xmi:id="_GQBpMvpvEeaCyZKNPXLxEw">
<owner xmi:type="uml:Class" href="ParametricDiagram_converted.uml#_TIQzQPnoEeauDtoDZwIqjw"/>
- <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.parametric/resources/configuration/parametricDiagram.configuration#_ZrBf4JaBEeS8eNvSwD0lgA"/>
</styles>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_GQlC0PpvEeaCyZKNPXLxEw" name="diagram_compatibility_version" stringValue="1.2.0"/>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_GQlC0PpvEeaCyZKNPXLxEw" name="diagram_compatibility_version" stringValue="1.3.0"/>
+ <styles xmi:type="style_1:PapyrusDiagramStyle" xmi:id="PapyrusDiagramStyle_Of__GQBpMPpvEeaCyZKNPXLxEw">
+ <owner xmi:type="uml:Model" href="ParametricDiagram_converted.uml#_m5FkYPkiEeavtrWHCQ8Tnw"/>
+ <diagramKind xmi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.sysml14.architecture/model/sysml14.architecture#org.eclipse.papyrus.SysML14.architecture.parametric"/>
+ </styles>
<element xmi:type="uml:Class" href="ParametricDiagram_converted.uml#_TIQzQPnoEeauDtoDZwIqjw"/>
<edges xmi:type="notation:Connector" xmi:id="_UqYZ8PpvEeaCyZKNPXLxEw" type="Comment_AnnotatedElementEdge" source="_IXXwMPpvEeaCyZKNPXLxEw" target="_Tw8QgPpvEeaCyZKNPXLxEw">
<styles xmi:type="notation:FontStyle" xmi:id="_UqYZ8fpvEeaCyZKNPXLxEw"/>
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/ParametricDiagram/ParametricDiagram_converted.uml b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/ParametricDiagram/ParametricDiagram_converted.uml
index fbb743e..38ec4aa 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/ParametricDiagram/ParametricDiagram_converted.uml
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/ParametricDiagram/ParametricDiagram_converted.uml
@@ -3,8 +3,8 @@
<uml:Model xmi:id="_m5FkYPkiEeavtrWHCQ8Tnw" name="RootElement">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="Imported_From_SysML_11_Of__m5FkYPkiEeavtrWHCQ8Tnw" source="Imported_From_SysML_1.1">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_Source_Model_Name_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_Source_Model_Name" value="ParametricDiagram"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Date" value="20170228165659"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.10.1.qualifier"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Date" value="20170601102641"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.11.0.qualifier"/>
</eAnnotations>
<ownedComment xmi:type="uml:Comment" xmi:id="_V8AtQPnoEeauDtoDZwIqjw"/>
<ownedComment xmi:type="uml:Comment" xmi:id="_cPVFcPnoEeauDtoDZwIqjw"/>
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementDiagram/RequirementDiagram_converted.notation b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementDiagram/RequirementDiagram_converted.notation
index 7626743..208e619 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementDiagram/RequirementDiagram_converted.notation
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementDiagram/RequirementDiagram_converted.notation
@@ -1,9 +1,9 @@
<?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:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" 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:id="_icBIYPpwEeaCyZKNPXLxEw" type="PapyrusUMLClassDiagram" name="New Requirements 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:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:style_1="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_icBIYPpwEeaCyZKNPXLxEw" type="PapyrusUMLClassDiagram" name="New Requirements Diagram" measurementUnit="Pixel">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="Imported_From_SysML_1.1_Of__icBIYPpwEeaCyZKNPXLxEw" source="Imported_From_SysML_1.1">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_Source_Model_Name_Of_Imported_From_SysML_1.1_Of__icBIYPpwEeaCyZKNPXLxEw" key="Papyrus_Source_Model_Name" value="RequirementDiagram_converted"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of_Imported_From_SysML_1.1_Of__icBIYPpwEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Date" value="20170228165705"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of_Imported_From_SysML_1.1_Of__icBIYPpwEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.10.1.qualifier"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of_Imported_From_SysML_1.1_Of__icBIYPpwEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Date" value="20170601102702"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of_Imported_From_SysML_1.1_Of__icBIYPpwEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.11.0.qualifier"/>
</eAnnotations>
<children xmi:type="notation:Shape" xmi:id="_kMluIPpwEeaCyZKNPXLxEw" type="Class_Shape">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kNE2UPpwEeaCyZKNPXLxEw" source="Stereotype_Annotation">
@@ -742,9 +742,12 @@
<styles xmi:type="notation:DiagramStyle" xmi:id="_icBIYfpwEeaCyZKNPXLxEw"/>
<styles xmi:type="style:PapyrusViewStyle" xmi:id="_icBIYvpwEeaCyZKNPXLxEw">
<owner xmi:type="uml:Model" href="RequirementDiagram_converted.uml#_m5FkYPkiEeavtrWHCQ8Tnw"/>
- <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.requirement/resources/configuration/requirementDiagram.configuration#_ZrBf4JaBEeS8eNvSwD0lgA"/>
</styles>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_iciFwPpwEeaCyZKNPXLxEw" name="diagram_compatibility_version" stringValue="1.2.0"/>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_iciFwPpwEeaCyZKNPXLxEw" name="diagram_compatibility_version" stringValue="1.3.0"/>
+ <styles xmi:type="style_1:PapyrusDiagramStyle" xmi:id="PapyrusDiagramStyle_Of__icBIYPpwEeaCyZKNPXLxEw">
+ <owner xmi:type="uml:Model" href="RequirementDiagram_converted.uml#_m5FkYPkiEeavtrWHCQ8Tnw"/>
+ <diagramKind xmi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.sysml14.architecture/model/sysml14.architecture#org.eclipse.papyrus.SysML14.architecture.requirement"/>
+ </styles>
<element xmi:type="uml:Model" href="RequirementDiagram_converted.uml#_m5FkYPkiEeavtrWHCQ8Tnw"/>
<edges xmi:type="notation:Connector" xmi:id="_jiUCF_pwEeaCyZKNPXLxEw" type="StereotypeCommentLink">
<styles xmi:type="notation:FontStyle" xmi:id="_jiUCGPpwEeaCyZKNPXLxEw"/>
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementDiagram/RequirementDiagram_converted.uml b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementDiagram/RequirementDiagram_converted.uml
index e86788c..c005f48 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementDiagram/RequirementDiagram_converted.uml
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementDiagram/RequirementDiagram_converted.uml
@@ -3,8 +3,8 @@
<uml:Model xmi:id="_m5FkYPkiEeavtrWHCQ8Tnw" name="RootElement">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="Imported_From_SysML_11_Of__m5FkYPkiEeavtrWHCQ8Tnw" source="Imported_From_SysML_1.1">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_Source_Model_Name_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_Source_Model_Name" value="RequirementDiagram"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Date" value="20170228165703"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.10.1.qualifier"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Date" value="20170601102701"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.11.0.qualifier"/>
</eAnnotations>
<ownedComment xmi:type="uml:Comment" xmi:id="_V8AtQPnoEeauDtoDZwIqjw"/>
<ownedComment xmi:type="uml:Comment" xmi:id="_cPVFcPnoEeauDtoDZwIqjw"/>
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementTable/RequirementTable_converted.notation b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementTable/RequirementTable_converted.notation
index 9475716..920d827 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementTable/RequirementTable_converted.notation
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementTable/RequirementTable_converted.notation
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_Q0lXoPpwEeaCyZKNPXLxEw" name="RequirementTable0" currentRowAxisProvider="_Q0lXpfpwEeaCyZKNPXLxEw" currentColumnAxisProvider="_Q0lXofpwEeaCyZKNPXLxEw">
+<nattable:Table 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:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablerepresentation="http://www.eclipse.org/papyrus/infra/nattable/representation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_Q0lXoPpwEeaCyZKNPXLxEw" name="RequirementTable0" currentRowAxisProvider="_Q0lXpfpwEeaCyZKNPXLxEw" currentColumnAxisProvider="_Q0lXofpwEeaCyZKNPXLxEw">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="Imported_From_SysML_1.1_Of__Q0lXoPpwEeaCyZKNPXLxEw" source="Imported_From_SysML_1.1">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_Source_Model_Name_Of_Imported_From_SysML_1.1_Of__Q0lXoPpwEeaCyZKNPXLxEw" key="Papyrus_Source_Model_Name" value="RequirementTable_converted"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of_Imported_From_SysML_1.1_Of__Q0lXoPpwEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Date" value="20170228165709"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of_Imported_From_SysML_1.1_Of__Q0lXoPpwEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.10.1.qualifier"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of_Imported_From_SysML_1.1_Of__Q0lXoPpwEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Date" value="20170601102710"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of_Imported_From_SysML_1.1_Of__Q0lXoPpwEeaCyZKNPXLxEw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.11.0.qualifier"/>
</eAnnotations>
<context xmi:type="uml:Model" href="RequirementTable_converted.uml#_m5FkYPkiEeavtrWHCQ8Tnw"/>
<owner xmi:type="uml:Model" href="RequirementTable_converted.uml#_m5FkYPkiEeavtrWHCQ8Tnw"/>
- <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/resources/configuration/requirementTable.configuration#_j2LQIy7uEeWklMXvaoXzgQ"/>
+ <prototype xmi:type="nattablerepresentation:PapyrusTable" href="platform:/plugin/org.eclipse.papyrus.sysml14.architecture/model/sysml14.architecture#org.eclipse.papyrus.SysML14.architecture.reqTable"/>
<tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirement.nattableconfiguration#/"/>
<columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_Q0lXofpwEeaCyZKNPXLxEw" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
<axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_Q0lXovpwEeaCyZKNPXLxEw" element="property_of_stereotype:/SysML::Requirements::Requirement::id">
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementTable/RequirementTable_converted.uml b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementTable/RequirementTable_converted.uml
index 2dcccce..6f7c931 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementTable/RequirementTable_converted.uml
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/RequirementTable/RequirementTable_converted.uml
@@ -3,8 +3,8 @@
<uml:Model xmi:id="_m5FkYPkiEeavtrWHCQ8Tnw" name="RootElement">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="Imported_From_SysML_11_Of__m5FkYPkiEeavtrWHCQ8Tnw" source="Imported_From_SysML_1.1">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_Source_Model_Name_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_Source_Model_Name" value="RequirementTable"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Date" value="20170228165708"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.10.1.qualifier"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Date" value="20170601102708"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.11.0.qualifier"/>
</eAnnotations>
<ownedComment xmi:type="uml:Comment" xmi:id="_V8AtQPnoEeauDtoDZwIqjw"/>
<ownedComment xmi:type="uml:Comment" xmi:id="_cPVFcPnoEeauDtoDZwIqjw"/>
@@ -166,7 +166,7 @@
<standard:Create xmi:id="createStereotype_Of_createOperation_Of__fih7kPnoEeauDtoDZwIqjw" base_BehavioralFeature="createOperation_Of__fih7kPnoEeauDtoDZwIqjw"/>
<ModelElements:Stakeholder xmi:id="stakeholder2_Of__fih7kPnoEeauDtoDZwIqjw" base_Classifier="baseClassifier_Of_stakeholder2_Of__fih7kPnoEeauDtoDZwIqjw"/>
<ModelElements:Stakeholder xmi:id="stakeholder1_Of__fih7kPnoEeauDtoDZwIqjw" base_Classifier="baseClassifier_Of_stakeholder1_Of__fih7kPnoEeauDtoDZwIqjw"/>
- <ModelElements:Viewpoint xmi:id="_fih7kPnoEeauDtoDZwIqjw" base_Class="_fiW8cPnoEeauDtoDZwIqjw" concernList="concernList_1_Of__fih7kPnoEeauDtoDZwIqjw concernList_2_Of__fih7kPnoEeauDtoDZwIqjw" purpose="test1
test2
test3" stakeholder="stakeholder2_Of__fih7kPnoEeauDtoDZwIqjw stakeholder1_Of__fih7kPnoEeauDtoDZwIqjw">
+ <ModelElements:Viewpoint xmi:id="_fih7kPnoEeauDtoDZwIqjw" base_Class="_fiW8cPnoEeauDtoDZwIqjw" concernList="concernList_1_Of__fih7kPnoEeauDtoDZwIqjw concernList_2_Of__fih7kPnoEeauDtoDZwIqjw" purpose="test1
test2
test3" stakeholder="stakeholder1_Of__fih7kPnoEeauDtoDZwIqjw stakeholder2_Of__fih7kPnoEeauDtoDZwIqjw">
<language>C++</language>
<language>C</language>
<language>OCL</language>
diff --git a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/Semantic/Semantic_converted.uml b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/Semantic/Semantic_converted.uml
index 2347f45..29320a3 100644
--- a/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/Semantic/Semantic_converted.uml
+++ b/sysml14/tests/org.eclipse.papyrus.interoperability.sysml14.sysml.tests/resources/ExpectedResult/Semantic/Semantic_converted.uml
@@ -3,8 +3,8 @@
<uml:Model xmi:id="_m5FkYPkiEeavtrWHCQ8Tnw" name="RootElement">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="Imported_From_SysML_11_Of__m5FkYPkiEeavtrWHCQ8Tnw" source="Imported_From_SysML_1.1">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_Source_Model_Name_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_Source_Model_Name" value="Semantic"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Date" value="20170228165713"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.10.1.qualifier"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Date_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Date" value="20170601102746"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="Papyrus_SysML_Migration_Bundle_Version_Of__m5FkYPkiEeavtrWHCQ8Tnw" key="Papyrus_SysML_Migration_Bundle_Version" value="0.11.0.qualifier"/>
</eAnnotations>
<ownedComment xmi:type="uml:Comment" xmi:id="_V8AtQPnoEeauDtoDZwIqjw"/>
<ownedComment xmi:type="uml:Comment" xmi:id="_cPVFcPnoEeauDtoDZwIqjw"/>
diff --git a/sysml14/tests/pom.xml b/sysml14/tests/pom.xml
index 6e557d7..ddf0e2d 100644
--- a/sysml14/tests/pom.xml
+++ b/sysml14/tests/pom.xml
@@ -9,7 +9,7 @@
</parent>
<groupId>org.eclipse.papyrus.interoperability.tests</groupId>
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.tests.plugins</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>The top container of SysML migration tests plug-ins for the Interoperability.</description>
