Merge pull request #351 from peter-szrnka/350-gms-175-security-updates

GMS-175 Dependency fixes
peter-szrnka · Dec 3, 2024 · 92a1b5c · 92a1b5c
2 parents b758b86 + 41c2466
commit 92a1b5c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/code/gms-backend/pom.xml b/code/gms-backend/pom.xml
@@ -13,6 +13,8 @@
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <backend.buildname>gms-app</backend.buildname>
+        <spring-core.version>6.1.14</spring-core.version>
+        <spring-security-core.version>6.3.2</spring-security-core.version>
         <spring-boot.version>3.3.5</spring-boot.version>
         <maven-surefire-plugin.version>3.0.0-M9</maven-surefire-plugin.version>
         <flyway.version>10.17.0</flyway.version>
@@ -73,17 +75,17 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>6.1.12</version>
+            <version>${spring-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>6.1.12</version>
+            <version>${spring-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
-            <version>6.3.2</version>
+            <version>${spring-security-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

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
@@ -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;
 	}
 }
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
@@ -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/...ackend/src/main/java/io/github/gms/functions/systemproperty/SystemPropertyController.java b/...ackend/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