Update to Spring Boot 2.7.12

This commit is contained in:
Marcus Da Coregio
2023-06-21 12:58:16 -03:00
parent 33052562bc
commit 318d89fc66
34 changed files with 40 additions and 41 deletions

View File

@@ -1,6 +1,6 @@
plugins {
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id "nebula.integtest" version "8.2.0"
id 'java'
}

View File

@@ -1,6 +1,6 @@
plugins {
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id "nebula.integtest" version "8.2.0"
id 'java'
}

View File

@@ -1,6 +1,6 @@
plugins {
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id "nebula.integtest" version "8.2.0"
id 'java'
}

View File

@@ -1,6 +1,6 @@
plugins {
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id "nebula.integtest" version "8.2.0"
id 'java'
}

View File

@@ -1,5 +1,5 @@
plugins {
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id "nebula.integtest" version "8.2.0"
id 'java'

View File

@@ -1,5 +1,5 @@
plugins {
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id 'java'
}

View File

@@ -1,5 +1,5 @@
plugins {
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id 'java'
}

View File

@@ -1,5 +1,5 @@
plugins {
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id "nebula.integtest" version "8.2.0"
id 'java'

View File

@@ -1,5 +1,5 @@
plugins {
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id "nebula.integtest" version "8.2.0"
id 'java'

View File

@@ -225,7 +225,7 @@ public class OAuth2LoginApplicationTests {
HtmlElement errorElement = page.getBody().getFirstByXPath("div");
assertThat(errorElement).isNotNull();
assertThat(errorElement.asText()).contains("authorization_request_not_found");
assertThat(errorElement.asNormalizedText()).contains("authorization_request_not_found");
}
@Test
@@ -253,7 +253,7 @@ public class OAuth2LoginApplicationTests {
HtmlElement errorElement = page.getBody().getFirstByXPath("div");
assertThat(errorElement).isNotNull();
assertThat(errorElement.asText()).contains("authorization_request_not_found");
assertThat(errorElement.asNormalizedText()).contains("authorization_request_not_found");
}
@Test
@@ -291,7 +291,7 @@ public class OAuth2LoginApplicationTests {
assertThat(clientAnchorElements.get(i).getAttribute("href")).isIn(googleClientAuthorizeUri,
githubClientAuthorizeUri, facebookClientAuthorizeUri, oktaClientAuthorizeUri,
springClientAuthorizeUri);
assertThat(clientAnchorElements.get(i).asText()).isIn(googleClientRegistration.getClientName(),
assertThat(clientAnchorElements.get(i).asNormalizedText()).isIn(googleClientRegistration.getClientName(),
githubClientRegistration.getClientName(), facebookClientRegistration.getClientName(),
oktaClientRegistration.getClientName(), springClientRegistration.getClientName());
}
@@ -301,13 +301,14 @@ public class OAuth2LoginApplicationTests {
assertThat(page.getTitleText()).isEqualTo("Spring Security - OAuth 2.0 Login");
DomNodeList<HtmlElement> divElements = page.getBody().getElementsByTagName("div");
assertThat(divElements.get(1).asText()).contains("User: joeg@springsecurity.io");
assertThat(divElements.get(4).asText()).contains("You are successfully logged in joeg@springsecurity.io");
assertThat(divElements.get(1).asNormalizedText()).contains("User: joeg@springsecurity.io");
assertThat(divElements.get(4).asNormalizedText())
.contains("You are successfully logged in joeg@springsecurity.io");
}
private HtmlAnchor getClientAnchorElement(HtmlPage page, ClientRegistration clientRegistration) {
Optional<HtmlAnchor> clientAnchorElement = page.getAnchors().stream()
.filter((e) -> e.asText().equals(clientRegistration.getClientName())).findFirst();
.filter((e) -> e.asNormalizedText().equals(clientRegistration.getClientName())).findFirst();
return (clientAnchorElement.orElse(null));
}

View File

@@ -1,5 +1,5 @@
plugins {
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id "nebula.integtest" version "8.2.0"
id 'java'

View File

@@ -15,7 +15,7 @@
*/
plugins {
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id "nebula.integtest" version "8.2.0"
id 'java'

View File

@@ -15,7 +15,7 @@
*/
plugins {
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id "nebula.integtest" version "8.2.0"
id 'java'
@@ -31,7 +31,6 @@ dependencies {
implementation 'com.squareup.okhttp3:mockwebserver'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'com.nimbusds:oauth2-oidc-sdk'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.security:spring-security-test'

View File

@@ -48,7 +48,7 @@ public class OAuth2ResourceServerSecurityConfiguration {
// @formatter:off
http
.authorizeHttpRequests((authorize) -> authorize
.mvcMatchers("/**/message/**").hasAuthority("SCOPE_message:read")
.mvcMatchers("/*/message/**").hasAuthority("SCOPE_message:read")
.anyRequest().authenticated()
)
.oauth2ResourceServer((oauth2) -> oauth2

View File

@@ -15,7 +15,7 @@
*/
plugins {
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id "nebula.integtest" version "8.2.0"
id 'java'
@@ -31,7 +31,6 @@ dependencies {
implementation 'com.squareup.okhttp3:mockwebserver'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'com.nimbusds:oauth2-oidc-sdk'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.security:spring-security-test'

View File

@@ -15,7 +15,7 @@
*/
plugins {
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id "nebula.integtest" version "8.2.0"
id 'java'

View File

@@ -15,7 +15,7 @@
*/
plugins {
id 'org.springframework.boot' version '2.5.2'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id "nebula.integtest" version "8.2.0"
id 'java'

View File

@@ -1,5 +1,5 @@
plugins {
id 'org.springframework.boot' version '2.7.1'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id "nebula.integtest" version "8.2.0"
id 'java'

View File

@@ -1,5 +1,5 @@
plugins {
id 'org.springframework.boot' version '2.7.1'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id "nebula.integtest" version "8.2.0"
id 'java'

View File

@@ -1,5 +1,5 @@
plugins {
id 'org.springframework.boot' version '2.5.6'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id "nebula.integtest" version "8.2.0"
id 'java'

View File

@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.7'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.15.RELEASE'
id "nebula.integtest" version "8.2.0"
}

View File

@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.7'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.0.15.RELEASE'
id "nebula.integtest" version "8.2.0"
}