Agree to upgrade directly to Spring 3.
Freeman, what do you think ?
Regards
JB
On 07/05/2010 09:05 AM, Guillaume Nodet wrote:
SHouldn't we upgrade the NMR to spring 3 rather than 2.5 ?
On Mon, Jul 5, 2010 at 08:46,<[email protected]> wrote:
Author: ffang
Date: Mon Jul 5 06:46:08 2010
New Revision: 960458
URL: http://svn.apache.org/viewvc?rev=960458&view=rev
Log:
[SMX4NMR-201]use spring2-dm feature from karaf which use spring 2.5.6 inside
Modified:
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
Modified:
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml?rev=960458&r1=960457&r2=960458&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
(original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
Mon Jul 5 06:46:08 2010
@@ -24,7 +24,7 @@
<bundle>mvn:org.apache.servicemix.transaction/org.apache.servicemix.transaction/${version}</bundle>
</feature>
<feature name="document" version="${version}">
-<feature>spring-dm</feature>
+<feature>spring2-dm</feature>
<bundle>mvn:org.apache.servicemix.document/org.apache.servicemix.document/${pom.version}</bundle>
</feature>
<feature name="nmr" version="${version}">
@@ -66,7 +66,7 @@
</feature>
<feature name="jbi-cluster" version="${version}">
<feature version="${version}">jbi</feature>
-<feature>spring</feature>
+<feature version="${spring.version}">spring</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}</bundle>
<bundle>mvn:org.springframework/spring-jms/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.jbi.cluster/org.apache.servicemix.jbi.cluster.requestor/${pom.version}</bundle>
