From cb2b2ca4e8ccc93a3e48573ef321443f5aab3b38 Mon Sep 17 00:00:00 2001
From: Markus Block <markus.block@bosch-si.com>
Date: Fri, 27 Nov 2020 12:19:49 +0100
Subject: [PATCH] Increase cronutils version (#1053)

* CVE-2020-26238

Signed-off-by: Markus Block <markus.block@bosch-si.com>

* adapted code to new cron-utils versions

Signed-off-by: Markus Block <markus.block@bosch-si.com>
---
 .../hawkbit/repository/MaintenanceScheduleHelper.java      | 7 +++----
 pom.xml                                                    | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelper.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelper.java
index e5d3f1de8..3bc354181 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelper.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelper.java
@@ -58,7 +58,7 @@ public final class MaintenanceScheduleHelper {
      * @return { @link Optional<ZonedDateTime>} of the next available window. In
      *         case there is none, or there are maintenance window validation
      *         errors, returns empty value.
-     * 
+     *
      */
     // Exception squid:S1166 - if there are validation error(format of cron
     // expression or duration is wrong), we simply return empty value
@@ -69,8 +69,7 @@ public final class MaintenanceScheduleHelper {
             final ExecutionTime scheduleExecutor = ExecutionTime.forCron(getCronFromExpression(cronSchedule));
             final ZonedDateTime now = ZonedDateTime.now(ZoneOffset.of(timezone));
             final ZonedDateTime after = now.minus(convertToISODuration(duration));
-            final ZonedDateTime next = scheduleExecutor.nextExecution(after);
-            return Optional.of(next);
+            return scheduleExecutor.nextExecution(after);
         } catch (final RuntimeException ignored) {
             return Optional.empty();
         }
@@ -85,7 +84,7 @@ public final class MaintenanceScheduleHelper {
      *            year".
      *
      * @return {@link Cron} object, that corresponds to the expression.
-     * 
+     *
      * @throws IllegalArgumentException
      *             if the cron expression doesn't have a valid format.
      */
diff --git a/pom.xml b/pom.xml
index 8f3743ec7..2322cc211 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,8 +163,8 @@
       <maven.processor.plugin.version>3.3.3</maven.processor.plugin.version>
       <maven.scm.plugin.version>1.11.1</maven.scm.plugin.version>
 
-      <!-- Misc libraries versions - START -->
-      <cron-utils.version>5.0.5</cron-utils.version>
+      <!-- Misc libraries versions - START -->      
+      <cron-utils.version>9.1.3</cron-utils.version>
       <jsoup.version>1.11.2</jsoup.version>
       <allure.version>2.13.6</allure.version>
       <eclipselink.version>2.7.7</eclipselink.version>