[Releng] Fix dependency versions

18 files changed, 197 insertions, 194 deletions

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
index e10010b14ff..5ee62ee2e5d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
@@ -1,4 +1,18 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.sysml.diagram.blockdefinition,

+ org.eclipse.papyrus.sysml.diagram.blockdefinition.command,

+ org.eclipse.papyrus.sysml.diagram.blockdefinition.dnd.helper,

+ org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.part,

+ org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy,

+ org.eclipse.papyrus.sysml.diagram.blockdefinition.factory,

+ org.eclipse.papyrus.sysml.diagram.blockdefinition.handler,

+ org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice,

+ org.eclipse.papyrus.sysml.diagram.blockdefinition.messages,

+ org.eclipse.papyrus.sysml.diagram.blockdefinition.part,

+ org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences,

+ org.eclipse.papyrus.sysml.diagram.blockdefinition.provider,

+ org.eclipse.papyrus.sysml.diagram.blockdefinition.ui,

+ org.eclipse.papyrus.sysml.diagram.blockdefinition.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.papyrus.sysml;bundle-version="1.0.0",

@@ -34,32 +48,18 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.sysml.diagram.blockdefinition,

- org.eclipse.papyrus.sysml.diagram.blockdefinition.command,

- org.eclipse.papyrus.sysml.diagram.blockdefinition.dnd.helper,

- org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.part,

- org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy,

- org.eclipse.papyrus.sysml.diagram.blockdefinition.factory,

- org.eclipse.papyrus.sysml.diagram.blockdefinition.handler,

- org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice,

- org.eclipse.papyrus.sysml.diagram.blockdefinition.messages,

- org.eclipse.papyrus.sysml.diagram.blockdefinition.part,

- org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences,

- org.eclipse.papyrus.sysml.diagram.blockdefinition.provider,

- org.eclipse.papyrus.sysml.diagram.blockdefinition.ui,

- org.eclipse.papyrus.sysml.diagram.blockdefinition.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.blockdefinition.Ac

  tivator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.blockdefinition

  ;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
index d60ac90d235..ce321cb4564 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
@@ -1,76 +1,76 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.papyrus.sysml;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",
- org.eclipse.core.expressions,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",
- org.eclipse.papyrus.editor;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.0.0",
- org.eclipse.draw2d;bundle-version="3.7.1",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",
- org.eclipse.uml2.common.edit;bundle-version="1.6.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
- org.eclipse.emf.edit.ui;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.0"
-Export-Package: org.eclipse.papyrus.gmf.diagram.common.commands,
- org.eclipse.papyrus.gmf.diagram.common.compatibility,
- org.eclipse.papyrus.gmf.diagram.common.edit.part,
- org.eclipse.papyrus.gmf.diagram.common.edit.policy,
- org.eclipse.papyrus.gmf.diagram.common.factory,
- org.eclipse.papyrus.gmf.diagram.common.figure,
- org.eclipse.papyrus.gmf.diagram.common.locator,
- org.eclipse.papyrus.gmf.diagram.common.parser,
- org.eclipse.papyrus.gmf.diagram.common.provider,
- org.eclipse.papyrus.sysml.diagram.common,
- org.eclipse.papyrus.sysml.diagram.common.commands,
- org.eclipse.papyrus.sysml.diagram.common.dialogs,
- org.eclipse.papyrus.sysml.diagram.common.edit.part,
- org.eclipse.papyrus.sysml.diagram.common.edit.policy,
- org.eclipse.papyrus.sysml.diagram.common.factory,
- org.eclipse.papyrus.sysml.diagram.common.figure,
- org.eclipse.papyrus.sysml.diagram.common.messages,
- org.eclipse.papyrus.sysml.diagram.common.parser,
- org.eclipse.papyrus.sysml.diagram.common.preferences,
- org.eclipse.papyrus.sysml.diagram.common.utils,
- org.eclipse.papyrus.uml.diagram.common.dnd.helper,
- org.eclipse.papyrus.uml.diagram.common.edit.part,
- org.eclipse.papyrus.uml.diagram.common.edit.policy,
- org.eclipse.papyrus.uml.diagram.common.factory,
- org.eclipse.papyrus.uml.diagram.common.figure,
- org.eclipse.papyrus.uml.diagram.common.parser,
- org.eclipse.papyrus.uml.diagram.common.utils
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.common.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.common;singleto
- n:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.gmf.diagram.common.commands,

+ org.eclipse.papyrus.gmf.diagram.common.compatibility,

+ org.eclipse.papyrus.gmf.diagram.common.edit.part,

+ org.eclipse.papyrus.gmf.diagram.common.edit.policy,

+ org.eclipse.papyrus.gmf.diagram.common.factory,

+ org.eclipse.papyrus.gmf.diagram.common.figure,

+ org.eclipse.papyrus.gmf.diagram.common.locator,

+ org.eclipse.papyrus.gmf.diagram.common.parser,

+ org.eclipse.papyrus.gmf.diagram.common.provider,

+ org.eclipse.papyrus.sysml.diagram.common,

+ org.eclipse.papyrus.sysml.diagram.common.commands,

+ org.eclipse.papyrus.sysml.diagram.common.dialogs,

+ org.eclipse.papyrus.sysml.diagram.common.edit.part,

+ org.eclipse.papyrus.sysml.diagram.common.edit.policy,

+ org.eclipse.papyrus.sysml.diagram.common.factory,

+ org.eclipse.papyrus.sysml.diagram.common.figure,

+ org.eclipse.papyrus.sysml.diagram.common.messages,

+ org.eclipse.papyrus.sysml.diagram.common.parser,

+ org.eclipse.papyrus.sysml.diagram.common.preferences,

+ org.eclipse.papyrus.sysml.diagram.common.utils,

+ org.eclipse.papyrus.uml.diagram.common.dnd.helper,

+ org.eclipse.papyrus.uml.diagram.common.edit.part,

+ org.eclipse.papyrus.uml.diagram.common.edit.policy,

+ org.eclipse.papyrus.uml.diagram.common.factory,

+ org.eclipse.papyrus.uml.diagram.common.figure,

+ org.eclipse.papyrus.uml.diagram.common.parser,

+ org.eclipse.papyrus.uml.diagram.common.utils

+Require-Bundle: org.eclipse.ui,

+ org.eclipse.core.runtime,

+ org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

+ org.eclipse.emf;bundle-version="2.6.0",

+ org.eclipse.uml2.uml;bundle-version="3.1.0",

+ org.eclipse.papyrus.sysml;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

+ org.eclipse.core.expressions,

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

+ org.eclipse.papyrus.editor;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",

+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.0.0",

+ org.eclipse.draw2d;bundle-version="3.7.1",

+ org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",

+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

+ org.eclipse.uml2.common.edit;bundle-version="1.6.0",

+ org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

+ org.eclipse.emf.edit.ui;bundle-version="2.8.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

+ org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.0"

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 1.0.0.qualifier

+Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-Activator: org.eclipse.papyrus.sysml.diagram.common.Activator

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.common;singleto

+ n:=true

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

+

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF
index ee962999264..3532d81438d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF
@@ -1,8 +1,10 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SysML Css (Incubation)
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.css;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.css.theme;bundle-version="1.0.0";resolution:=optional
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.css.theme;bundle-version="1.0.0";resolution:=optional

+Bundle-Vendor: Eclipse Modeling Project

+Bundle-Version: 1.0.0.qualifier

+Bundle-Name: SysML Css (Incubation)

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.css;singleton:=

+ true

+

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
index 09371dfb664..74da4c6f49a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
@@ -1,4 +1,18 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.sysml.diagram.internalblock,

+ org.eclipse.papyrus.sysml.diagram.internalblock.compatibility,

+ org.eclipse.papyrus.sysml.diagram.internalblock.dnd.helper,

+ org.eclipse.papyrus.sysml.diagram.internalblock.edit.part,

+ org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy,

+ org.eclipse.papyrus.sysml.diagram.internalblock.factory,

+ org.eclipse.papyrus.sysml.diagram.internalblock.handler,

+ org.eclipse.papyrus.sysml.diagram.internalblock.helper.advice,

+ org.eclipse.papyrus.sysml.diagram.internalblock.messages,

+ org.eclipse.papyrus.sysml.diagram.internalblock.part,

+ org.eclipse.papyrus.sysml.diagram.internalblock.preferences,

+ org.eclipse.papyrus.sysml.diagram.internalblock.provider,

+ org.eclipse.papyrus.sysml.diagram.internalblock.ui,

+ org.eclipse.papyrus.sysml.diagram.internalblock.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.papyrus.sysml;bundle-version="1.0.0",

@@ -30,33 +44,19 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.0",

- org.eclipse.papyrus.uml.diagram.common,

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.sysml.diagram.internalblock,

- org.eclipse.papyrus.sysml.diagram.internalblock.compatibility,

- org.eclipse.papyrus.sysml.diagram.internalblock.dnd.helper,

- org.eclipse.papyrus.sysml.diagram.internalblock.edit.part,

- org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy,

- org.eclipse.papyrus.sysml.diagram.internalblock.factory,

- org.eclipse.papyrus.sysml.diagram.internalblock.handler,

- org.eclipse.papyrus.sysml.diagram.internalblock.helper.advice,

- org.eclipse.papyrus.sysml.diagram.internalblock.messages,

- org.eclipse.papyrus.sysml.diagram.internalblock.part,

- org.eclipse.papyrus.sysml.diagram.internalblock.preferences,

- org.eclipse.papyrus.sysml.diagram.internalblock.provider,

- org.eclipse.papyrus.sysml.diagram.internalblock.ui,

- org.eclipse.papyrus.sysml.diagram.internalblock.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.internalblock.Acti

  vator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.internalblock;s

  ingleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF
index 7b7ed041cc8..e652f620fcd 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
-Manifest-Version: 1.0
+Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.sysml.diagram.parametric,

  org.eclipse.papyrus.sysml.diagram.parametric.commands,

  org.eclipse.papyrus.sysml.diagram.parametric.edit.part,

@@ -15,48 +15,48 @@ Bundle-ActivationPolicy: lazy
 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui,

+ org.eclipse.core.runtime,

  org.eclipse.papyrus.sysml;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

- org.eclipse.emf.common.ui;bundle-version="2.5.0",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
+ org.eclipse.emf.common.ui;bundle-version="2.5.0",

+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

  org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.0",

- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0",
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0",

  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

- org.eclipse.core.expressions,
+ org.eclipse.core.expressions,

  org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",

+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0",

- org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

- org.eclipse.uml2.uml;bundle-version="4.0.0",
+ org.eclipse.uml2.uml;bundle-version="4.0.0",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

- org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",
+ org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

  org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

  org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.0",

  org.eclipse.papyrus.views.properties;bundle-version="1.0.0",

- org.eclipse.core.databinding.observable;bundle-version="1.4.1",
+ org.eclipse.core.databinding.observable;bundle-version="1.4.1",

  org.eclipse.papyrus.views.properties.model;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

 Bundle-Version: 1.0.0.qualifier

-Bundle-ManifestVersion: 2
+Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.parametric.Activat

  or

+Import-Package: org.eclipse.gmf.runtime.notation

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.parametric;sing

  leton:=true

-Import-Package: org.eclipse.gmf.runtime.notation
 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF
index 9628122599a..3f3e211388f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF
@@ -1,4 +1,13 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.sysml.diagram.requirement,

+ org.eclipse.papyrus.sysml.diagram.requirement.edit.part,

+ org.eclipse.papyrus.sysml.diagram.requirement.edit.policy,

+ org.eclipse.papyrus.sysml.diagram.requirement.factory,

+ org.eclipse.papyrus.sysml.diagram.requirement.figure,

+ org.eclipse.papyrus.sysml.diagram.requirement.part,

+ org.eclipse.papyrus.sysml.diagram.requirement.preferences,

+ org.eclipse.papyrus.sysml.diagram.requirement.provider,

+ org.eclipse.papyrus.sysml.diagram.requirement.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

@@ -24,23 +33,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.sysml.diagram.requirement,

- org.eclipse.papyrus.sysml.diagram.requirement.edit.part,

- org.eclipse.papyrus.sysml.diagram.requirement.edit.policy,

- org.eclipse.papyrus.sysml.diagram.requirement.factory,

- org.eclipse.papyrus.sysml.diagram.requirement.figure,

- org.eclipse.papyrus.sysml.diagram.requirement.part,

- org.eclipse.papyrus.sysml.diagram.requirement.preferences,

- org.eclipse.papyrus.sysml.diagram.requirement.provider,

- org.eclipse.papyrus.sysml.diagram.requirement.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.requirement.Activa

  tor

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.requirement;sin

  gleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF
index 782f60f3816..33172d7d6e7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF
@@ -1,4 +1,5 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.sysml.diagram.ui

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

@@ -7,14 +8,13 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface;bundle-version="3.8.0",

  org.eclipse.ui,

  org.eclipse.ui.ide;bundle-version="3.8.0"

-Export-Package: org.eclipse.papyrus.sysml.diagram.ui

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.ui.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.ui;singleton:=t

  rue

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF
index f88a590a790..edac4299fd2 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF
@@ -21,19 +21,19 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.modelexplorer;bundle-version="1.0.0",

- org.eclipse.papyrus.emf.facet.query.java.core,

- org.eclipse.papyrus.emf.facet.custom.ui,

- org.eclipse.papyrus.emf.facet.custom.metamodel,

+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.0.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0",

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.0",

  org.eclipse.emf.edit.ui

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .,

  bin

 Bundle-Version: 1.0.0.qualifier

-Bundle-Localization: plugin

 Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.sysml.modelexplorer.Activator

+Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.sysml.modelexplorer.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.modelexplorer;singleton

  :=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF
index 1871472a260..daf9be173dd 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF
@@ -18,9 +18,9 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.sysml.nattable.allocation.config

  .Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.allocation.con

  fig;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF
index d4b9ca19250..358202f5959 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.sysml.nattable.allocation.Activa

  tor

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.allocation;sin

  gleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
index e274b06d29a..2bf942d32f2 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
@@ -1,4 +1,5 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.sysml.nattable.menu.handlers

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.0.0",

@@ -18,13 +19,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.sysml.nattable.menu.handlers

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.sysml.nattable.menu.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.menu;singleton

  :=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF
index 0c595a554aa..41232bf5cc3 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF
@@ -14,9 +14,9 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.sysml.nattable.requirement.confi

  g.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.requirement.co

  nfig;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
index f5c3352049d..bba09737bd0 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
@@ -17,9 +17,9 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.sysml.nattable.requirement.Activ

  ator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.requirement;si

  ngleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
index 81d8899ff46..edf70e7614b 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
@@ -1,4 +1,5 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.sysml.nattable.manager.axis

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

@@ -18,13 +19,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.sysml;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.sysml.nattable.manager.axis

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.sysml.nattable.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable;singleton:=tru

  e

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/META-INF/MANIFEST.MF b/plugins/sysml/org.eclipse.papyrus.sysml.edit/META-INF/MANIFEST.MF
index 747f3314e40..72b28e20a47 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/META-INF/MANIFEST.MF
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/META-INF/MANIFEST.MF
@@ -1,4 +1,14 @@
 Manifest-Version: 1.0

+Require-Bundle: org.eclipse.papyrus.sysml;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.core.runtime;bundle-version="3.6.0",

+ org.eclipse.emf.edit;bundle-version="2.8.0",

+ org.eclipse.emf.ecore;visibility:=reexport,

+ org.eclipse.emf.ecore.edit;visibility:=reexport,

+ org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

+ org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

+ org.eclipse.uml2.uml;bundle-version="[5.0.0,6.0.0)";visibility:=reexport,

+ org.eclipse.uml2.uml.edit;bundle-version="[5.0.0,6.0.0)",

+ org.eclipse.uml2.common.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport

 Export-Package: org.eclipse.papyrus.sysml.activities.provider,

  org.eclipse.papyrus.sysml.allocations.provider,

  org.eclipse.papyrus.sysml.blocks.provider,

@@ -10,24 +20,15 @@ Export-Package: org.eclipse.papyrus.sysml.activities.provider,
  org.eclipse.papyrus.sysml.provider,

  org.eclipse.papyrus.sysml.registry,

  org.eclipse.papyrus.sysml.requirements.provider

-Require-Bundle: org.eclipse.papyrus.sysml;bundle-version="1.0.0";visibility:=reexport,

- org.eclipse.core.runtime;bundle-version="3.6.0",

- org.eclipse.emf.edit;bundle-version="2.8.0",

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

- org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.uml2.uml;bundle-version="[5.0.0,6.0.0)";visibility:=reexport,

- org.eclipse.uml2.uml.edit;bundle-version="[5.0.0,6.0.0)",

- org.eclipse.uml2.common.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-Activator: org.eclipse.papyrus.sysml.provider.SysmlEditPlugin$I

+ mplementation

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.sysml.provider.SysmlEditPlugin$Implementation

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.edit;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
index c1266953802..ffa5f54450b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
@@ -1,4 +1,12 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.sysml.service.types,

+ org.eclipse.papyrus.sysml.service.types.command,

+ org.eclipse.papyrus.sysml.service.types.element,

+ org.eclipse.papyrus.sysml.service.types.handlers,

+ org.eclipse.papyrus.sysml.service.types.helper,

+ org.eclipse.papyrus.sysml.service.types.matcher,

+ org.eclipse.papyrus.sysml.service.types.menu,

+ org.eclipse.papyrus.sysml.service.types.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.uml2.uml;bundle-version="5.0.0",

@@ -12,21 +20,13 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.sysml.service.types,

- org.eclipse.papyrus.sysml.service.types.command,

- org.eclipse.papyrus.sysml.service.types.element,

- org.eclipse.papyrus.sysml.service.types.handlers,

- org.eclipse.papyrus.sysml.service.types.helper,

- org.eclipse.papyrus.sysml.service.types.matcher,

- org.eclipse.papyrus.sysml.service.types.menu,

- org.eclipse.papyrus.sysml.service.types.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.sysml.service.types.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.service.types;singleton

  :=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF b/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF
index 39f367425e8..40ca238f1c8 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF
@@ -1,4 +1,11 @@
 Manifest-Version: 1.0

+Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.0",

+ org.eclipse.core.runtime,

+ org.eclipse.emf.ecore,

+ org.eclipse.emf.ecore.xmi,

+ org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

+ org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)",

+ org.eclipse.uml2.uml;bundle-version="[5.0.0,6.0.0)"

 Export-Package: org.eclipse.papyrus.sysml,

  org.eclipse.papyrus.sysml.activities,

  org.eclipse.papyrus.sysml.activities.internal.impl,

@@ -32,19 +39,12 @@ Export-Package: org.eclipse.papyrus.sysml,
  org.eclipse.papyrus.sysml.usecases.internal.impl,

  org.eclipse.papyrus.sysml.usecases.util,

  org.eclipse.papyrus.sysml.util

-Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.0",

- org.eclipse.core.runtime,

- org.eclipse.emf.ecore,

- org.eclipse.emf.ecore.xmi,

- org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

- org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.uml2.uml;bundle-version="[5.0.0,6.0.0)"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

+Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF
index 8cb602b8043..a5e0ea58e59 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.sysml.properties.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.properties;singleton:=t

  rue

 Bundle-RequiredExecutionEnvironment: J2SE-1.5