From 5dd11bbe6c487ad5de5bd323308ee0a578845dc0 Mon Sep 17 00:00:00 2001 From: Hannes Braun Date: Tue, 9 Apr 2024 19:08:28 +0200 Subject: [PATCH] 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 }