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 2010/06/29 23:11:30 UTC
svn commit: r959104 - in /karaf/trunk:
assembly/src/main/filtered-resources/features.xml pom.xml
Author: gnodet
Date: Tue Jun 29 21:11:29 2010
New Revision: 959104
URL: http://svn.apache.org/viewvc?rev=959104&view=rev
Log:
KARAF-95: Upgrade to spring 3.x, but keep 2.x feature available
Modified:
karaf/trunk/assembly/src/main/filtered-resources/features.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/features.xml?rev=959104&r1=959103&r2=959104&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/features.xml Tue Jun 29 21:11:29 2010
@@ -17,11 +17,19 @@
limitations under the License.
-->
<features name="karaf-${project.version}">
+ <feature name="spring" version="${spring2.version}">
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}</bundle>
+ <bundle>mvn:org.springframework/spring-core/${spring2.version}</bundle>
+ <bundle>mvn:org.springframework/spring-beans/${spring2.version}</bundle>
+ <bundle>mvn:org.springframework/spring-aop/${spring2.version}</bundle>
+ <bundle>mvn:org.springframework/spring-context/${spring2.version}</bundle>
+ <bundle>mvn:org.springframework/spring-context-support/${spring2.version}</bundle>
+ </feature>
<feature name="spring" version="${spring.version}">
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}</bundle>
<bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
- <bundle>mvn:org.springframework/spring-aop/${spring.version}</bundle>
+ <bundle>mvn:org.springframework/spring-aop/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>
</feature>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=959104&r1=959103&r2=959104&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Jun 29 21:11:29 2010
@@ -102,6 +102,7 @@
<pax.web.version>0.7.2</pax.web.version>
<servlet.api.version>2.5</servlet.api.version>
<spring.osgi.version>1.2.0</spring.osgi.version>
+ <spring2.version>2.5.6.SEC01</spring2.version>
<spring.version>3.0.3.RELEASE</spring.version>
<sshd.version>0.4.0</sshd.version>
<xbean.version>3.7</xbean.version>