From 1cdd3c568d658e362de8cdaa291a2ac430af1bad Mon Sep 17 00:00:00 2001 From: Johan Haleby Date: Fri, 10 May 2024 15:14:39 +0200 Subject: [PATCH] Lots of dependency upgrades --- changelog.md | 9 +++++++++ .../jobrunr/JobRunrDeadlineScheduler.java | 2 +- .../cloudevent/DocumentCloudEventWriter.java | 2 +- pom.xml | 18 +++++++++--------- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/changelog.md b/changelog.md index c6c3fb108..98290b4cc 100644 --- a/changelog.md +++ b/changelog.md @@ -26,6 +26,15 @@ ```java subscriptionModel.subscribe("myId", StartAtTime.beginningOfTime(), System.out::println); ``` +* Upgraded Spring Boot from 3.2.1 to 3.2.5 +* Upgraded Mongo sync driver 4.11.1 to 4.11.2 +* Upgraded jobrunr from 6.3.3 to 7.1.1 +* Upgraded project reactor from 3.6.0 to 3.6.5 +* Upgraded jackson from 2.15.3 to 2.15.4 +* Upgraded Kotlin from 1.9.22 to 1.9.23 +* Upgraded spring-data-mongodb from 4.2.0 to 4.2.5 +* Upgraded cloudevents from 2.5.0 to 3.0.0 + ### 0.17.2 (2024-02-27) * Fixed issue in CompetingConsumerSubscriptionModel in which it failed to reacquire consumption rights in some cases where MongoDB connection was lost. diff --git a/deadline/jobrunr/src/main/java/org/occurrent/deadline/jobrunr/JobRunrDeadlineScheduler.java b/deadline/jobrunr/src/main/java/org/occurrent/deadline/jobrunr/JobRunrDeadlineScheduler.java index b45476c67..79b8404d8 100644 --- a/deadline/jobrunr/src/main/java/org/occurrent/deadline/jobrunr/JobRunrDeadlineScheduler.java +++ b/deadline/jobrunr/src/main/java/org/occurrent/deadline/jobrunr/JobRunrDeadlineScheduler.java @@ -46,7 +46,7 @@ public void schedule(String id, String category, Deadline deadline, Object data) @Override public void cancel(String id) { - jobRequestScheduler.delete(id); + jobRequestScheduler.delete(generateUUIDFromString(id)); } private static UUID generateUUIDFromString(String id) { diff --git a/eventstore/mongodb/common/src/main/java/org/occurrent/eventstore/mongodb/cloudevent/DocumentCloudEventWriter.java b/eventstore/mongodb/common/src/main/java/org/occurrent/eventstore/mongodb/cloudevent/DocumentCloudEventWriter.java index c11e9dbe3..6bc2c182d 100644 --- a/eventstore/mongodb/common/src/main/java/org/occurrent/eventstore/mongodb/cloudevent/DocumentCloudEventWriter.java +++ b/eventstore/mongodb/common/src/main/java/org/occurrent/eventstore/mongodb/cloudevent/DocumentCloudEventWriter.java @@ -63,7 +63,7 @@ public CloudEventContextWriter withContextAttribute(String name, OffsetDateTime } @Override - public CloudEventContextWriter withContextAttribute(String name, Number value) throws CloudEventRWException { + public CloudEventContextWriter withContextAttribute(String name, Integer value) throws CloudEventRWException { document.append(name, value); return this; } diff --git a/pom.xml b/pom.xml index 988d964c8..3ab031b0e 100644 --- a/pom.xml +++ b/pom.xml @@ -70,17 +70,17 @@ 17 5.10.1 1.19.3 - 1.9.22 - 2.15.3 - 2.5.0 - 3.6.0 + 1.9.23 + 2.15.4 + 3.0.0 + 3.6.5 4.2.0 - 3.2.1 - 4.11.1 - 1.9.10 + 3.2.5 + 4.11.2 + 1.9.20 0.100.3 - 4.2.0 - 6.3.3 + 4.2.1 + 7.1.1