camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [4/5] git commit: CAMEL-7835 Fixed the test error of camel-quartz
Date Sun, 28 Sep 2014 08:32:23 GMT
CAMEL-7835 Fixed the test error of camel-quartz


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d0388df8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d0388df8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d0388df8

Branch: refs/heads/master
Commit: d0388df8e1f72ed18ae1d74ab5790bf3560be014
Parents: 96bc757
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Sun Sep 28 16:21:25 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Sun Sep 28 16:31:52 2014 +0800

----------------------------------------------------------------------
 components/camel-quartz/pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d0388df8/components/camel-quartz/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz/pom.xml b/components/camel-quartz/pom.xml
index 396c611..3ef7968 100644
--- a/components/camel-quartz/pom.xml
+++ b/components/camel-quartz/pom.xml
@@ -42,6 +42,9 @@
       *
     </camel.osgi.import.pkg>
     <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=quartz</camel.osgi.export.service>
+    <!-- Spring 4.1.x only Compatible with Quartz 2.1.4 and higher -->
+    <!-- Here we just override the spring-version to spring 4.0.x -->
+    <spring-version>${spring40-version}</spring-version>
   </properties>
 
   <dependencies>
@@ -68,7 +71,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test-spring</artifactId>            
+      <artifactId>camel-test-spring40</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -76,6 +79,9 @@
       <artifactId>commons-dbcp</artifactId>
       <scope>test</scope>
     </dependency>
+    
+    <!-- Need to override the default dependency verson of Spring -->
+    
 
     <!-- for persistent test -->
     <dependency>


Mime
View raw message