You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/06/10 07:32:58 UTC
[karaf] branch karaf-4.2.x updated: [KARAF-6228] Upgrade to Felix
maven-bundle-plugin 4.2.0
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 07d431e [KARAF-6228] Upgrade to Felix maven-bundle-plugin 4.2.0
07d431e is described below
commit 07d431e4f677d2a9d390ea8b748748bbd201e9ed
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Wed Apr 10 07:34:35 2019 +0200
[KARAF-6228] Upgrade to Felix maven-bundle-plugin 4.2.0
---
diagnostic/boot/pom.xml | 1 +
http/pom.xml | 3 ++-
.../main/java/org/apache/karaf/http/core/internal/ProxyServlet.java | 2 +-
pom.xml | 2 +-
shell/commands/pom.xml | 4 ++++
5 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/diagnostic/boot/pom.xml b/diagnostic/boot/pom.xml
index 3b6ef86..43e57bd 100644
--- a/diagnostic/boot/pom.xml
+++ b/diagnostic/boot/pom.xml
@@ -63,6 +63,7 @@
org.apache.karaf.diagnostic.core.providers
</Private-Package>
<Import-Package>
+ com.sun.management;resolution:=optional,
sun.misc;resolution:=optional,
*
</Import-Package>
diff --git a/http/pom.xml b/http/pom.xml
index 65e266b..f7214bc 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -111,12 +111,13 @@
org.apache.karaf.http.core
</Export-Package>
<Private-Package>
+ org.apache.karaf.util.tracker;-split-package:=merge-first,
org.apache.karaf.http.command,
org.apache.karaf.http.command.completers,
org.apache.karaf.http.core.internal,
org.apache.karaf.http.core.internal.osgi,
org.apache.felix.utils.version,
- org.apache.felix.utils.manifest,
+ org.apache.felix.utils.manifest;-split-package:=merge-first,
org.apache.http*,
org.apache.commons.codec*
</Private-Package>
diff --git a/http/src/main/java/org/apache/karaf/http/core/internal/ProxyServlet.java b/http/src/main/java/org/apache/karaf/http/core/internal/ProxyServlet.java
index 597e5dd..1043cef 100644
--- a/http/src/main/java/org/apache/karaf/http/core/internal/ProxyServlet.java
+++ b/http/src/main/java/org/apache/karaf/http/core/internal/ProxyServlet.java
@@ -87,7 +87,7 @@ public class ProxyServlet extends HttpServlet {
protected HttpClient createHttpClient(HttpParams hcParams) {
try {
- Class clientClazz = Class.forName("og.apache.http.impl.client.SystemDefaultHttpClient");
+ Class clientClazz = Class.forName("org.apache.http.impl.client.SystemDefaultHttpClient");
Constructor constructor = clientClazz.getConstructor(HttpParams.class);
return (HttpClient) constructor.newInstance(hcParams);
} catch (ClassNotFoundException e) {
diff --git a/pom.xml b/pom.xml
index 032a06f..80b41ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,7 +203,7 @@
<felix.httplite.version>0.1.6</felix.httplite.version>
<felix.http.version>4.0.8</felix.http.version>
<felix.inventory.version>1.0.4</felix.inventory.version>
- <felix.plugin.version>4.1.0</felix.plugin.version>
+ <felix.plugin.version>4.2.0</felix.plugin.version>
<felix.utils.version>1.11.2</felix.utils.version>
<felix.webconsole.version>4.3.12</felix.webconsole.version>
<felix.webconsole.api.version>3.1.2</felix.webconsole.api.version>
diff --git a/shell/commands/pom.xml b/shell/commands/pom.xml
index 0d4be52..f311250 100644
--- a/shell/commands/pom.xml
+++ b/shell/commands/pom.xml
@@ -102,6 +102,10 @@
<Export-Package>
org.apache.karaf.shell.commands.info;-noimport:=true
</Export-Package>
+ <Import-Package>
+ com.sun.management;resolution:=optional,
+ *
+ </Import-Package>
<Private-Package>
org.apache.karaf.util.process;-split-package:=merge-first,
org.apache.karaf.util;-split-package:=merge-first,