This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/new-parent
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-core.git
The following commit(s) were added to refs/heads/feature/new-parent by this
push:
new f002e27 fix bnd instructions to not export conditional packages
f002e27 is described below
commit f002e27417eed410d471a2001beb0552f3537332
Author: Konrad Windszus <[email protected]>
AuthorDate: Tue Jan 28 09:35:40 2020 +0100
fix bnd instructions to not export conditional packages
---
bnd.bnd | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index c404ff8..966ef54 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,18 +1,10 @@
--conditionalpackage: org.apache.felix.configurator.impl.*,\\
- org.apache.sling.feature.io.*,\\
- javax.json.*,\\
- org.apache.johnzon.core.*,\\
- org.apache.felix.converter.*,\\
- org.apache.felix.cm.*,\\
- org.apache.sling.commons.osgi.*\\
-# override the exportcontent from the parent pom, to not export conditional
packages (https://github.com/bndtools/bnd/issues/3721)
--exportcontents: !org.apache.felix.configurator.impl.*,\\
- !org.apache.sling.feature.io.*,\\
- !javax.json.*,\\
- !org.apache.johnzon.core.*,\\
- !org.apache.felix.converter.*,\\
- !org.apache.felix.cm.*,\\
- !org.apache.sling.commons.osgi.*,\\
- ${packages;VERSIONED}
-Provide-Capability:
osgi.service;objectClass:List<String>="org.apache.sling.installer.api.OsgiInstaller,org.apache.sling.installer.api.ResourceChangeListener,org.apache.sling.installer.api.info.InfoProvider,org.apache.sling.installer.api.tasks.RetryHandler",\\
+-conditionalpackage: org.apache.felix.configurator.impl.*,\
+ org.apache.sling.feature.io.*,\
+ javax.json.*,\
+ org.apache.johnzon.core.*,\
+ org.apache.felix.converter.*,\
+ org.apache.felix.cm.*
+# export all versioned packages except for conditional ones
(https://github.com/bndtools/bnd/issues/3721#issuecomment-579026778)
+-exportcontents: ${removeall;${packages;VERSIONED};${packages;CONDITIONAL}}
+Provide-Capability:
osgi.service;objectClass:List<String>="org.apache.sling.installer.api.OsgiInstaller,org.apache.sling.installer.api.ResourceChangeListener,org.apache.sling.installer.api.info.InfoProvider,org.apache.sling.installer.api.tasks.RetryHandler",\
osgi.service;objectClass:List<String>="org.apache.sling.installer.api.event.InstallationListener,org.apache.sling.installer.api.jmx.InstallerMBean"
