You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2015/10/20 17:28:31 UTC
[1/2] camel git commit: Upgrade Quartz to version 2.2.2
Repository: camel
Updated Branches:
refs/heads/master 4a3ef79db -> ee65ccad7
Upgrade Quartz to version 2.2.2
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/35b66cd7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/35b66cd7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/35b66cd7
Branch: refs/heads/master
Commit: 35b66cd7b27fcc802fdd198237b5d70f2c0f7a64
Parents: 4a3ef79
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Oct 20 17:16:13 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Oct 20 17:16:13 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/35b66cd7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1d4c29f..bcb68dc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -418,7 +418,7 @@
<quartz-bundle-version>1.8.6_1</quartz-bundle-version>
<quartz-version>1.8.6</quartz-version>
<quartz-version-range>[1.8,2)</quartz-version-range>
- <quartz2-version>2.2.1</quartz2-version>
+ <quartz2-version>2.2.2</quartz2-version>
<quickfix-bundle-version>1.6.0_1</quickfix-bundle-version>
<rabbitmq-amqp-client-version>3.5.6</rabbitmq-amqp-client-version>
<reflections-bundle-version>0.9.10_1</reflections-bundle-version>
[2/2] camel git commit: Fixed Quartz2 component tests
Posted by ac...@apache.org.
Fixed Quartz2 component tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ee65ccad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ee65ccad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ee65ccad
Branch: refs/heads/master
Commit: ee65ccad7706708953a1c2d4a50dd50184e292c9
Parents: 35b66cd
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Oct 20 17:16:22 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Oct 20 17:16:22 2015 +0200
----------------------------------------------------------------------
.../routepolicy/quartz2/CronScheduledRoutePolicyTest.java | 6 +++---
.../routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java | 2 +-
.../routepolicy/quartz2/SpringScheduledRoutePolicyTest.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ee65ccad/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
index 6b6ace4..f8d9b2e 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
+++ b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
@@ -64,8 +64,8 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
}
});
context.start();
- context.stopRoute("test1", 0, TimeUnit.MILLISECONDS);
- context.stopRoute("test2", 0, TimeUnit.MILLISECONDS);
+ context.stopRoute("test1", 1000, TimeUnit.MILLISECONDS);
+ context.stopRoute("test2", 1000, TimeUnit.MILLISECONDS);
Thread.sleep(5000);
assertTrue(context.getRouteStatus("test1") == ServiceStatus.Started);
@@ -125,7 +125,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
}
});
context.start();
- context.stopRoute("test", 0, TimeUnit.MILLISECONDS);
+ context.stopRoute("test", 1000, TimeUnit.MILLISECONDS);
Thread.sleep(5000);
assertTrue(context.getRouteStatus("test") == ServiceStatus.Started);
http://git-wip-us.apache.org/repos/asf/camel/blob/ee65ccad/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
index b2b669e..c2dcbd6 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
+++ b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
@@ -59,7 +59,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
}
});
context.start();
- context.stopRoute("test", 0, TimeUnit.MILLISECONDS);
+ context.stopRoute("test", 1000, TimeUnit.MILLISECONDS);
Thread.sleep(5000);
assertTrue(context.getRouteStatus("test") == ServiceStatus.Started);
http://git-wip-us.apache.org/repos/asf/camel/blob/ee65ccad/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java
index 2926418..40666e8 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java
+++ b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java
@@ -45,7 +45,7 @@ public abstract class SpringScheduledRoutePolicyTest extends TestSupport {
MockEndpoint mock = context.getEndpoint("mock:success", MockEndpoint.class);
mock.expectedMinimumMessageCount(1);
- context.stopRoute("testRoute", 0, TimeUnit.MILLISECONDS);
+ context.stopRoute("testRoute", 1000, TimeUnit.MILLISECONDS);
Thread.sleep(4000);
assertTrue(context.getRouteStatus("testRoute") == ServiceStatus.Started);