Tag quartz-2.2.0 from 2.2.0-rc branch

chrisdennis · Jun 29, 2013 · bc4071e · bc4071e
1 parent f269e18
commit bc4071e
Show file tree

Hide file tree

Showing 28 changed files with 93 additions and 623 deletions.
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
@@ -5,7 +5,7 @@
   <groupId>org.quartz-scheduler.internal</groupId>
   <artifactId>quartz-checkstyle</artifactId>
   <name>quartz-checkstyle</name>
-  <version>2.2.1-SNAPSHOT</version>
+  <version>2.2.0</version>
   <packaging>jar</packaging>
 
   <properties>

diff --git a/distribution/examples/pom.xml b/distribution/examples/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
 
   <artifactId>quartz-kit</artifactId>

diff --git a/management-quartz-impl/pom.xml b/management-quartz-impl/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
 
   <artifactId>management-quartz-impl</artifactId>

diff --git a/management-quartz/pom.xml b/management-quartz/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
 
   <artifactId>management-quartz</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.quartz-scheduler</groupId>
   <artifactId>quartz-parent</artifactId>
-  <version>2.2.1-SNAPSHOT</version>
+  <version>2.2.0</version>
   <name>quartz-parent</name>
   <packaging>pom</packaging>
 

diff --git a/quartz-commonj/pom.xml b/quartz-commonj/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
 
   <groupId>org.quartz-scheduler.internal</groupId>

diff --git a/quartz-core/pom.xml b/quartz-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
 
   <groupId>org.quartz-scheduler.internal</groupId>

diff --git a/quartz-jboss/pom.xml b/quartz-jboss/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
 
   <groupId>org.quartz-scheduler.internal</groupId>

diff --git a/quartz-jobs/pom.xml b/quartz-jobs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
 
   <groupId>org.quartz-scheduler</groupId>

diff --git a/quartz-oracle/pom.xml b/quartz-oracle/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
 
   <groupId>org.quartz-scheduler.internal</groupId>

diff --git a/quartz-plugins/pom.xml b/quartz-plugins/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
 
   <groupId>org.quartz-scheduler.internal</groupId>

diff --git a/quartz-stubs/pom.xml b/quartz-stubs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
 
   <groupId>org.quartz-scheduler.internal</groupId>

diff --git a/quartz-weblogic/pom.xml b/quartz-weblogic/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
 
   <groupId>org.quartz-scheduler.internal</groupId>

diff --git a/quartz/pom.xml b/quartz/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.quartz-scheduler</groupId>
     <artifactId>quartz-parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
 
   <artifactId>quartz</artifactId>

diff --git a/system-tests/pom.xml b/system-tests/pom.xml
@@ -11,13 +11,13 @@
   <parent>
     <groupId>org.terracotta</groupId>
     <artifactId>system-tests-parent</artifactId>
-    <version>4.0.3-SNAPSHOT</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
 
   <groupId>org.quartz-scheduler.internal</groupId>
   <artifactId>quartz-terracotta-system-tests</artifactId>
-  <version>2.2.1-SNAPSHOT</version>
+  <version>2.2.0</version>
   <name>quartz-terracotta-system-tests</name>
 
   <properties>

diff --git a/system-tests/src/test/java/org/terracotta/quartz/tests/Client1.java b/system-tests/src/test/java/org/terracotta/quartz/tests/Client1.java
@@ -55,7 +55,5 @@ protected void test(Scheduler scheduler) throws Throwable {
     scheduler.scheduleJob(trigger);
 
     localBarrier.await();
-    pass();
-    Runtime.getRuntime().halt(0);
   }
 }
diff --git a/system-tests/src/test/java/org/terracotta/quartz/tests/ClientBase.java b/system-tests/src/test/java/org/terracotta/quartz/tests/ClientBase.java
@@ -60,10 +60,6 @@ public Properties getSchedulerProps() {
     return props;
   }
 
-  public Properties getToolkitProps() {
-    return new Properties();
-  }
-
   protected Scheduler setupScheduler() throws IOException, SchedulerException {
     props.load(getClass().getResourceAsStream("/org/quartz/quartz.properties"));
     props.setProperty(StdSchedulerFactory.PROP_JOB_STORE_CLASS, TerracottaJobStore.class.getName());
@@ -73,8 +69,7 @@ protected Scheduler setupScheduler() throws IOException, SchedulerException {
     props.setProperty(StdSchedulerFactory.PROP_SCHED_INSTANCE_ID, StdSchedulerFactory.AUTO_GENERATE_INSTANCE_ID);
 
     addSchedulerProperties(props);
-
-    System.out.println(props);
+
     SchedulerFactory schedFact = new StdSchedulerFactory(props);
     Scheduler sched = schedFact.getScheduler();
     if (isStartingScheduler()) {
@@ -103,7 +98,7 @@ protected synchronized Toolkit getClusteringToolkit() {
 
   private Toolkit createToolkit() {
     try {
-      return ToolkitFactory.createToolkit("toolkit:terracotta://" + getTerracottaUrl(), getToolkitProps());
+      return ToolkitFactory.createToolkit("toolkit:terracotta://" + getTerracottaUrl());
     } catch (ToolkitInstantiationException e) {
       throw new RuntimeException(e);
     }

diff --git a/system-tests/src/test/java/org/terracotta/quartz/tests/RecoveryTestJob.java b/system-tests/src/test/java/org/terracotta/quartz/tests/RecoveryTestJob.java
@@ -36,11 +36,8 @@ public void execute(JobExecutionContext context) throws JobExecutionException {
       } catch (Exception e) {
         throw new JobExecutionException(e);
       }
-      try {
-        Thread.currentThread().join();
-      } catch (InterruptedException ex) {
-        throw new JobExecutionException(ex);
-      }
+
+      System.exit(0);
     } else {
       assertThat(context.getMergedJobDataMap().getBooleanValue(RecoveryTest.class.getName()), is(true));
       try {

diff --git a/system-tests/src/test/java/org/terracotta/quartz/tests/rejoin/AbstractRejoinTest.java b/system-tests/src/test/java/org/terracotta/quartz/tests/rejoin/AbstractRejoinTest.java
diff --git a/system-tests/src/test/java/org/terracotta/quartz/tests/rejoin/JobSchedulingRejoinTest.java b/system-tests/src/test/java/org/terracotta/quartz/tests/rejoin/JobSchedulingRejoinTest.java