! r upgrade quartz

Co-Authored-By: Jay Bazuzi <1259628+JayBazuzi@users.noreply.github.com>
Co-Authored-By: Scott Wierschem <28421044+ScottBob@users.noreply.github.com>

Author: 3 people

approvaltests-tests/pom.xml

@@ -19,9 +19,9 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>quartz</groupId>
+            <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
-            <version>1.5.2</version>
+            <version>2.4.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>

approvaltests-util/pom.xml

@@ -31,9 +31,9 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>quartz</groupId>
+            <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
-            <version>1.5.2</version>
+            <version>2.4.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -65,6 +65,12 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.17.0</version>
         </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.3.5</version> <!-- Or a newer compatible version if available -->
+            <optional>true</optional> <!-- Assuming it's optional like other util dependencies -->
+        </dependency>
 
     </dependencies>
 

approvaltests-util/src/main/java/com/spun/util/quartz/QuartzUtils.java

@@ -1,17 +1,21 @@
 package com.spun.util.quartz;
 
 import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
 
 import java.util.Date;
 
 public class QuartzUtils
 {
-  public static Trigger createTrigger(Trigger trigger, String name, String defaultGroup)
+  public static Trigger createTrigger(Trigger oldTrigger, String name, String defaultGroup)
   {
-    trigger.setName(name);
-    trigger.setGroup(defaultGroup);
-    trigger.setStartTime(new Date());
-    trigger.setEndTime(new Date(Long.MAX_VALUE));
-    return trigger;
+    // Get a TriggerBuilder that is configured to produce a Trigger
+    // identical to the oldTrigger one in terms of job, schedule type etc.
+    TriggerBuilder<? extends Trigger> builder = oldTrigger.getTriggerBuilder();
+    // Now, set the new identity (name and group) and start/end times
+    Trigger newTrigger = builder.withIdentity(name, defaultGroup).startAt(new Date()) // Start immediately
+        .endAt(new Date(Long.MAX_VALUE)) // Effectively never ends
+        .build();
+    return newTrigger;
   }
 }

approvaltests/pom.xml

@@ -64,9 +64,9 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>quartz</groupId>
+            <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
-            <version>1.5.2</version>
+            <version>2.4.0</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>