From 5a9d1fc40f3251cf9ed720cfb46517b7fb92ad84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Thu, 23 Nov 2023 18:54:36 +0100
Subject: [PATCH] Upgrade to Spring Boot 3.2.0

---
 build.gradle                                                | 6 +++---
 pom.xml                                                     | 4 ++--
 .../samples/petclinic/owner/OwnerControllerTests.java       | 2 ++
 .../samples/petclinic/owner/PetControllerTests.java         | 2 ++
 .../samples/petclinic/owner/VisitControllerTests.java       | 2 ++
 .../samples/petclinic/vet/VetControllerTests.java           | 2 ++
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index bb01b85f0..51bcd9bce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.1.1'
+  id 'org.springframework.boot' version '3.2.0'
   id 'io.spring.dependency-management' version '1.1.0'
-  id 'org.graalvm.buildtools.native' version '0.9.23'
+  id 'org.graalvm.buildtools.native' version '0.9.28'
 }
 
 apply plugin: 'java'
 
 group = 'org.springframework.samples'
-version = '3.1.0'
+version = '3.2.0'
 sourceCompatibility = '17'
 
 repositories {
diff --git a/pom.xml b/pom.xml
index 809e2db5e..287a08ad3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.samples</groupId>
   <artifactId>spring-petclinic</artifactId>
-  <version>3.1.0-SNAPSHOT</version>
+  <version>3.2.0-SNAPSHOT</version>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.1.3</version>
+    <version>3.2.0</version>
   </parent>
   <name>petclinic</name>
 
diff --git a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
index 4b0f38a9a..78b812371 100644
--- a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
@@ -46,6 +46,7 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.web.servlet.MockMvc;
 
 /**
@@ -55,6 +56,7 @@ import org.springframework.test.web.servlet.MockMvc;
  */
 @WebMvcTest(OwnerController.class)
 @DisabledInNativeImage
+@DisabledInAotMode
 class OwnerControllerTests {
 
 	private static final int TEST_OWNER_ID = 1;
diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java
index 763e8018c..73b83f9f1 100755
--- a/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java
@@ -25,6 +25,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.web.servlet.MockMvc;
 
 import static org.mockito.BDDMockito.given;
@@ -42,6 +43,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @WebMvcTest(value = PetController.class,
 		includeFilters = @ComponentScan.Filter(value = PetTypeFormatter.class, type = FilterType.ASSIGNABLE_TYPE))
 @DisabledInNativeImage
+@DisabledInAotMode
 class PetControllerTests {
 
 	private static final int TEST_OWNER_ID = 1;
diff --git a/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java
index 7f456cca1..3565d9279 100644
--- a/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java
@@ -29,6 +29,7 @@ import org.junit.jupiter.api.condition.DisabledInNativeImage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.web.servlet.MockMvc;
 
 /**
@@ -38,6 +39,7 @@ import org.springframework.test.web.servlet.MockMvc;
  */
 @WebMvcTest(VisitController.class)
 @DisabledInNativeImage
+@DisabledInAotMode
 class VisitControllerTests {
 
 	private static final int TEST_OWNER_ID = 1;
diff --git a/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java
index 739ac01d8..20c3f46ce 100644
--- a/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java
@@ -26,6 +26,7 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
@@ -41,6 +42,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 @WebMvcTest(VetController.class)
 @DisabledInNativeImage
+@DisabledInAotMode
 class VetControllerTests {
 
 	@Autowired