camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1164429 - in /camel/branches/camel-2.8.x: ./ examples/camel-example-etl/src/main/resources/features.xml
Date Fri, 02 Sep 2011 09:22:55 GMT
Author: davsclaus
Date: Fri Sep  2 09:22:55 2011
New Revision: 1164429

URL: http://svn.apache.org/viewvc?rev=1164429&view=rev
Log:
Merged revisions 1156277 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk


Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/examples/camel-example-etl/src/main/resources/features.xml

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 09:22:55 2011
@@ -1 +1 @@
-/camel/trunk:1150651,1151054,1152170,1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395
+/camel/trunk:1150651,1151054,1152170,1155230,1156108,1156260,1156277,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/examples/camel-example-etl/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-etl/src/main/resources/features.xml?rev=1164429&r1=1164428&r2=1164429&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-etl/src/main/resources/features.xml
(original)
+++ camel/branches/camel-2.8.x/examples/camel-example-etl/src/main/resources/features.xml
Fri Sep  2 09:22:55 2011
@@ -31,7 +31,7 @@
     <feature name='hibernate-feauture' version='${pom.version}'>
        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/1.4.0</bundle>
        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/1.2.2_5</bundle>
-       <bundle>mvn:org.springframework/spring-jdbc/2.5.6.SEC01</bundle>
+       <bundle>mvn:org.springframework/spring-jdbc/3.0.5.RELEASE</bundle>
        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_2</bundle>
        <bundle>mvn:org.antlr/com.springsource.antlr/2.7.7</bundle>
        <bundle>mvn:org.objectweb.asm/com.springsource.org.objectweb.asm/1.5.3</bundle>
@@ -41,7 +41,7 @@
        <bundle>mvn:org.hibernate/com.springsource.org.hibernate.annotations/3.4.0.GA</bundle>
        <bundle>mvn:org.hibernate/com.springsource.org.hibernate.ejb/3.4.0.GA</bundle>
        <bundle>mvn:org.hibernate/com.springsource.org.hibernate/3.3.2.GA</bundle>
-       <bundle>mvn:org.springframework/spring-orm/2.5.6.SEC01</bundle> 
+       <bundle>mvn:org.springframework/spring-orm/3.0.5.RELEASE</bundle> 
     </feature>
     
     <feature name='camel-example-etl' version='${pom.version}'>



Mime
View raw message