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/09/15 05:20:04 UTC
[felix-dev] branch master updated: FELIX-6328 : Web Console (All In
One) imports javax.portlet via fileupload
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 bf93a1d FELIX-6328 : Web Console (All In One) imports javax.portlet via fileupload
bf93a1d is described below
commit bf93a1de835b841ea72a3dceb07d814fdc10b7d8
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Sep 15 07:19:04 2020 +0200
FELIX-6328 : Web Console (All In One) imports javax.portlet via fileupload
---
webconsole/changelog.txt | 6 ++++++
webconsole/pom.xml | 7 ++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/webconsole/changelog.txt b/webconsole/changelog.txt
index e2a9788..0d8e7d6 100644
--- a/webconsole/changelog.txt
+++ b/webconsole/changelog.txt
@@ -1,3 +1,9 @@
+Changes in 4.5.6
+----------------
+** Bug
+ * [FELIX-6328] - Web Console (All In One) imports javax.portlet via fileupload
+
+
Changes in 4.5.4
----------------
** Bug
diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index 2da6a4e..085b56c 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -93,7 +93,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>4.2.1</version>
+ <version>5.1.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -136,9 +136,6 @@
org.osgi.service.prefs;version="[1.1,2)",
org.osgi.service.wireadmin;version="[1.0,2)"
</DynamicImport-Package>
- <Include-Resource>
- {maven-resources},OSGI-INF=target/classes/OSGI-INF
- </Include-Resource>
<Embed-Dependency>
org.apache.felix.utils;inline=org/apache/felix/utils/manifest/**,
org.apache.felix.utils;inline=org/apache/felix/utils/json/**
@@ -233,7 +230,7 @@
commons-fileupload;inline=true,
commons-io;inline=true
</Embed-Dependency>
-
+ <Import-Package>!javax.portlet,*</Import-Package>
<_removeheaders>
Embed-Dependency,Private-Package,Include-Resource
</_removeheaders>