You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/06/12 10:32:10 UTC
[2/2] karaf git commit: [KARAF-3780] Support for pax-web 4.x
[KARAF-3780] Support for pax-web 4.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/858be8c6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/858be8c6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/858be8c6
Branch: refs/heads/karaf-3.0.x
Commit: 858be8c6b6d1fee36b706e58ed19e43d87166616
Parents: 7b51d2d
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Jun 11 18:01:16 2015 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Jun 11 18:01:16 2015 +0200
----------------------------------------------------------------------
http/core/pom.xml | 1 +
webconsole/console/pom.xml | 2 +-
webconsole/features/pom.xml | 1 +
webconsole/gogo/pom.xml | 1 +
webconsole/http/pom.xml | 2 ++
webconsole/instance/pom.xml | 1 +
6 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/858be8c6/http/core/pom.xml
----------------------------------------------------------------------
diff --git a/http/core/pom.xml b/http/core/pom.xml
index d162b53..9b8f07a 100644
--- a/http/core/pom.xml
+++ b/http/core/pom.xml
@@ -78,6 +78,7 @@
<configuration>
<instructions>
<Import-Package>
+ javax.servlet;version="[2.6,4)",
org.ops4j.pax.web.service.spi;version="[3.1,5)",
*
</Import-Package>
http://git-wip-us.apache.org/repos/asf/karaf/blob/858be8c6/webconsole/console/pom.xml
----------------------------------------------------------------------
diff --git a/webconsole/console/pom.xml b/webconsole/console/pom.xml
index 21a5f72..f2e354d 100644
--- a/webconsole/console/pom.xml
+++ b/webconsole/console/pom.xml
@@ -135,7 +135,7 @@
org.osgi.service.metatype;resolution:=optional,
org.osgi.service.prefs;resolution:=optional,
javax.portlet;resolution:=optional,
- javax.servlet.*,
+ javax.servlet.*;version="[2.6,4)",
!org.apache.felix.bundlerepository,
!org.osgi.service.obr,
!org.osgi.service.cm,
http://git-wip-us.apache.org/repos/asf/karaf/blob/858be8c6/webconsole/features/pom.xml
----------------------------------------------------------------------
diff --git a/webconsole/features/pom.xml b/webconsole/features/pom.xml
index 807457c..68cf5f2 100644
--- a/webconsole/features/pom.xml
+++ b/webconsole/features/pom.xml
@@ -98,6 +98,7 @@
<configuration>
<instructions>
<Import-Package>
+ javax.servlet.*;version="[2.6,4)",
org.apache.aries.blueprint,
org.apache.felix.webconsole*;version="[3,5)",
org.json,
http://git-wip-us.apache.org/repos/asf/karaf/blob/858be8c6/webconsole/gogo/pom.xml
----------------------------------------------------------------------
diff --git a/webconsole/gogo/pom.xml b/webconsole/gogo/pom.xml
index d550645..eb7fda7 100644
--- a/webconsole/gogo/pom.xml
+++ b/webconsole/gogo/pom.xml
@@ -113,6 +113,7 @@
<configuration>
<instructions>
<Import-Package>
+ javax.servlet.*;version="[2.6,4)",
jline;version="[${jline.version}, ${jline.version}]",
org.apache.aries.blueprint,
org.apache.felix.webconsole*;version="[3,5)",
http://git-wip-us.apache.org/repos/asf/karaf/blob/858be8c6/webconsole/http/pom.xml
----------------------------------------------------------------------
diff --git a/webconsole/http/pom.xml b/webconsole/http/pom.xml
index 50afc75..068f282 100644
--- a/webconsole/http/pom.xml
+++ b/webconsole/http/pom.xml
@@ -103,11 +103,13 @@
<configuration>
<instructions>
<Import-Package>
+ javax.servlet.*;version="[2.6,4)",
org.apache.aries.blueprint,
org.apache.felix.webconsole*;version="[3,5)",
org.json,
org.osgi.service.blueprint.container,
org.osgi.service.blueprint.reflect,
+ org.ops4j.pax.web.service.spi*;version="[3.2,5)",
*
</Import-Package>
</instructions>
http://git-wip-us.apache.org/repos/asf/karaf/blob/858be8c6/webconsole/instance/pom.xml
----------------------------------------------------------------------
diff --git a/webconsole/instance/pom.xml b/webconsole/instance/pom.xml
index 4638c11..045a735 100644
--- a/webconsole/instance/pom.xml
+++ b/webconsole/instance/pom.xml
@@ -107,6 +107,7 @@
<configuration>
<instructions>
<Import-Package>
+ javax.servlet.*;version="[2.6,4)",
org.apache.aries.blueprint,
org.apache.felix.webconsole*;version="[3,5)",
org.json,