You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2020/07/30 08:06:53 UTC
[sling-org-apache-sling-installer-core] branch
feature/embed-felix-cm-json created (now 357f5ca)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/embed-felix-cm-json
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-core.git.
at 357f5ca SLING-9618 embed Felix cm.json
This branch includes the following new commits:
new 357f5ca SLING-9618 embed Felix cm.json
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-org-apache-sling-installer-core] 01/01: SLING-9618 embed
Felix cm.json
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/embed-felix-cm-json
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-core.git
commit 357f5ca9f25097c391ce76c4ce005f0a3923b3e1
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Jul 30 10:06:38 2020 +0200
SLING-9618 embed Felix cm.json
---
bnd.bnd | 2 ++
pom.xml | 8 ++------
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 2b7804b..4674e18 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,3 +1,5 @@
-includeresource: @org.apache.felix.configadmin-[0-9.]*.jar!/org/apache/felix/cm/file/ConfigurationHandler.*
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"
+-conditionalpackage: org.apache.felix.cm.json.*
+Bundle-DocURL: https://sling.apache.org/documentation/bundles/osgi-installer.html
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 621715d..8c94eed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,12 +71,8 @@
<shadedPattern>org.apache.sling.installer.core.impl.felix.cm</shadedPattern>
</relocation>
<relocation>
- <pattern>org.apache.sling.feature.io</pattern>
- <shadedPattern>org.apache.sling.installer.core.impl.feature</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.apache.felix.configurator.impl</pattern>
- <shadedPattern>org.apache.sling.installer.core.impl.configurator</shadedPattern>
+ <pattern>org.apache.felix.cm.json</pattern>
+ <shadedPattern>org.apache.sling.installer.core.impl.felix.cm.json</shadedPattern>
</relocation>
</relocations>
</configuration>