You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2020/04/30 10:47:36 UTC

[felix-dev] branch master updated: FELIX-6270 : webconsole-all bundle doesn't contain required package

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 3612f2e  FELIX-6270 :  webconsole-all bundle doesn't contain required package
3612f2e is described below

commit 3612f2e572c04bcaba795575df253f1acc15c4cd
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Apr 30 12:47:22 2020 +0200

    FELIX-6270 :  webconsole-all bundle doesn't contain required package
---
 webconsole/changelog.txt | 16 +++++++++++++++-
 webconsole/pom.xml       | 28 +++++++++++-----------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/webconsole/changelog.txt b/webconsole/changelog.txt
index 4b5f084..4d75650 100644
--- a/webconsole/changelog.txt
+++ b/webconsole/changelog.txt
@@ -1,5 +1,19 @@
+Changes in 4.5.2
+----------------
+** Bug
+    * [FELIX-6270] - webconsole-all bundle doesn't contain required package
+    * [FELIX-6271] - Make sure invalid bundles are deleted in BundleServlet
+
+Changes in 4.5.0
+----------------
+** Improvement
+    * [FELIX-6254] - Package refresh does not attach fragments
+    * [FELIX-6255] - Allow to update a specific bundle through the UI
+    * [FELIX-6260] - Require Java 8 and OSGi R6
+    * [FELIX-6268] - Add a link to the configuration json serializer if available
+
 Changes in 4.4.0
------------------
+----------------
 ** Improvement
     * [FELIX-6232] - Allow Webconsole to install parallel versions of bundles
 ** Bug
diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index 44c7be9..9c234cf 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -114,7 +114,6 @@
                         </Export-Package>
                         <Import-Package>
                             javax.servlet.*;version="[2.4,4)",
-                            org.apache.commons.io; version="[1.4,3)",
                             !org.apache.felix.bundlerepository,
                             !org.osgi.service.obr,
                             !org.osgi.service.cm,
@@ -217,27 +216,22 @@
                                        <Bundle-Version>
                                            ${project.version}-all
                                        </Bundle-Version>
-                                       <Export-Package>                                         
-                                            org.apache.commons.fileupload,
-                                            org.apache.commons.fileupload.disk,
-                                            org.apache.commons.fileupload.servlet,
-                                            org.apache.commons.fileupload.util,
-                                            org.apache.commons.io,
-                                            org.apache.commons.io.filefilter,
-                                            org.apache.commons.io.output,
-                                            org.apache.felix.inventory;version=1.0.0,
-                                            ${webconsole.exports}
+                                       <Export-Package>
+                                           org.apache.commons.fileupload,
+                                           org.apache.commons.fileupload.disk,
+                                           org.apache.commons.fileupload.servlet,
+                                           org.apache.commons.fileupload.util,
+                                           org.apache.commons.io.*,
+                                           org.apache.felix.inventory,
+                                           ${webconsole.exports}
                                        </Export-Package>
                                        <Embed-Dependency>
                                            <!-- Import/Export-Package parsing -->
                                            org.apache.felix.utils;inline=org/apache/felix/utils/manifest/**,
                                            org.apache.felix.utils;inline=org/apache/felix/utils/json/**,
-                                           org.apache.felix.framework;inline=org/apache/felix/framework/util/VersionRange**,
-                                            
-                                           <!-- ServiceTracker -->
-                                           org.osgi.compendium;
-                                              inline=org/osgi/util/tracker/*,
-                                           org.apache.felix.inventory;inline=true
+                                           org.apache.felix.inventory;inline=true,
+                                           commons-fileupload;inline=true,
+                                           commons-io;inline=true
                                        </Embed-Dependency>
                                        
                                        <_removeheaders>