[Releng] Fix dependency versions

10 files changed, 68 insertions, 65 deletions

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF
index 238fb879526..c4c213a4612 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF
@@ -1,23 +1,26 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.newchild;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.newchild.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.transaction,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",
- org.eclipse.gmf.runtime.common.core,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.newchild;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.ui,

+ org.eclipse.core.runtime,

+ org.eclipse.emf.transaction,

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

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

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

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

+ org.eclipse.gmf.runtime.common.core,

+ org.eclipse.gmf.runtime.emf.type.core,

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

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

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

+ org.eclipse.papyrus.infra.newchild;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.views.modelexplorer.newchild.Act

+ ivator

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.newchild;

+ singleton:=true

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

+

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF
index 1d3763c0b95..7ba1e3aaae5 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF
@@ -1,4 +1,6 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.views.modelexplorer.resourceloadin

+ g.handler

 Require-Bundle: org.eclipse.emf.converter;bundle-version="2.5.0",

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

  org.eclipse.emf.workspace.ui;bundle-version="1.3.0",

@@ -10,16 +12,14 @@ Require-Bundle: org.eclipse.emf.converter;bundle-version="2.5.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.di;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.views.modelexplorer.resourceloadin

- g.handler

 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.views.modelexplorer.resourceload

  ing.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.resourcel

  oading;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF
index 02239cbe08f..eb9433c915e 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF
@@ -1,4 +1,5 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.views.modelexplorer.widgets

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

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

@@ -9,15 +10,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

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

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

-Export-Package: org.eclipse.papyrus.views.modelexplorer.widgets

 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.views.modelexplorer.widgets.Acti

  vator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.widgets;s

  ingleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
index cd6485af111..45bdaf42d7f 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
@@ -11,6 +11,10 @@ Export-Package: org.eclipse.papyrus.views.modelexplorer,
  org.eclipse.papyrus.views.modelexplorer.matching,

  org.eclipse.papyrus.views.modelexplorer.preferences,

  org.eclipse.papyrus.views.modelexplorer.queries

+Bundle-ActivationPolicy: lazy

+Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.ui.navigator;bundle-version="3.4.0",

@@ -42,26 +46,22 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

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

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

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

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

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

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

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

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

- org.eclipse.papyrus.emf.facet.efacet.core,

- org.eclipse.papyrus.emf.facet.efacet,

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

- org.eclipse.papyrus.emf.facet.util.emf.core,

+ 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.papyrus.emf.facet.util.ui;bundle-version="1.0.0",

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

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

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

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

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

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

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

  org.eclipse.papyrus.infra.viewpoints.policy;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.views.modelexplorer.Activator

 Bundle-ManifestVersion: 2

+Import-Package: org.eclipse.papyrus.emf.facet.custom.core

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

  :=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Import-Package: org.eclipse.papyrus.emf.facet.custom.core

 

diff --git a/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF b/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF
index a1620686d9f..9c515184183 100644
--- a/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF
+++ b/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF
@@ -25,6 +25,6 @@ Bundle-Vendor: %vendorName
 Bundle-Version: 1.0.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.views.search.Activator

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

 Import-Package: org.eclipse.uml2.uml

+Bundle-SymbolicName: org.eclipse.papyrus.views.search;singleton:=true

 

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit/META-INF/MANIFEST.MF
index dcebfd33ac6..9e53fe35918 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.views.properties.contexts.provider,

- org.eclipse.papyrus.views.properties.environment.provider,

- org.eclipse.papyrus.views.properties.ui.provider

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

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

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

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

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

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

+Export-Package: org.eclipse.papyrus.views.properties.contexts.provider,

+ org.eclipse.papyrus.views.properties.environment.provider,

+ org.eclipse.papyrus.views.properties.ui.provider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.views.properties.environment.pro

  vider.PropertiesEditPlugin$Implementation

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.views.properties.model.edit;s

  ingleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF
index 4a6be6e4956..c01a097c83c 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF
@@ -1,7 +1,4 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.views.properties.contexts.presentation,

- org.eclipse.papyrus.views.properties.environment.presentation,

- org.eclipse.papyrus.views.properties.ui.presentation

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

  org.eclipse.core.resources,

  org.eclipse.papyrus.views.properties.model.edit;bundle-version="1.0.0";visibility:=reexport,

@@ -11,15 +8,18 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore.editor;bundle-version="2.7.0",

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

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

+Export-Package: org.eclipse.papyrus.views.properties.contexts.presentation,

+ org.eclipse.papyrus.views.properties.environment.presentation,

+ org.eclipse.papyrus.views.properties.ui.presentation

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.views.properties.environment.pre

  sentation.PropertiesEditorPlugin$Implementation

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.views.properties.model.editor

  ;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF
index 34821df8c7d..b4a51598a31 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF
@@ -1,7 +1,4 @@
 Manifest-Version: 1.0

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

- org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport,

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

 Export-Package: org.eclipse.papyrus.views.properties.contexts,

  org.eclipse.papyrus.views.properties.contexts.impl,

  org.eclipse.papyrus.views.properties.contexts.util,

@@ -11,12 +8,15 @@ Export-Package: org.eclipse.papyrus.views.properties.contexts,
  org.eclipse.papyrus.views.properties.ui,

  org.eclipse.papyrus.views.properties.ui.impl,

  org.eclipse.papyrus.views.properties.ui.util

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

+ org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport,

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

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Version: 1.0.0.qualifier

-Bundle-Localization: plugin

 Bundle-Name: %pluginName

+Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.views.properties.model;single

  ton:=true

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF
index 6977af84421..0452eff58f3 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF
@@ -43,13 +43,13 @@ Require-Bundle: org.eclipse.emf;bundle-version="2.6.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",

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

  org.eclipse.papyrus.infra.widgets.toolbox;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"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-Version: 1.0.0.qualifier

 Eclipse-BuddyPolicy: dependent

-Bundle-ManifestVersion: 2

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

+Bundle-ManifestVersion: 2

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

  rue

 

diff --git a/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF b/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF
index c8b3332a77d..1b5e532c9be 100644
--- a/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF
+++ b/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF
@@ -19,8 +19,8 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.views.validation.internal.Activa

  tor

-Bundle-SymbolicName: org.eclipse.papyrus.views.validation;singleton:=t

- rue

 Import-Package: com.google.common.base;version="10.0.1",

  com.google.common.collect;version="10.0.1"

+Bundle-SymbolicName: org.eclipse.papyrus.views.validation;singleton:=t

+ rue