Solve conflicts

Change-Id: Ifd18ed0bfc16fdc76c04f065083e53b0892f90a9

Solve conflicts
Change-Id: Ifd18ed0bfc16fdc76c04f065083e53b0892f90a9
af50b05e · Alberto Debiasi · 95b93e04 · af50b05e · af50b05e · af50b05e
Commit af50b05e authored 5 years ago by Alberto Debiasi
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generate.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generate.xml
@@ -46,7 +46,7 @@
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.0.201703081153.jar"/>
+        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201903050251.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml.profile.standard_1.0.100.v20170227-0935.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.sysml_1.2.0.201703081153.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>

--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateErrorModel.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateErrorModel.xml
@@ -46,7 +46,7 @@
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.0.201703081153.jar"/>
+        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201903050251.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml.profile.standard_1.0.100.v20170227-0935.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.sysml_1.2.0.201703081153.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>

--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateFaultExtensions.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateFaultExtensions.xml
@@ -46,7 +46,7 @@
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.0.201703081153.jar"/>
+        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201903050251.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml.profile.standard_1.0.100.v20170227-0935.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.sysml_1.2.0.201703081153.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>

--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/.gitignore
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/.gitignore
+/TestCheckContractRefinementOfCHESSComponent.java
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/contentassist/.FlaDslProposalProvider.xtendbin
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/contentassist/.FlaDslProposalProvider.xtendbin
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/labeling/.FlaDslDescriptionLabelProvider.xtendbin
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/labeling/.FlaDslDescriptionLabelProvider.xtendbin
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/labeling/.FlaDslLabelProvider.xtendbin
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/labeling/.FlaDslLabelProvider.xtendbin
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/outline/.FlaDslOutlineTreeProvider.xtendbin
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/outline/.FlaDslOutlineTreeProvider.xtendbin
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/quickfix/.FlaDslQuickfixProvider.xtendbin
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/quickfix/.FlaDslQuickfixProvider.xtendbin
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/formatting/.FlaDslFormatter.xtendbin
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/formatting/.FlaDslFormatter.xtendbin
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/generator/.FlaDslGenerator.xtendbin
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/generator/.FlaDslGenerator.xtendbin
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/scoping/.FlaDslScopeProvider.xtendbin
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/scoping/.FlaDslScopeProvider.xtendbin
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/validation/.FlaDslValidator.xtendbin
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/validation/.FlaDslValidator.xtendbin
--- a/plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml
+++ b/plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml
@@ -37,7 +37,7 @@
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.6.6.201610060831.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201812120252.jar"/>
+        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201903050251.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>

--- a/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/commands/InstantiateParamArchAsOssFileCommand.class
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/commands/InstantiateParamArchAsOssFileCommand.class