chore: upgrade to Java 17 and update dependencies (#61)

* chore: upgrade to Java 17 and update dependencies * style: remove unused imports
datasektionen · Apr 12, 2024 · 740bcc5 · 740bcc5
1 parent ff19e4e
commit 740bcc5
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 25 deletions.
diff --git 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
@@ -1,4 +1,3 @@
-version: "3.8"
 services:
   db:
     image: postgres:16-alpine3.18

diff --git a/pom.xml b/pom.xml
@@ -32,50 +32,49 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.4.RELEASE</version>
+        <version>2.7.18</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.3.4.RELEASE</version>
+            <version>2.7.18</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>2.3.4.RELEASE</version>
+            <version>2.7.18</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
-            <version>2.3.4.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
-            <version>2.3.4.RELEASE</version>
+            <version>2.7.18</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
-            <version>2.3.4.RELEASE</version>
+            <version>2.7.18</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.18</version>
+            <version>42.7.3</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>net.sf.biweekly</groupId>
             <artifactId>biweekly</artifactId>
-            <version>0.6.1</version>
+            <version>0.6.8</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.16</version>
+            <version>1.18.32</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -85,18 +84,18 @@
         <dependency>
             <groupId>com.rometools</groupId>
             <artifactId>rome</artifactId>
-            <version>1.10.0</version>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>com.atlassian.commonmark</groupId>
             <artifactId>commonmark</artifactId>
-            <version>0.15.2</version>
+            <version>0.17.0</version>
         </dependency>
     </dependencies>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
 </project>
diff --git 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
@@ -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<ReceptionMode, Long> {
 

diff --git 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
@@ -1 +1 @@
-java.runtime.version=11
+java.runtime.version=17