From 6975bfd438dd871f9df8ba4f4143227b08ae35b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Dec 2025 12:07:53 +0000
Subject: [PATCH 1/2] Bump springboot.version from 3.5.7 to 4.0.0

Bumps `springboot.version` from 3.5.7 to 4.0.0.

Updates `org.springframework.boot:spring-boot-dependencies` from 3.5.7 to 4.0.0
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.7...v4.0.0)

Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.5.7 to 4.0.0
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.7...v4.0.0)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-dependencies
  dependency-version: 4.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: org.springframework.boot:spring-boot-maven-plugin
  dependency-version: 4.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/spring-web/pom.xml | 2 +-
 examples/springboot/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/spring-web/pom.xml b/examples/spring-web/pom.xml
index 2bcbd1afc8..7bf650d38d 100644
--- a/examples/spring-web/pom.xml
+++ b/examples/spring-web/pom.xml
@@ -16,7 +16,7 @@
   </description>
 
   <properties>
-    <springboot.version>3.5.7</springboot.version>
+    <springboot.version>4.0.0</springboot.version>
   </properties>
 
   <dependencyManagement>
diff --git a/examples/springboot/pom.xml b/examples/springboot/pom.xml
index b1af998381..e60c6d10a4 100644
--- a/examples/springboot/pom.xml
+++ b/examples/springboot/pom.xml
@@ -16,7 +16,7 @@
   </description>
 
   <properties>
-    <springboot.version>3.5.7</springboot.version>
+    <springboot.version>4.0.0</springboot.version>
   </properties>
 
   <dependencyManagement>

From b6896414fe457e33895730919f276d01032af06a Mon Sep 17 00:00:00 2001
From: Aaron Coburn <aaronc@inrupt.com>
Date: Wed, 10 Dec 2025 14:26:38 -0600
Subject: [PATCH 2/2] Adjust usage of TestRestTemplate

---
 examples/spring-web/pom.xml                                  | 5 +++++
 .../client/examples/spring/web/WebApplicationTests.java      | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/examples/spring-web/pom.xml b/examples/spring-web/pom.xml
index 7bf650d38d..59c055603e 100644
--- a/examples/spring-web/pom.xml
+++ b/examples/spring-web/pom.xml
@@ -69,6 +69,11 @@
         <artifactId>spring-boot-starter-test</artifactId>
         <scope>test</scope>
     </dependency>
+    <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-resttestclient</artifactId>
+        <scope>test</scope>
+    </dependency>
     <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-test</artifactId>
diff --git a/examples/spring-web/src/test/java/com/inrupt/client/examples/spring/web/WebApplicationTests.java b/examples/spring-web/src/test/java/com/inrupt/client/examples/spring/web/WebApplicationTests.java
index 5122e166dd..9ef19b1f93 100644
--- a/examples/spring-web/src/test/java/com/inrupt/client/examples/spring/web/WebApplicationTests.java
+++ b/examples/spring-web/src/test/java/com/inrupt/client/examples/spring/web/WebApplicationTests.java
@@ -41,8 +41,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.resttestclient.TestRestTemplate;
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.oauth2.core.oidc.OidcIdToken;
 import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
@@ -50,6 +51,7 @@
 @SpringBootTest(
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
     classes = WebApplication.class)
+@AutoConfigureTestRestTemplate
 class WebApplicationTests {
 
     static final MockWebServer mockServer = new MockWebServer();