From 06334e7772bc955c4dde6a335aa82aa8e87dffe8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 13:11:55 +0200
Subject: [PATCH] Bump spring.boot.version from 3.3.4 to 3.4.0 (#4460)

* Bump spring.boot.version from 3.3.4 to 3.4.0

Bumps `spring.boot.version` from 3.3.4 to 3.4.0.

Updates `org.springframework.boot:spring-boot-dependencies` from 3.3.4 to 3.4.0
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.4.0)

Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.3.4 to 3.4.0
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>

* add version for okhttp since it is removed in spring 3.4.0, update spring admin version as well

Signed-off-by: Iliyan Velichkov <velichkov.iliyan@gmail.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Iliyan Velichkov <velichkov.iliyan@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Iliyan Velichkov <velichkov.iliyan@gmail.com>
---
 pom.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1d88bf9977..0207807170 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,8 +114,8 @@
 		<maven-license-plugin.version>4.6</maven-license-plugin.version>
 
 		<!-- Spring -->
-		<spring.boot.version>3.3.4</spring.boot.version>
-		<spring.admin.version>${spring.boot.version}</spring.admin.version>
+		<spring.boot.version>3.4.0</spring.boot.version>
+		<spring.admin.version>3.3.6</spring.admin.version>
 		<springdoc.version>2.6.0</springdoc.version>
 		
 		<!-- Webjars -->
@@ -135,6 +135,7 @@
 		<apache-httpcomponents-httpmime.version>4.5.14</apache-httpcomponents-httpmime.version>
 		<apache-httpcomponents-httpclient.version>4.5.14</apache-httpcomponents-httpclient.version>
 		<apache-httpcomponents-httpasyncclient.version>4.1.5</apache-httpcomponents-httpasyncclient.version>
+		<okhttp.version>4.12.0</okhttp.version>
 
 		<jaxb.version>2.3.1</jaxb.version>
 		
@@ -730,10 +731,12 @@
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
 			<scope>test</scope>
+			<version>${okhttp.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp-urlconnection</artifactId>
+			<version>${okhttp.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>