Bug 520271 - [Property View] Generator should ignore redefined properties.

Change-Id: I5d73f2441ff5e23f937ab155488cf29fb249a65c
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>

5 files changed, 7 insertions, 7 deletions

diff --git a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF
index 4bcec6ce0c5..82f3b5ca1c9 100644
--- a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF
@@ -10,8 +10,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.properties;bundle-version="[2.0.0,3.0.0)",

+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)",

+ org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.core.databinding;bundle-version="1.6.0",

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

  org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",

diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
index 717f4a06bf4..931efc1c74c 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[2.1.0,3.0.0)",

+ org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",

  org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)",

  org.eclipse.gmf.codegen;bundle-version="2.11.0",

diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
index 17b784254dc..6d982d5b2d7 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",

  org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[2.1.0,3.0.0)",

+ org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",

diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF
index 2168e022fd9..c156ebeb449 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.properties;bundle-version="[2.0.0,3.0.0)",

+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)",

+ org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.core.databinding;bundle-version="1.6.0",

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

  org.eclipse.papyrus.infra.gmfdiag.welcome;bundle-version="[1.2.0,2.0.0)",

diff --git a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF
index 2369c696502..c3b678b6c3f 100644
--- a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",

  org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",

  org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",

+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)",

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

 Export-Package: org.eclipse.papyrus.infra.properties.ui.tests

 Bundle-Vendor: Eclipse Modeling Project