This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new e663bdf [KARAF-5567]Trying to access ServerInfo service results in
bundle wiring issue
e663bdf is described below
commit e663bdf874509fc175d898360420ee02304eaca5
Author: Freeman Fang <[email protected]>
AuthorDate: Thu Sep 20 21:30:18 2018 +0800
[KARAF-5567]Trying to access ServerInfo service results in bundle wiring
issue
---
.../base/src/main/filtered-resources/resources/etc/config.properties | 1 +
.../resources/org/apache/karaf/instance/resources/etc/config.properties | 1 +
itests/test/src/test/filtered-resources/etc/config.properties | 1 +
3 files changed, 3 insertions(+)
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
index 7e8cbeb..fe30b1a 100644
---
a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
+++
b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
@@ -81,6 +81,7 @@ org.osgi.framework.system.packages= \
org.apache.karaf.version;version="@@karaf.osgi.version@@",\
org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version="@@karaf.osgi.version@@",\
org.apache.karaf.jaas.boot;uses:="javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework";version="@@karaf.osgi.version@@",\
+ org.apache.karaf.info;version="@@karaf.osgi.version@@",\
${jre-${java.specification.version}}
#
diff --git
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
index 2bc76c1..0495f45 100644
---
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
+++
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
@@ -81,6 +81,7 @@ org.osgi.framework.system.packages= \
org.apache.karaf.version;version="@@karaf.osgi.version@@",\
org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version="@@karaf.osgi.version@@",\
org.apache.karaf.jaas.boot;uses:="javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework";version="@@karaf.osgi.version@@",\
+ org.apache.karaf.info;version="@@karaf.osgi.version@@",\
${jre-${java.specification.version}}
#
diff --git a/itests/test/src/test/filtered-resources/etc/config.properties
b/itests/test/src/test/filtered-resources/etc/config.properties
index 2a9e2ef..a563ca5 100644
--- a/itests/test/src/test/filtered-resources/etc/config.properties
+++ b/itests/test/src/test/filtered-resources/etc/config.properties
@@ -81,6 +81,7 @@ org.osgi.framework.system.packages= \
org.apache.karaf.version;version="@@karaf.osgi.version@@",\
org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version="@@karaf.osgi.version@@",\
org.apache.karaf.jaas.boot;uses:="javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework";version="@@karaf.osgi.version@@",\
+ org.apache.karaf.info;version="@@karaf.osgi.version@@",\
${jre-${java.specification.version}}
#
