From f2e154792017aba1ccc67835f584b2190e88738d Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Mon, 16 Oct 2023 13:22:06 +0300
Subject: [PATCH] [JAVA-26046] Upgraded spring-scheduling to spring boot 3
 (#14939)

---
 spring-scheduling/pom.xml                        | 16 +++++++---------
 .../dynamic/DynamicSchedulingConfig.java         |  2 +-
 .../ThreadPoolTaskSchedulerExamples.java         |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/spring-scheduling/pom.xml b/spring-scheduling/pom.xml
index 9010338fee..e374b2b890 100644
--- a/spring-scheduling/pom.xml
+++ b/spring-scheduling/pom.xml
@@ -10,9 +10,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -33,21 +33,19 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${annotation-api.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
     </dependencies>
 
     <properties>
-        <spring-retry.version>2.0.0</spring-retry.version>
-        <annotation-api.version>1.3.2</annotation-api.version>
+        <spring-retry.version>2.0.3</spring-retry.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-scheduling/src/main/java/com/baeldung/scheduling/dynamic/DynamicSchedulingConfig.java b/spring-scheduling/src/main/java/com/baeldung/scheduling/dynamic/DynamicSchedulingConfig.java
index b29f9ab0ce..7b7c18f507 100644
--- a/spring-scheduling/src/main/java/com/baeldung/scheduling/dynamic/DynamicSchedulingConfig.java
+++ b/spring-scheduling/src/main/java/com/baeldung/scheduling/dynamic/DynamicSchedulingConfig.java
@@ -37,7 +37,7 @@ public class DynamicSchedulingConfig implements SchedulingConfigurer {
               Instant nextExecutionTime =
                 lastCompletionTime.orElseGet(Date::new).toInstant()
                   .plusMillis(tickService.getDelay());
-              return Date.from(nextExecutionTime);
+              return Date.from(nextExecutionTime).toInstant();
           }
         );
     }
diff --git a/spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java b/spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
index c0c6f37507..163be62591 100644
--- a/spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
+++ b/spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
@@ -2,7 +2,7 @@ package com.baeldung.taskscheduler;
 
 import java.util.Date;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;