From 41c2466c7fc864eae55523f86a11114e5f4667e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szrnka?= Date: Tue, 3 Dec 2024 14:40:46 +0100 Subject: [PATCH] GMS-175 Dependency fixes --- code/gms-backend/pom.xml | 8 +++++--- .../github/gms/common/enums/RotationPeriod.java | 16 ++++++++-------- .../gms/functions/apikey/ApiKeyController.java | 2 +- .../systemproperty/SystemPropertyController.java | 1 - 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/code/gms-backend/pom.xml b/code/gms-backend/pom.xml index 04becd0d..f8c8f8b7 100644 --- a/code/gms-backend/pom.xml +++ b/code/gms-backend/pom.xml @@ -13,6 +13,8 @@ 21 UTF-8 gms-app + 6.1.14 + 6.3.2 3.3.5 3.0.0-M9 10.17.0 @@ -73,17 +75,17 @@ org.springframework spring-core - 6.1.12 + ${spring-core.version} org.springframework spring-web - 6.1.12 + ${spring-core.version} org.springframework.security spring-security-core - 6.3.2 + ${spring-security-core.version} org.springframework.boot diff --git a/code/gms-backend/src/main/java/io/github/gms/common/enums/RotationPeriod.java b/code/gms-backend/src/main/java/io/github/gms/common/enums/RotationPeriod.java index 3e30dae3..9e7c8295 100644 --- a/code/gms-backend/src/main/java/io/github/gms/common/enums/RotationPeriod.java +++ b/code/gms-backend/src/main/java/io/github/gms/common/enums/RotationPeriod.java @@ -11,18 +11,18 @@ @Getter public enum RotationPeriod { - MINUTES(ChronoUnit.MINUTES, 1L), - HOURLY(ChronoUnit.HOURS, 1L), - DAILY(ChronoUnit.DAYS, 1L), - WEEKLY(ChronoUnit.WEEKS, 1L), - MONTHLY(ChronoUnit.MONTHS, 1L), - YEARLY(ChronoUnit.YEARS, 1L); + MINUTES(ChronoUnit.MINUTES), + HOURLY(ChronoUnit.HOURS), + DAILY(ChronoUnit.DAYS), + WEEKLY(ChronoUnit.WEEKS), + MONTHLY(ChronoUnit.MONTHS), + YEARLY(ChronoUnit.YEARS); private final ChronoUnit unit; private final Long unitValue; - RotationPeriod(ChronoUnit unit, Long unitValue) { + RotationPeriod(ChronoUnit unit) { this.unit = unit; - this.unitValue = unitValue; + this.unitValue = 1L; } } \ No newline at end of file diff --git a/code/gms-backend/src/main/java/io/github/gms/functions/apikey/ApiKeyController.java b/code/gms-backend/src/main/java/io/github/gms/functions/apikey/ApiKeyController.java index a08b9f3d..63894ac6 100644 --- a/code/gms-backend/src/main/java/io/github/gms/functions/apikey/ApiKeyController.java +++ b/code/gms-backend/src/main/java/io/github/gms/functions/apikey/ApiKeyController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; import static io.github.gms.common.util.Constants.*; -import static io.github.gms.common.util.Constants.SIZE; + /** * @author Peter Szrnka diff --git a/code/gms-backend/src/main/java/io/github/gms/functions/systemproperty/SystemPropertyController.java b/code/gms-backend/src/main/java/io/github/gms/functions/systemproperty/SystemPropertyController.java index 90e1f28d..6d58df39 100644 --- a/code/gms-backend/src/main/java/io/github/gms/functions/systemproperty/SystemPropertyController.java +++ b/code/gms-backend/src/main/java/io/github/gms/functions/systemproperty/SystemPropertyController.java @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController; import static io.github.gms.common.util.Constants.*; -import static io.github.gms.common.util.Constants.SIZE; /** * @author Peter Szrnka