From bc7d6e51462d0ddc2690f28d19f1a0a349f3e045 Mon Sep 17 00:00:00 2001 From: Hannes Braun Date: Tue, 9 Apr 2024 19:02:23 +0200 Subject: [PATCH 1/5] Update Gradle to 8.7 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 744c64d..20db9ad 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 25390e2132d406d84d5f4d58efc0423ac6949b31 Mon Sep 17 00:00:00 2001 From: Hannes Braun Date: Tue, 9 Apr 2024 19:04:47 +0200 Subject: [PATCH 2/5] Update Kotlin to 1.9.23 --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 567cc4e..6e52328 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.7.20' - id 'org.jetbrains.kotlin.plugin.spring' version '1.7.20' + id 'org.jetbrains.kotlin.jvm' version '1.9.23' + id 'org.jetbrains.kotlin.plugin.spring' version '1.9.23' id 'org.springframework.boot' version '2.7.6' id 'io.spring.dependency-management' version '1.1.0' } @@ -14,7 +14,7 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-web:2.7.6' - implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.7.22' + implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.23' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4' implementation 'org.jsoup:jsoup:1.15.3' implementation 'com.google.code.gson:gson:2.10' From 5dd11bbe6c487ad5de5bd323308ee0a578845dc0 Mon Sep 17 00:00:00 2001 From: Hannes Braun Date: Tue, 9 Apr 2024 19:08:28 +0200 Subject: [PATCH 3/5] Update required Java version to 21 Also update Spring to 3.2.4. This is required as the old spring version does not support Java 21. --- Dockerfile | 2 +- build.gradle | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5240bb0..63cabf1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11:alpine-jre +FROM eclipse-temurin:21-jre-alpine RUN addgroup -S spring && adduser -S spring -G spring #RUN groupadd -r spring && useradd -r -g spring spring # for openjdk:xx builds RUN mkdir /tcor && chown spring:spring /tcor diff --git a/build.gradle b/build.gradle index 6e52328..f05ffe6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.9.23' id 'org.jetbrains.kotlin.plugin.spring' version '1.9.23' - id 'org.springframework.boot' version '2.7.6' - id 'io.spring.dependency-management' version '1.1.0' + id 'org.springframework.boot' version '3.2.4' + id 'io.spring.dependency-management' version '1.1.4' } group 'org.mosad' @@ -13,7 +13,7 @@ repositories { } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web:2.7.6' + implementation 'org.springframework.boot:spring-boot-starter-web:3.2.4' implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.23' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4' implementation 'org.jsoup:jsoup:1.15.3' @@ -30,7 +30,7 @@ test { } } -def jvmTargetVersion = "11" +def jvmTargetVersion = "21" compileKotlin { kotlinOptions.jvmTarget = jvmTargetVersion } From 951a659be159b312f0f49047572de4bae2164acf Mon Sep 17 00:00:00 2001 From: Hannes Braun Date: Tue, 9 Apr 2024 19:09:29 +0200 Subject: [PATCH 4/5] Fix URL deprecation warnings --- .../thecitadelofricks/controller/CachetAPIController.kt | 4 ++-- .../mosad/thecitadelofricks/controller/StatusController.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/controller/CachetAPIController.kt b/src/main/kotlin/org/mosad/thecitadelofricks/controller/CachetAPIController.kt index 534e3eb..71ed2d2 100644 --- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/CachetAPIController.kt +++ b/src/main/kotlin/org/mosad/thecitadelofricks/controller/CachetAPIController.kt @@ -29,7 +29,7 @@ import java.io.BufferedReader import java.io.IOException import java.io.InputStreamReader import java.net.HttpURLConnection -import java.net.URL +import java.net.URI class CachetAPIController { @@ -41,7 +41,7 @@ class CachetAPIController { fun postTotalRequests() { try { - val url = URL("${StartupController.cachetBaseURL}/api/v1/metrics/1/points") + val url = URI("${StartupController.cachetBaseURL}/api/v1/metrics/1/points").toURL() val jsonInputString = "{\"value\": ${totalRequests -oldTotalRequests}, \"timestamp\": \"${(System.currentTimeMillis() / 1000)}\"}" oldTotalRequests = totalRequests diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt b/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt index dd72bd1..e5c35c4 100644 --- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt +++ b/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt @@ -29,7 +29,7 @@ import org.mosad.thecitadelofricks.Status import org.slf4j.Logger import org.slf4j.LoggerFactory import java.net.HttpURLConnection -import java.net.URL +import java.net.URI import java.time.LocalDateTime import java.util.* import kotlin.collections.HashMap @@ -90,8 +90,8 @@ class StatusController { var swfrCode = 999 try { - val hsoURL = URL("https://www.hs-offenburg.de/") - val swfrURL = URL("https://www.swfr.de/") + val hsoURL = URI("https://www.hs-offenburg.de/").toURL() + val swfrURL = URI("https://www.swfr.de/").toURL() var connection = hsoURL.openConnection() as HttpURLConnection connection.requestMethod = "HEAD" From 47f25c5064c8c6954101acd899bf02dc97184ee2 Mon Sep 17 00:00:00 2001 From: Hannes Braun Date: Tue, 9 Apr 2024 19:10:14 +0200 Subject: [PATCH 5/5] Update dependencies --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index f05ffe6..3ed3478 100644 --- a/build.gradle +++ b/build.gradle @@ -15,11 +15,11 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-web:3.2.4' implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.23' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4' - implementation 'org.jsoup:jsoup:1.15.3' - implementation 'com.google.code.gson:gson:2.10' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0' + implementation 'org.jsoup:jsoup:1.17.2' + implementation 'com.google.code.gson:gson:2.10.1' - testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' + testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' } test {