From ccbe8b981fabedd301a0adf5ec99b36a80745c88 Mon Sep 17 00:00:00 2001
From: hengsin <hengsin@gmail.com>
Date: Sun, 3 Jan 2021 01:32:18 +0800
Subject: [PATCH] IDEMPIERE-4583 Fix OSGi split package (#497)

Use only Require-Bundle for dependency between idempiere module/bundles
---
 org.adempiere.plugin.utils/META-INF/MANIFEST.MF      | 4 +---
 org.adempiere.ui.zk/META-INF/MANIFEST.MF             | 6 ++----
 org.idempiere.felix.webconsole/META-INF/MANIFEST.MF  | 3 +--
 org.idempiere.hazelcast.service/META-INF/MANIFEST.MF | 8 ++------
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
index 8e1e8e0f28..0a092aca55 100644
--- a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
+++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
@@ -5,9 +5,7 @@ Bundle-SymbolicName: org.adempiere.plugin.utils
 Bundle-Version: 8.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
-Import-Package: org.adempiere.base,
- org.adempiere.util,
- org.apache.xerces.dom;version="2.9.0",
+Import-Package: org.apache.xerces.dom;version="2.9.0",
  org.apache.xerces.dom.events;version="2.9.0",
  org.apache.xerces.dom3.as;version="2.9.0",
  org.apache.xerces.impl;version="2.9.0",
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index 705c062e62..193b59bfc7 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -23,7 +23,6 @@ Import-Package: groovy.transform.stc;version="2.4.7",
  net.sf.jasperreports.engine.export.ooxml,
  net.sf.jasperreports.engine.util,
  net.sf.jasperreports.export,
- org.adempiere.report.jasper,
  org.apache.commons.codec.binary,
  org.apache.commons.fileupload;version="1.2.2",
  org.apache.commons.fileupload.disk;version="1.2.2",
@@ -35,12 +34,9 @@ Import-Package: groovy.transform.stc;version="2.4.7",
  org.apache.ecs.xhtml,
  org.apache.tools.ant,
  org.apache.tools.ant.taskdefs,
- org.compiere.css,
- org.compiere.server,
  org.eclipse.core.runtime;version="3.4.0",
  org.eclipse.jetty.websocket.jsr356;version="9.4.12",
  org.eclipse.jetty.websocket.jsr356.server;version="9.4.12",
- org.idempiere.server.cluster,
  org.jfree.chart,
  org.jfree.chart.encoders,
  org.jfree.chart.entity,
@@ -155,6 +151,8 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  web.js.zkforge.keylistener,
  web.js.zkforge.keylistener.mold
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
+ org.adempiere.report.jasper;bundle-version="0.0.0",
+ org.adempiere.server;bundle-version="0.0.0",
  org.adempiere.ui;bundle-version="0.0.0",
  org.idempiere.zk.extra;bundle-version="0.0.0",
  zcommon;bundle-version="0.0.0",
diff --git a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
index 185b0e3967..5a08750a81 100644
--- a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
+++ b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
@@ -21,8 +21,6 @@ Import-Package: javax.servlet;version="2.5.0",
  javax.servlet.resources;version="2.5.0",
  org.adempiere.eclipse.equinox.http.servlet,
  org.apache.felix.webconsole;version="3.1.2",
- org.compiere.model,
- org.compiere.util,
  org.eclipse.equinox.http.registry;version="1.0.0",
  org.eclipse.equinox.http.servlet;version="1.1.0",
  org.eclipse.equinox.servletbridge;version="1.1.0",
@@ -34,3 +32,4 @@ Bundle-ClassPath: .
 Automatic-Module-Name: org.idempiere.felix.webconsole
 Bundle-Vendor: iDempiere Community
 Export-Package: org.idempiere.felix.webconsole;x-internal:=true
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
index 94cee0a9fa..f6542e4547 100644
--- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
@@ -17,11 +17,6 @@ Import-Package: javax.crypto,
  javax.xml.transform.dom,
  javax.xml.transform.stream,
  javax.xml.xpath,
- org.adempiere.base,
- org.compiere,
- org.compiere.model,
- org.compiere.util,
- org.idempiere.distributed,
  org.osgi.framework;version="1.3.0",
  org.slf4j;version="1.6.1",
  org.w3c.dom
@@ -32,6 +27,7 @@ Bundle-ClassPath: .,
 Service-Component: OSGI-INF/*.xml
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
-Require-Bundle: org.eclipse.osgi
+Require-Bundle: org.eclipse.osgi,
+ org.adempiere.base;bundle-version="0.0.0"
 Automatic-Module-Name: org.idempiere.hazelcast.service
 Bundle-Vendor: iDempiere Community