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 2012/09/11 15:38:32 UTC
svn commit: r1383413 - in /karaf/branches/karaf-2.3.x:
assemblies/features/standard/src/main/resources/features.xml pom.xml
Author: jbonofre
Date: Tue Sep 11 13:38:31 2012
New Revision: 1383413
URL: http://svn.apache.org/viewvc?rev=1383413&view=rev
Log:
[KARAF-1809] Fix spring-web-portlet feature
Modified:
karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml
karaf/branches/karaf-2.3.x/pom.xml
Modified: karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml?rev=1383413&r1=1383412&r2=1383413&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml Tue Sep 11 13:38:31 2012
@@ -154,6 +154,7 @@
<feature name="spring-web-portlet" description="Spring Web Portlet support" version="${spring.version}" resolver="(obr)">
<feature version="${spring.version}">spring-web</feature>
+ <bundle dependency="true" start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
<bundle start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring.version}</bundle>
</feature>
Modified: karaf/branches/karaf-2.3.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/pom.xml?rev=1383413&r1=1383412&r2=1383413&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/pom.xml Tue Sep 11 13:38:31 2012
@@ -162,6 +162,7 @@
<pax.web.version>1.1.3</pax.web.version>
<pax.tinybundles.version>1.3.0</pax.tinybundles.version>
<plexus.utils.version>2.1</plexus.utils.version>
+ <portlet-api.version>2.0</portlet-api.version>
<servicemix.specs.version>2.0.0</servicemix.specs.version>
<servlet.api.version>2.5</servlet.api.version>
<slf4j.version>1.6.6</slf4j.version>