Repository: karaf
Updated Branches:
  refs/heads/karaf-2.x 93f2c46ba -> 93aa6ee6e


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/93aa6ee6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/93aa6ee6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/93aa6ee6

Branch: refs/heads/karaf-2.x
Commit: 93aa6ee6eb263adb2ef00f3550d9c2a5eb4646fc
Parents: ffc6f18
Author: Guillaume Nodet <[email protected]>
Authored: Mon Mar 2 09:08:36 2015 +0100
Committer: Guillaume Nodet <[email protected]>
Committed: Mon Mar 2 09:12:51 2015 +0100

----------------------------------------------------------------------
 assemblies/features/spring/src/main/resources/features.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/93aa6ee6/assemblies/features/spring/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/src/main/resources/features.xml 
b/assemblies/features/spring/src/main/resources/features.xml
index ed2ec0e..bbd5ae4 100644
--- a/assemblies/features/spring/src/main/resources/features.xml
+++ b/assemblies/features/spring/src/main/resources/features.xml
@@ -110,7 +110,7 @@
 
     <feature name="spring-web-portlet" description="Spring 3.1.x Web Portlet 
support" version="${spring31.version}">
         <feature version="[${spring31.version},3.2)">spring-web</feature>
-        <bundle dependency="true" 
start-level="30">wrap: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>
 
@@ -186,7 +186,7 @@
 
     <feature name="spring-web-portlet" description="Spring 3.2.x Web Portlet 
support" version="${spring32.version}">
         <feature version="[${spring32.version},3.3)">spring-web</feature>
-        <bundle dependency="true" 
start-level="30">wrap: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>
 
@@ -253,7 +253,7 @@
 
     <feature name="spring-web-portlet" description="Spring 4.0.x Web Portlet 
support" version="${spring40.version}">
         <feature version="[${spring40.version},4.1)">spring-web</feature>
-        <bundle dependency="true" 
start-level="30">wrap: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>
 
@@ -325,7 +325,7 @@
 
     <feature name="spring-web-portlet" description="Spring 4.1.x Web Portlet 
support" version="${spring41.version}">
         <feature version="[${spring41.version},4.2)">spring-web</feature>
-        <bundle dependency="true" 
start-level="30">wrap: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/${spring41.version}</bundle>
     </feature>
 

Reply via email to