This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 9725b1e FELIX-6375 : Configuration Admin Service not available with
org.apache.felix.webconsole_4.6.0.all
9725b1e is described below
commit 9725b1edc920083e9f7ae3ffcc85095d390086e7
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Wed Jan 13 18:11:26 2021 +0100
FELIX-6375 : Configuration Admin Service not available with
org.apache.felix.webconsole_4.6.0.all
---
webconsole/changelog.txt | 8 +++++++-
webconsole/pom.xml | 14 +++++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/webconsole/changelog.txt b/webconsole/changelog.txt
index 46194e1..9f0bcdb 100644
--- a/webconsole/changelog.txt
+++ b/webconsole/changelog.txt
@@ -1,4 +1,10 @@
-Changes in 4.5.6
+Changes in 4.6.2
+----------------
+** Bug
+ * [FELIX-6375] - Configuration Admin Service not available with
org.apache.felix.webconsole_4.6.0.all
+
+
+Changes in 4.6.0
----------------
** Improvement
* [FELIX-6366] - Update to jQuery 3.5.1 and jQuery migrate 3.3.0
diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index 557890a..c7261ef 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -238,7 +238,19 @@
commons-fileupload;inline=true,
commons-io;inline=true
</Embed-Dependency>
-
<Import-Package>!javax.portlet,*</Import-Package>
+ <Import-Package>
+ javax.servlet.*;version="[2.4,4)",
+ !javax.portlet,
+ !org.apache.felix.bundlerepository,
+ !org.osgi.service.obr,
+ !org.osgi.service.cm,
+ !org.osgi.service.condpermadmin,
+ !org.osgi.service.log,
+ !org.osgi.service.metatype,
+ !org.osgi.service.permissionadmin,
+ !org.osgi.service.prefs,
+ !org.osgi.service.wireadmin,
+ </Import-Package>
<_removeheaders>
Embed-Dependency,Private-Package,Include-Resource
</_removeheaders>
