IDEMPIERE-4583 Fix OSGi split package (#497)

Use only Require-Bundle for dependency between idempiere module/bundles
This commit is contained in:
hengsin 2021-01-03 01:32:18 +08:00 committed by GitHub
parent 12009bf670
commit ccbe8b981f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 15 deletions

View File

@ -5,9 +5,7 @@ Bundle-SymbolicName: org.adempiere.plugin.utils
Bundle-Version: 8.2.0.qualifier Bundle-Version: 8.2.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Import-Package: org.adempiere.base, Import-Package: org.apache.xerces.dom;version="2.9.0",
org.adempiere.util,
org.apache.xerces.dom;version="2.9.0",
org.apache.xerces.dom.events;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.dom3.as;version="2.9.0",
org.apache.xerces.impl;version="2.9.0", org.apache.xerces.impl;version="2.9.0",

View File

@ -23,7 +23,6 @@ Import-Package: groovy.transform.stc;version="2.4.7",
net.sf.jasperreports.engine.export.ooxml, net.sf.jasperreports.engine.export.ooxml,
net.sf.jasperreports.engine.util, net.sf.jasperreports.engine.util,
net.sf.jasperreports.export, net.sf.jasperreports.export,
org.adempiere.report.jasper,
org.apache.commons.codec.binary, org.apache.commons.codec.binary,
org.apache.commons.fileupload;version="1.2.2", org.apache.commons.fileupload;version="1.2.2",
org.apache.commons.fileupload.disk;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.ecs.xhtml,
org.apache.tools.ant, org.apache.tools.ant,
org.apache.tools.ant.taskdefs, org.apache.tools.ant.taskdefs,
org.compiere.css,
org.compiere.server,
org.eclipse.core.runtime;version="3.4.0", org.eclipse.core.runtime;version="3.4.0",
org.eclipse.jetty.websocket.jsr356;version="9.4.12", org.eclipse.jetty.websocket.jsr356;version="9.4.12",
org.eclipse.jetty.websocket.jsr356.server;version="9.4.12", org.eclipse.jetty.websocket.jsr356.server;version="9.4.12",
org.idempiere.server.cluster,
org.jfree.chart, org.jfree.chart,
org.jfree.chart.encoders, org.jfree.chart.encoders,
org.jfree.chart.entity, org.jfree.chart.entity,
@ -155,6 +151,8 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
web.js.zkforge.keylistener, web.js.zkforge.keylistener,
web.js.zkforge.keylistener.mold web.js.zkforge.keylistener.mold
Require-Bundle: org.adempiere.base;bundle-version="0.0.0", 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.adempiere.ui;bundle-version="0.0.0",
org.idempiere.zk.extra;bundle-version="0.0.0", org.idempiere.zk.extra;bundle-version="0.0.0",
zcommon;bundle-version="0.0.0", zcommon;bundle-version="0.0.0",

View File

@ -21,8 +21,6 @@ Import-Package: javax.servlet;version="2.5.0",
javax.servlet.resources;version="2.5.0", javax.servlet.resources;version="2.5.0",
org.adempiere.eclipse.equinox.http.servlet, org.adempiere.eclipse.equinox.http.servlet,
org.apache.felix.webconsole;version="3.1.2", 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.registry;version="1.0.0",
org.eclipse.equinox.http.servlet;version="1.1.0", org.eclipse.equinox.http.servlet;version="1.1.0",
org.eclipse.equinox.servletbridge;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 Automatic-Module-Name: org.idempiere.felix.webconsole
Bundle-Vendor: iDempiere Community Bundle-Vendor: iDempiere Community
Export-Package: org.idempiere.felix.webconsole;x-internal:=true Export-Package: org.idempiere.felix.webconsole;x-internal:=true
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"

View File

@ -17,11 +17,6 @@ Import-Package: javax.crypto,
javax.xml.transform.dom, javax.xml.transform.dom,
javax.xml.transform.stream, javax.xml.transform.stream,
javax.xml.xpath, 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.osgi.framework;version="1.3.0",
org.slf4j;version="1.6.1", org.slf4j;version="1.6.1",
org.w3c.dom org.w3c.dom
@ -32,6 +27,7 @@ Bundle-ClassPath: .,
Service-Component: OSGI-INF/*.xml Service-Component: OSGI-INF/*.xml
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=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 Automatic-Module-Name: org.idempiere.hazelcast.service
Bundle-Vendor: iDempiere Community Bundle-Vendor: iDempiere Community