Skip to content

Commit c33e506

Browse files
Bump org.springframework.boot from 3.5.8 to 4.0.1 (#420)
* Bump org.springframework.boot:spring-boot-gradle-plugin Bumps [org.springframework.boot:spring-boot-gradle-plugin](https://github.com/spring-projects/spring-boot) from 3.5.7 to 4.0.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.7...v4.0.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-gradle-plugin dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Update build.gradle * Update build.gradle * Resolve issues upgrading to Spring 4 * Bump org.springframework.boot:spring-boot-gradle-plugin Bumps [org.springframework.boot:spring-boot-gradle-plugin](https://github.com/spring-projects/spring-boot) from 3.5.8 to 4.0.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.8...v4.0.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-gradle-plugin dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Uncomment testImplementation for spring-boot-webmvc-test * Fix import statement for WebMvcTest annotation * Fix import statement for WebMvcTest annotation * Fix import statement for ErrorController * Fix comment in build.gradle for spring-boot-webmvc-test * Update build.gradle * Update build.gradle * Update SECURITY.md --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Conor Heffron <conor.heffron@gmail.com>
1 parent fed7464 commit c33e506

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

SECURITY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
| Version | Supported |
66
|----------| ------------------ |
7-
| 8.x.x | :white_check_mark: |
8-
| <= 7.x.x | :x: |
7+
| 7.x.x | :white_check_mark: |
8+
| <= 6.x.x | :x: |
99

1010
## Reporting a Vulnerability
1111

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
ext {
3-
springBootVersion = '3.5.8'
3+
springBootVersion = '4.0.1'
44
mockitoVersion = '5.20.0'
55
}
66
repositories {
@@ -37,7 +37,7 @@ sonar {
3737
}
3838

3939
group = 'conorheffron'
40-
version = '7.1.2'
40+
version = '7.1.3'
4141
description = "iRonoc-DB Sample Data Manager"
4242

4343
java {
@@ -85,7 +85,7 @@ dependencies {
8585
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:' + springBootVersion
8686
implementation 'org.springframework.boot:spring-boot-starter-tomcat:' + springBootVersion
8787
implementation 'org.springframework.boot:spring-boot-starter-validation:' + springBootVersion
88-
implementation 'org.springframework.boot:spring-boot-devtools:' + springBootVersion
88+
implementation 'org.springframework.boot:spring-boot-h2console:' + springBootVersion
8989

9090
// GC Secret Manager
9191
implementation 'com.google.cloud:google-cloud-secretmanager:2.80.0'
@@ -99,7 +99,7 @@ dependencies {
9999
implementation 'org.apache.tomcat.embed:tomcat-embed-jasper:11.0.15'
100100
implementation 'org.glassfish.web:jakarta.servlet.jsp.jstl:3.0.1'
101101

102-
// testImplementation 'org.springframework.boot:spring-boot-webmvc-test:' + springBootVersion TODO needed for spring boot 4
102+
testImplementation 'org.springframework.boot:spring-boot-webmvc-test:' + springBootVersion
103103
testImplementation 'junit:junit:4.13.2'
104104
testImplementation('org.springframework.boot:spring-boot-starter-test:' + springBootVersion) {
105105
exclude(module: 'commons-logging')

src/integration-test/java/com.ironoc.db.controller/CustomErrorControllerIntegrationTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
import org.junit.runner.RunWith;
99
import org.mockito.InjectMocks;
1010
import org.springframework.beans.factory.annotation.Autowired;
11-
//import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
12-
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
11+
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
1312
import org.springframework.http.HttpStatus;
1413
import org.springframework.http.MediaType;
1514
import org.springframework.mock.web.MockHttpServletResponse;

src/integration-test/java/com.ironoc.db.controller/PersonControllerIntegrationTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
import org.junit.runner.RunWith;
1111
import org.mockito.InjectMocks;
1212
import org.springframework.beans.factory.annotation.Autowired;
13-
//import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
14-
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
13+
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
1514
import org.springframework.http.HttpStatus;
1615
import org.springframework.http.MediaType;
1716
import org.springframework.mock.web.MockHttpServletResponse;

src/main/java/com/ironoc/db/controller/CustomErrorController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
import jakarta.servlet.RequestDispatcher;
44
import jakarta.servlet.http.HttpServletRequest;
55
import lombok.extern.slf4j.Slf4j;
6-
//import org.springframework.boot.webmvc.error.ErrorController;// TODO needed for spring boot 4
7-
import org.springframework.boot.web.servlet.error.ErrorController;
6+
import org.springframework.boot.webmvc.error.ErrorController;
87
import org.springframework.stereotype.Controller;
98
import org.springframework.web.bind.annotation.GetMapping;
109

0 commit comments

Comments
 (0)