Explorar el Código

Update to Spring Boot 2.7.12

Marcus Da Coregio hace 2 años
padre
commit
318d89fc66
Se han modificado 34 ficheros con 40 adiciones y 41 borrados
  1. 1 1
      reactive/rsocket/hello-security/build.gradle
  2. 1 1
      reactive/webflux-fn/hello-security/build.gradle
  3. 1 1
      reactive/webflux-fn/hello/build.gradle
  4. 1 1
      reactive/webflux/java/authentication/username-password/form/build.gradle
  5. 1 1
      reactive/webflux/java/authentication/x509/build.gradle
  6. 1 1
      reactive/webflux/java/hello-security-explicit/build.gradle
  7. 1 1
      reactive/webflux/java/hello-security/build.gradle
  8. 1 1
      reactive/webflux/java/hello/build.gradle
  9. 1 1
      reactive/webflux/java/method/build.gradle
  10. 1 1
      reactive/webflux/java/oauth2/login/build.gradle
  11. 1 1
      reactive/webflux/java/oauth2/resource-server/build.gradle
  12. 1 1
      reactive/webflux/java/oauth2/webclient/build.gradle
  13. 1 1
      servlet/spring-boot/java/authentication/username-password/mfa/build.gradle
  14. 1 1
      servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle
  15. 1 1
      servlet/spring-boot/java/hello-security-explicit/build.gradle
  16. 1 1
      servlet/spring-boot/java/hello-security/build.gradle
  17. 1 1
      servlet/spring-boot/java/hello/build.gradle
  18. 1 1
      servlet/spring-boot/java/jwt/login/build.gradle
  19. 1 1
      servlet/spring-boot/java/ldap/build.gradle
  20. 1 1
      servlet/spring-boot/java/oauth2/authorization-server/build.gradle
  21. 1 1
      servlet/spring-boot/java/oauth2/login/build.gradle
  22. 7 6
      servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java
  23. 1 1
      servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle
  24. 1 1
      servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle
  25. 1 2
      servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle
  26. 1 1
      servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java
  27. 1 2
      servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle
  28. 1 1
      servlet/spring-boot/java/oauth2/resource-server/static/build.gradle
  29. 1 1
      servlet/spring-boot/java/oauth2/webclient/build.gradle
  30. 1 1
      servlet/spring-boot/java/saml2/login-single-tenant/build.gradle
  31. 1 1
      servlet/spring-boot/java/saml2/login/build.gradle
  32. 1 1
      servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle
  33. 1 1
      servlet/spring-boot/java/session-management/maximum-sessions-prevent-login/build.gradle
  34. 1 1
      servlet/spring-boot/java/session-management/maximum-sessions/build.gradle

+ 1 - 1
reactive/rsocket/hello-security/build.gradle

@@ -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'

+ 1 - 1
reactive/webflux-fn/hello-security/build.gradle

@@ -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'

+ 1 - 1
reactive/webflux-fn/hello/build.gradle

@@ -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'

+ 1 - 1
reactive/webflux/java/authentication/username-password/form/build.gradle

@@ -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'

+ 1 - 1
reactive/webflux/java/authentication/x509/build.gradle

@@ -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'

+ 1 - 1
reactive/webflux/java/hello-security-explicit/build.gradle

@@ -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'

+ 1 - 1
reactive/webflux/java/hello-security/build.gradle

@@ -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'

+ 1 - 1
reactive/webflux/java/hello/build.gradle

@@ -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'

+ 1 - 1
reactive/webflux/java/method/build.gradle

@@ -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'

+ 1 - 1
reactive/webflux/java/oauth2/login/build.gradle

@@ -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'

+ 1 - 1
reactive/webflux/java/oauth2/resource-server/build.gradle

@@ -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'

+ 1 - 1
reactive/webflux/java/oauth2/webclient/build.gradle

@@ -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'

+ 1 - 1
servlet/spring-boot/java/authentication/username-password/mfa/build.gradle

@@ -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'
 }

+ 1 - 1
servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle

@@ -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'
 }

+ 1 - 1
servlet/spring-boot/java/hello-security-explicit/build.gradle

@@ -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'
 }

+ 1 - 1
servlet/spring-boot/java/hello-security/build.gradle

@@ -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'
 }

+ 1 - 1
servlet/spring-boot/java/hello/build.gradle

@@ -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'

+ 1 - 1
servlet/spring-boot/java/jwt/login/build.gradle

@@ -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'
 }

+ 1 - 1
servlet/spring-boot/java/ldap/build.gradle

@@ -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'
 }

+ 1 - 1
servlet/spring-boot/java/oauth2/authorization-server/build.gradle

@@ -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'

+ 1 - 1
servlet/spring-boot/java/oauth2/login/build.gradle

@@ -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'

+ 7 - 6
servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java

@@ -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));
 	}

+ 1 - 1
servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle

@@ -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'

+ 1 - 1
servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle

@@ -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'

+ 1 - 2
servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle

@@ -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'

+ 1 - 1
servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java

@@ -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

+ 1 - 2
servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle

@@ -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'

+ 1 - 1
servlet/spring-boot/java/oauth2/resource-server/static/build.gradle

@@ -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'

+ 1 - 1
servlet/spring-boot/java/oauth2/webclient/build.gradle

@@ -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'

+ 1 - 1
servlet/spring-boot/java/saml2/login-single-tenant/build.gradle

@@ -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'

+ 1 - 1
servlet/spring-boot/java/saml2/login/build.gradle

@@ -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'

+ 1 - 1
servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle

@@ -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'

+ 1 - 1
servlet/spring-boot/java/session-management/maximum-sessions-prevent-login/build.gradle

@@ -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"
 }

+ 1 - 1
servlet/spring-boot/java/session-management/maximum-sessions/build.gradle

@@ -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"
 }