From aca8a6b759030a940cdd89214a35f5c731520e3d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 09:29:00 +0000
Subject: [PATCH 1/3] Bump spring.boot.version from 2.7.14 to 2.7.15

Bumps `spring.boot.version` from 2.7.14 to 2.7.15.

Updates `org.springframework.boot:spring-boot-starter` from 2.7.14 to 2.7.15
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.14...v2.7.15)

Updates `org.springframework.boot:spring-boot-maven-plugin` from 2.7.14 to 2.7.15
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.14...v2.7.15)

Updates `org.springframework.boot:spring-boot-dependencies` from 2.7.14 to 2.7.15
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.14...v2.7.15)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1f4cf04dba..e2e694d2f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@ limitations under the License.
 		<log4j.version>2.20.0</log4j.version>
 
 		<spring.version>5.3.29</spring.version>
-		<spring.boot.version>2.7.14</spring.boot.version>
+		<spring.boot.version>3.1.3</spring.boot.version>
 		<!--
 		DKF: if you update spring.boot.version, also update the annotation
 		  processor binding in Eclipse for SpiNNaker-allocserv:

From caae79a03dc9d6859e2c6a9bd905968245aea743 Mon Sep 17 00:00:00 2001
From: "Donal K. Fellows" <donal.k.fellows@manchester.ac.uk>
Date: Tue, 29 Aug 2023 12:32:02 +0100
Subject: [PATCH 2/3] Not sure why/when JSTL stopped being managed by Spring
 Boot

It's a very confusing bit of the system
---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index e2e694d2f4..96df70d1fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -433,6 +433,11 @@ limitations under the License.
 				<artifactId>spring-boot-starter</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>jstl</artifactId>
+				<version>1.2</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

From 792727465cc69d63c26a46f35c362cd3a4f05b91 Mon Sep 17 00:00:00 2001
From: "Donal K. Fellows" <donal.k.fellows@manchester.ac.uk>
Date: Tue, 29 Aug 2023 12:41:08 +0100
Subject: [PATCH 3/3] WTF, dependabot!

---
 pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 96df70d1fa..bbda6d4514 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@ limitations under the License.
 		<log4j.version>2.20.0</log4j.version>
 
 		<spring.version>5.3.29</spring.version>
-		<spring.boot.version>3.1.3</spring.boot.version>
+		<spring.boot.version>2.7.15</spring.boot.version>
 		<!--
 		DKF: if you update spring.boot.version, also update the annotation
 		  processor binding in Eclipse for SpiNNaker-allocserv:
@@ -433,11 +433,6 @@ limitations under the License.
 				<artifactId>spring-boot-starter</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>jstl</artifactId>
-				<version>1.2</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>