Skip to content

Commit

Permalink
build(deps): bump org.springframework.boot from 3.2.5 to 3.4.0
Browse files Browse the repository at this point in the history
Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 3.2.5 to 3.4.0.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.2.5...v3.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
  • Loading branch information
dependabot[bot] authored and jnodorp-jaconi committed Jan 2, 2025
1 parent 4009fdb commit 54b2eaf
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 13 deletions.
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
jacoco
`jvm-test-suite`
id("io.freefair.lombok") version "8.11"
id("org.springframework.boot") version "3.2.5"
id("org.springframework.boot") version "3.4.0"
id("io.spring.dependency-management") version "1.1.7"
id("org.graalvm.buildtools.native") version "0.10.4"
id("com.github.rising3.semver") version "0.8.2"
Expand All @@ -29,7 +29,7 @@ dependencies {
implementation("net.logstash.logback:logstash-logback-encoder:8.0")
implementation("ch.qos.logback:logback-classic")

implementation(platform("org.springframework.cloud:spring-cloud-dependencies:2023.0.0"))
implementation(platform("org.springframework.cloud:spring-cloud-dependencies:2024.0.0"))

implementation("org.springframework.boot:spring-boot-starter-actuator")
implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ spring:
filter:
local-response-cache:
enabled: false
# Disable matching the port in the host header to enable backward compatibility.
predicate:
host:
include-port: false

# Non-spring configuration goes here!
morp:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.oauth2.client.registration.ClientRegistration;
Expand All @@ -13,6 +12,7 @@
import org.springframework.security.oauth2.core.OAuth2AccessToken;
import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
import org.springframework.test.context.aot.DisabledInAotMode;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import reactor.test.StepVerifier;

import java.io.BufferedReader;
Expand All @@ -38,7 +38,7 @@ class MorpReactiveOAuth2UserServiceTest {
@Autowired
MorpReactiveOAuth2UserService userService;

@MockBean
@MockitoBean
TenantService tenantService;

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
Expand All @@ -14,6 +13,7 @@
import org.springframework.security.oauth2.core.oidc.OidcIdToken;
import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
import org.springframework.test.context.aot.DisabledInAotMode;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import reactor.test.StepVerifier;

import java.time.Instant;
Expand All @@ -34,7 +34,7 @@ class MorpReactiveOidcUserServiceTest {
@Autowired
MorpReactiveOidcUserService userService;

@MockBean
@MockitoBean
TenantService tenantService;

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.security.oauth2.core.AuthorizationGrantType;
import org.springframework.test.context.aot.DisabledInAotMode;
import org.springframework.test.context.bean.override.mockito.MockitoBean;

import java.util.Map;
import java.util.Set;
Expand All @@ -23,10 +23,10 @@ class RegistrationResolverTest {
@Autowired
RegistrationResolver registrationResolver;

@MockBean
@MockitoBean
OAuth2ClientProperties properties;

@MockBean
@MockitoBean
TenantService tenantService;

private static OAuth2ClientProperties.Registration tenantRegistration() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.cache.CacheManager;
import org.springframework.security.oauth2.client.registration.ClientRegistration;
import org.springframework.security.oauth2.core.AuthorizationGrantType;
import org.springframework.test.context.aot.DisabledInAotMode;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import reactor.test.StepVerifier;

import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand All @@ -29,13 +29,13 @@ class TenantAwareClientRegistrationRepositoryTest {
@Autowired
private CacheManager cacheManager;

@MockBean
@MockitoBean
private ClientRegistrationFetcher clientRegistrationFetcher;

@MockBean
@MockitoBean
private RegistrationResolver registrationResolver;

@MockBean
@MockitoBean
private ProviderResolver providerResolver;

private ClientRegistration clientRegistration = ClientRegistration.withRegistrationId(TENANT)
Expand Down

0 comments on commit 54b2eaf

Please sign in to comment.