diff --git a/Dockerfile b/Dockerfile index f06b4b8..ee95ff6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM amazoncorretto:11-alpine3.18 AS base +FROM amazoncorretto:17-alpine3.19 AS base WORKDIR /app ENV TZ=Europe/Stockholm diff --git a/docker-compose.yaml b/docker-compose.yaml index 723b6ca..bcb3d6a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.8" services: db: image: postgres:16-alpine3.18 diff --git a/pom.xml b/pom.xml index b7620ea..78ecd59 100644 --- a/pom.xml +++ b/pom.xml @@ -32,50 +32,49 @@ org.springframework.boot spring-boot-starter-parent - 2.3.4.RELEASE + 2.7.18 org.springframework.boot spring-boot-starter-web - 2.3.4.RELEASE + 2.7.18 org.springframework.boot spring-boot-starter-data-jpa - 2.3.4.RELEASE + 2.7.18 org.springframework.boot spring-boot-starter-thymeleaf - 2.3.4.RELEASE org.springframework.boot spring-boot-starter-validation - 2.3.4.RELEASE + 2.7.18 org.springframework.boot spring-boot-starter-security - 2.3.4.RELEASE + 2.7.18 org.postgresql postgresql - 42.2.18 + 42.7.3 runtime net.sf.biweekly biweekly - 0.6.1 + 0.6.8 org.projectlombok lombok - 1.18.16 + 1.18.32 provided @@ -85,18 +84,18 @@ com.rometools rome - 1.10.0 + 2.1.0 com.atlassian.commonmark commonmark - 0.15.2 + 0.17.0 - 11 - 11 + 17 + 17 \ No newline at end of file diff --git a/src/main/java/se/datasektionen/calypso/controllers/api/ApiController.java b/src/main/java/se/datasektionen/calypso/controllers/api/ApiController.java index 24a5cbb..1a7d7a6 100644 --- a/src/main/java/se/datasektionen/calypso/controllers/api/ApiController.java +++ b/src/main/java/se/datasektionen/calypso/controllers/api/ApiController.java @@ -2,7 +2,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Direction; @@ -21,7 +20,6 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import java.util.stream.Stream; @RestController @CrossOrigin diff --git a/src/main/java/se/datasektionen/calypso/models/repositories/ReceptionRepository.java b/src/main/java/se/datasektionen/calypso/models/repositories/ReceptionRepository.java index 6fe8b20..22084a9 100644 --- a/src/main/java/se/datasektionen/calypso/models/repositories/ReceptionRepository.java +++ b/src/main/java/se/datasektionen/calypso/models/repositories/ReceptionRepository.java @@ -1,15 +1,8 @@ package se.datasektionen.calypso.models.repositories; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; -import se.datasektionen.calypso.models.entities.Item; import se.datasektionen.calypso.models.entities.ReceptionMode; -import se.datasektionen.calypso.models.enums.ItemType; - -import java.util.List; -import java.util.Optional; public interface ReceptionRepository extends CrudRepository { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 011ad12..bdc8730 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,5 @@ security.basic.enabled=false +spring.main.allow-circular-references=true spring.jpa.generate-ddl=true spring.datasource.url=${JDBC_DATABASE_URL} spring.datasource.username=${JDBC_DATABASE_USERNAME} diff --git a/system.properties b/system.properties index 180a273..eafd676 100644 --- a/system.properties +++ b/system.properties @@ -1 +1 @@ -java.runtime.version=11 \ No newline at end of file +java.runtime.version=17