Skip to content

chore(deps): Spring Boot 4.0.6 #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mpge merged 1 commit into from
May 2, 2026
Merged

chore(deps): Spring Boot 4.0.6 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
java
id("org.springframework.boot") version "3.2.5"
id("org.springframework.boot") version "4.0.6"
id("io.spring.dependency-management") version "1.1.7"
`maven-publish`
checkstyle
Expand Down Expand Up @@ -30,7 +30,6 @@ dependencies {

implementation("org.flywaydb:flyway-core")
implementation("com.fasterxml.jackson.core:jackson-databind")
implementation("dev.samstevens.totp:totp-spring-boot-starter:1.7.1")

runtimeOnly("com.h2database:h2")
runtimeOnly("org.postgresql:postgresql")
Expand All @@ -39,6 +38,7 @@ dependencies {
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")

testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
testImplementation("org.springframework.security:spring-security-test")
}

Expand Down
3 changes: 1 addition & 2 deletions docker/host-app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
java
id("org.springframework.boot") version "3.2.5"
id("org.springframework.boot") version "4.0.6"
id("io.spring.dependency-management") version "1.1.7"
}

Expand All @@ -23,7 +23,6 @@ dependencies {
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
implementation("org.springframework.boot:spring-boot-starter-security")
implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
implementation("dev.samstevens.totp:totp-spring-boot-starter:1.7.1")
implementation("org.flywaydb:flyway-core")
runtimeOnly("org.postgresql:postgresql")
implementation(rootProject)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/escalated/config/EscalatedAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/dev/escalated/controllers/AdminPublicTicketsSettingsControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc;

Expand Down Expand Up @@ -38,10 +38,10 @@ class AdminPublicTicketsSettingsControllerTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private ApiTokenAuthenticationFilter apiTokenFilter;

@MockBean
@MockitoBean
private SettingsService settingsService;

private Map<String, String> store;
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/dev/escalated/controllers/AdminTicketControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import dev.escalated.security.ApiTokenAuthenticationFilter;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
Expand All @@ -34,10 +34,10 @@ class AdminTicketControllerTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private ApiTokenAuthenticationFilter apiTokenFilter;

@MockBean
@MockitoBean
private TicketService ticketService;

@Test
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/dev/escalated/controllers/InboundEmailControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.context.annotation.Import;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc;
Expand All @@ -50,13 +50,13 @@ class InboundEmailControllerTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private ApiTokenAuthenticationFilter apiTokenFilter;

@MockBean
@MockitoBean
private InboundEmailService inboundService;

@MockBean
@MockitoBean
private EscalatedProperties properties;

@BeforeEach
Expand Down
14 changes: 7 additions & 7 deletions src/test/java/dev/escalated/controllers/WidgetControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import dev.escalated.security.ApiTokenAuthenticationFilter;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc;

Expand All @@ -30,14 +30,14 @@ class WidgetControllerTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private ApiTokenAuthenticationFilter apiTokenFilter;

@MockBean
@MockitoBean
private TicketService ticketService;
@MockBean
@MockitoBean
private KnowledgeBaseService knowledgeBaseService;
@MockBean
@MockitoBean
private SatisfactionRatingService ratingService;

@Test
Expand Down