From 08199b13e792f3f4550cd635b5f10ac8fcab076d Mon Sep 17 00:00:00 2001
From: Kevin Kassin <kevinkassin@gmx.de>
Date: Mon, 9 Apr 2018 21:58:04 +0200
Subject: [PATCH] fixed bug where the iorm.model package wasn't correctly
 imported anymore

the reason was the changed version number of the model which is now
recognized in packages using it
---
 .../META-INF/MANIFEST.MF                      |  2 +-
 org.framed.iorm.model/META-INF/MANIFEST.MF    | 29 +++++++++++++++----
 .../META-INF/MANIFEST.MF                      |  2 +-
 org.framed.iorm.ui/META-INF/MANIFEST.MF       |  5 ++--
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/org.framed.iorm.model.edit/META-INF/MANIFEST.MF b/org.framed.iorm.model.edit/META-INF/MANIFEST.MF
index e7e1f1b3..010c6ac2 100644
--- a/org.framed.iorm.model.edit/META-INF/MANIFEST.MF
+++ b/org.framed.iorm.model.edit/META-INF/MANIFEST.MF
@@ -11,6 +11,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.framed.iorm.featuremodel.provider,
  org.framed.iorm.model.provider
 Require-Bundle: org.eclipse.core.runtime,
- org.framed.iorm.model;visibility:=reexport,
+ org.framed.iorm.model;bundle-version="1.0.0";visibility:=reexport,
  org.eclipse.emf.edit;visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/org.framed.iorm.model/META-INF/MANIFEST.MF b/org.framed.iorm.model/META-INF/MANIFEST.MF
index 0723a651..7a680b31 100644
--- a/org.framed.iorm.model/META-INF/MANIFEST.MF
+++ b/org.framed.iorm.model/META-INF/MANIFEST.MF
@@ -7,12 +7,31 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.framed.iorm.featuremodel,
- org.framed.iorm.featuremodel.impl,
- org.framed.iorm.featuremodel.util,
+Export-Package: org.framed.iorm.featuremodel;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
+ org.framed.iorm.featuremodel.impl;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.util,
+   org.framed.iorm.featuremodel",
+ org.framed.iorm.featuremodel.util;
+  uses:="org.eclipse.emf.ecore,
+   org.framed.iorm.featuremodel,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.util",
  org.framed.iorm.model,
- org.framed.iorm.model.impl,
- org.framed.iorm.model.util
+ org.framed.iorm.model.impl;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.util,
+   org.framed.iorm.featuremodel,
+   org.framed.iorm.model",
+ org.framed.iorm.model.util;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.util,
+   org.framed.iorm.model"
 Require-Bundle: org.eclipse.emf.common;bundle-version="2.13.0",
  org.eclipse.emf.ecore;bundle-version="2.13.0"
 Bundle-ActivationPolicy: lazy
diff --git a/org.framed.iorm.transformation.test/META-INF/MANIFEST.MF b/org.framed.iorm.transformation.test/META-INF/MANIFEST.MF
index 69218139..3bcd422d 100644
--- a/org.framed.iorm.transformation.test/META-INF/MANIFEST.MF
+++ b/org.framed.iorm.transformation.test/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.framed.iorm.transformation;bundle-version="1.0.0",
  org.junit,
  org.rosi.crom.metamodel;visibility:=reexport,
- org.framed.iorm.model;bundle-version="0.1.0";visibility:=reexport,
+ org.framed.iorm.model;bundle-version="1.0.0";visibility:=reexport,
  org.eclipse.emf.ecore.xmi,
  org.eclipse.compare;bundle-version="3.5.501",
  org.eclipse.emf.compare;bundle-version="3.1.0",
diff --git a/org.framed.iorm.ui/META-INF/MANIFEST.MF b/org.framed.iorm.ui/META-INF/MANIFEST.MF
index d87292f5..ebd20f32 100644
--- a/org.framed.iorm.ui/META-INF/MANIFEST.MF
+++ b/org.framed.iorm.ui/META-INF/MANIFEST.MF
@@ -26,10 +26,9 @@ Require-Bundle: org.framed.iorm.featuremodel;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.core.resources;bundle-version="3.11.1";visibility:=reexport,
  org.eclipse.ui.workbench,
- org.eclipse.emf.ecore
+ org.eclipse.emf.ecore,
+ org.eclipse.osgi
 Import-Package: org.eclipse.graphiti.features;version="0.13.2",
- org.framed.iorm.model,
- org.framed.iorm.model.provider,
  org.framed.iorm.transformation
 Bundle-ClassPath: src/,
  .
-- 
GitLab