From 517d0392695e311b20ce96ff40072ec49b9cf6fd Mon Sep 17 00:00:00 2001
From: Lucius Bachmann <lucius.bachmann@scs.ch>
Date: Thu, 20 Jul 2023 18:16:16 +0200
Subject: [PATCH] testing: update to spring boot 3

Drop support for java11, because we need to switch
to jakarta.persistence
---
 .github/workflows/java-exercise.yml                         | 3 +--
 topics/testing/code/pom.xml                                 | 6 +++---
 .../movierental/exercise/common/entity/Customer.java        | 2 +-
 .../jumpstart/movierental/exercise/common/entity/Movie.java | 4 ++--
 .../movierental/exercise/common/entity/Rental.java          | 2 +-
 .../jumpstart/movierental/exercise/common/OpenApiDocIT.java | 2 +-
 .../exercise/common/controller/MovieControllerIT.java       | 2 +-
 .../controller/SpringCustomerControllerIT.java              | 2 +-
 .../controller/SolutionSpringCustomerControllerIT.java      | 2 +-
 9 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/java-exercise.yml b/.github/workflows/java-exercise.yml
index 82f721b..1fd9959 100644
--- a/.github/workflows/java-exercise.yml
+++ b/.github/workflows/java-exercise.yml
@@ -8,8 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: 
-          - '11'
+        java:
           - '17'
     steps:
       - uses: actions/checkout@v3
diff --git a/topics/testing/code/pom.xml b/topics/testing/code/pom.xml
index 55db059..a0165c4 100644
--- a/topics/testing/code/pom.xml
+++ b/topics/testing/code/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.13</version>
+        <version>3.1.1</version>
         <relativePath/>
     </parent>
 
@@ -35,8 +35,8 @@
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.7.0</version>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/topics/testing/code/src/main/java/ch/scs/jumpstart/movierental/exercise/common/entity/Customer.java b/topics/testing/code/src/main/java/ch/scs/jumpstart/movierental/exercise/common/entity/Customer.java
index 9865820..cf6eb8f 100755
--- a/topics/testing/code/src/main/java/ch/scs/jumpstart/movierental/exercise/common/entity/Customer.java
+++ b/topics/testing/code/src/main/java/ch/scs/jumpstart/movierental/exercise/common/entity/Customer.java
@@ -1,10 +1,10 @@
 package ch.scs.jumpstart.movierental.exercise.common.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import javax.persistence.*;
 
 @Entity
 public class Customer {
diff --git a/topics/testing/code/src/main/java/ch/scs/jumpstart/movierental/exercise/common/entity/Movie.java b/topics/testing/code/src/main/java/ch/scs/jumpstart/movierental/exercise/common/entity/Movie.java
index 54ed8e9..1f91340 100755
--- a/topics/testing/code/src/main/java/ch/scs/jumpstart/movierental/exercise/common/entity/Movie.java
+++ b/topics/testing/code/src/main/java/ch/scs/jumpstart/movierental/exercise/common/entity/Movie.java
@@ -1,8 +1,8 @@
 package ch.scs.jumpstart.movierental.exercise.common.entity;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 import java.util.Objects;
-import javax.persistence.Entity;
-import javax.persistence.Id;
 
 @Entity
 public class Movie {
diff --git a/topics/testing/code/src/main/java/ch/scs/jumpstart/movierental/exercise/common/entity/Rental.java b/topics/testing/code/src/main/java/ch/scs/jumpstart/movierental/exercise/common/entity/Rental.java
index 850e628..2f54ca5 100755
--- a/topics/testing/code/src/main/java/ch/scs/jumpstart/movierental/exercise/common/entity/Rental.java
+++ b/topics/testing/code/src/main/java/ch/scs/jumpstart/movierental/exercise/common/entity/Rental.java
@@ -1,6 +1,6 @@
 package ch.scs.jumpstart.movierental.exercise.common.entity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 public class Rental {
diff --git a/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/exercise/common/OpenApiDocIT.java b/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/exercise/common/OpenApiDocIT.java
index 7487b79..aaee041 100644
--- a/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/exercise/common/OpenApiDocIT.java
+++ b/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/exercise/common/OpenApiDocIT.java
@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
diff --git a/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/exercise/common/controller/MovieControllerIT.java b/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/exercise/common/controller/MovieControllerIT.java
index 92830e0..4c82a5a 100644
--- a/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/exercise/common/controller/MovieControllerIT.java
+++ b/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/exercise/common/controller/MovieControllerIT.java
@@ -14,7 +14,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.reactive.server.WebTestClient;
diff --git a/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/exercise/integrationtest/controller/SpringCustomerControllerIT.java b/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/exercise/integrationtest/controller/SpringCustomerControllerIT.java
index af25bf6..de6d112 100644
--- a/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/exercise/integrationtest/controller/SpringCustomerControllerIT.java
+++ b/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/exercise/integrationtest/controller/SpringCustomerControllerIT.java
@@ -17,7 +17,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.reactive.server.WebTestClient;
diff --git a/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/solution/integrationtest/controller/SolutionSpringCustomerControllerIT.java b/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/solution/integrationtest/controller/SolutionSpringCustomerControllerIT.java
index 1ace8ad..e4652f9 100644
--- a/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/solution/integrationtest/controller/SolutionSpringCustomerControllerIT.java
+++ b/topics/testing/code/src/test/java/ch/scs/jumpstart/movierental/solution/integrationtest/controller/SolutionSpringCustomerControllerIT.java
@@ -18,7 +18,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.reactive.server.WebTestClient;