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 2014/11/27 08:31:22 UTC
[2/2] karaf git commit: Fix spring-web-portlet features
Fix spring-web-portlet features
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5b95c4d7
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5b95c4d7
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5b95c4d7
Branch: refs/heads/master
Commit: 5b95c4d7a99da47d7fd4e20fbd577e8e875f88bd
Parents: 25f9ec6
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Nov 27 08:31:13 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Nov 27 08:31:13 2014 +0100
----------------------------------------------------------------------
assemblies/features/spring/src/main/feature/feature.xml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/5b95c4d7/assemblies/features/spring/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
index 3b7112d..7a3b461 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -112,8 +112,9 @@
</feature>
<feature name="spring-web-portlet" description="Spring 3.1.x Web Portlet support" version="${spring31.version}">
+ <feature prerequisite="true">wrap</feature>
<feature version="[${spring31.version},3.2)">spring-web</feature>
- <bundle dependency="true" start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
+ <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
<bundle start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring31.version}</bundle>
</feature>
@@ -189,8 +190,9 @@
</feature>
<feature name="spring-web-portlet" description="Spring 3.2.x Web Portlet support" version="${spring32.version}">
+ <feature prerequisite="true">wrap</feature>
<feature version="[${spring32.version},3.3)">spring-web</feature>
- <bundle dependency="true" start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
+ <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring32.version}</bundle>
</feature>
@@ -257,8 +259,9 @@
</feature>
<feature name="spring-web-portlet" description="Spring 4.0.x Web Portlet support" version="${spring40.version}">
+ <feature prerequisite="true">wrap</feature>
<feature version="[${spring40.version},4.1)">spring-web</feature>
- <bundle dependency="true" start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
+ <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring40.version}</bundle>
</feature>