Use Spring Boot 3.4.0-SNAPSHOT

marcusdacoregio · marcusdacoregio · commit e11d1cb77020 · 2024-06-21T11:38:04.000-03:00
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-org-springframework-boot = "3.3.0"
+org-springframework-boot = "3.4.0-SNAPSHOT"
 
 [libraries]
 org-springframework-spring-framework-bom = "org.springframework:spring-framework-bom:6.2.0-M4"
diff --git a/reactive/webflux/java/authentication/username-password/form/build.gradle b/reactive/webflux/java/authentication/username-password/form/build.gradle
@@ -22,7 +22,9 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 
-	integTestImplementation 'org.seleniumhq.selenium:htmlunit-driver'
+	integTestImplementation 'org.seleniumhq.selenium:htmlunit-driver:3.64.0'
+//	integTestImplementation 'org.htmlunit:htmlunit'
+	integTestImplementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'
 }
 
 
diff --git a/reactive/webflux/java/hello-security-explicit/build.gradle b/reactive/webflux/java/hello-security-explicit/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 
-	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver"
+	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/reactive/webflux/java/oauth2/login/build.gradle b/reactive/webflux/java/oauth2/login/build.gradle
@@ -22,7 +22,7 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 
-	integTestImplementation 'net.sourceforge.htmlunit:htmlunit'
+	integTestImplementation 'org.htmlunit:htmlunit'
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/spring-boot/java/hello-security-explicit/build.gradle b/servlet/spring-boot/java/hello-security-explicit/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 
-	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver"
+	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/spring-boot/java/oauth2/authorization-server/build.gradle b/servlet/spring-boot/java/oauth2/authorization-server/build.gradle
@@ -20,7 +20,7 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 
-	integTestImplementation 'net.sourceforge.htmlunit:htmlunit'
+	integTestImplementation 'org.htmlunit:htmlunit'
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/spring-boot/java/oauth2/login/build.gradle b/servlet/spring-boot/java/oauth2/login/build.gradle
@@ -22,7 +22,7 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 
-	integTestImplementation 'net.sourceforge.htmlunit:htmlunit'
+	integTestImplementation 'org.htmlunit:htmlunit'
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java b/servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java
@@ -28,13 +28,13 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.WebResponse;
-import com.gargoylesoftware.htmlunit.html.DomNodeList;
-import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.FailingHttpStatusCodeException;
+import org.htmlunit.WebClient;
+import org.htmlunit.WebResponse;
+import org.htmlunit.html.DomNodeList;
+import org.htmlunit.html.HtmlAnchor;
+import org.htmlunit.html.HtmlElement;
+import org.htmlunit.html.HtmlPage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/servlet/spring-boot/java/saml2/custom-urls/build.gradle b/servlet/spring-boot/java/saml2/custom-urls/build.gradle
@@ -24,7 +24,7 @@ dependencies {
 	implementation 'org.springframework.security:spring-security-saml2-service-provider'
 	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
 
-	testImplementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'
+	testImplementation 'org.htmlunit:htmlunit'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 }
diff --git a/servlet/spring-boot/java/saml2/custom-urls/src/integTest/java/example/CustomUrlsApplicationITests.java b/servlet/spring-boot/java/saml2/custom-urls/src/integTest/java/example/CustomUrlsApplicationITests.java
@@ -19,14 +19,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gargoylesoftware.htmlunit.ElementNotFoundException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+import org.htmlunit.ElementNotFoundException;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlElement;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlInput;
+import org.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlPasswordInput;
+import org.htmlunit.html.HtmlSubmitInput;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle b/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle
@@ -26,7 +26,7 @@ dependencies {
 	implementation 'org.springframework.security:spring-security-saml2-service-provider'
 	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
 
-	testImplementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'
+	testImplementation 'org.htmlunit:htmlunit'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 }
diff --git a/servlet/spring-boot/java/saml2/login-single-tenant/src/integTest/java/example/Saml2LoginApplicationITests.java b/servlet/spring-boot/java/saml2/login-single-tenant/src/integTest/java/example/Saml2LoginApplicationITests.java
@@ -19,14 +19,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gargoylesoftware.htmlunit.ElementNotFoundException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+import org.htmlunit.ElementNotFoundException;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlElement;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlInput;
+import org.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlPasswordInput;
+import org.htmlunit.html.HtmlSubmitInput;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/servlet/spring-boot/java/saml2/login/build.gradle b/servlet/spring-boot/java/saml2/login/build.gradle
@@ -26,7 +26,7 @@ dependencies {
 	implementation 'org.springframework.security:spring-security-saml2-service-provider'
 	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
 
-	testImplementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'
+	testImplementation 'org.htmlunit:htmlunit'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 }
diff --git a/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java b/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java
@@ -19,14 +19,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gargoylesoftware.htmlunit.ElementNotFoundException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+import org.htmlunit.ElementNotFoundException;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlElement;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlInput;
+import org.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlPasswordInput;
+import org.htmlunit.html.HtmlSubmitInput;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle b/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle
@@ -26,7 +26,7 @@ dependencies {
 	implementation 'org.springframework.security:spring-security-saml2-service-provider'
 	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
 
-	testImplementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'
+	testImplementation 'org.htmlunit:htmlunit'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 }
diff --git a/servlet/spring-boot/java/saml2/refreshable-metadata/src/integTest/java/example/Saml2LoginApplicationITests.java b/servlet/spring-boot/java/saml2/refreshable-metadata/src/integTest/java/example/Saml2LoginApplicationITests.java
@@ -16,13 +16,13 @@
 
 package example;
 
-import com.gargoylesoftware.htmlunit.ElementNotFoundException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+import org.htmlunit.ElementNotFoundException;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlInput;
+import org.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlPasswordInput;
+import org.htmlunit.html.HtmlSubmitInput;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/servlet/spring-boot/java/saml2/saml-extension-federation/build.gradle b/servlet/spring-boot/java/saml2/saml-extension-federation/build.gradle
@@ -24,7 +24,7 @@ dependencies {
 	implementation 'org.springframework.security:spring-security-saml2-service-provider'
 	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
 
-	testImplementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'
+	testImplementation 'org.htmlunit:htmlunit'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 }
diff --git a/servlet/spring-boot/java/saml2/saml-extension-federation/src/integTest/java/example/SamlExtensionFederationApplicationITests.java b/servlet/spring-boot/java/saml2/saml-extension-federation/src/integTest/java/example/SamlExtensionFederationApplicationITests.java
@@ -19,14 +19,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gargoylesoftware.htmlunit.ElementNotFoundException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+import org.htmlunit.ElementNotFoundException;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlElement;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlInput;
+import org.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlPasswordInput;
+import org.htmlunit.html.HtmlSubmitInput;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/servlet/spring-boot/java/session-management/maximum-sessions/src/integTest/java/com/example/maximumsessions/MaximumSessionsTests.java b/servlet/spring-boot/java/session-management/maximum-sessions/src/integTest/java/com/example/maximumsessions/MaximumSessionsTests.java
@@ -16,7 +16,6 @@
 
 package com.example.maximumsessions;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +32,6 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
-@Disabled
 public class MaximumSessionsTests {
 
 	@Autowired

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,9 @@ dependencies {`
`22`	`22`	`testImplementation 'org.springframework.boot:spring-boot-starter-test'`
`23`	`23`	`testImplementation 'org.springframework.security:spring-security-test'`
`24`	`24`
`25`		`- integTestImplementation 'org.seleniumhq.selenium:htmlunit-driver'`
	`25`	`+ integTestImplementation 'org.seleniumhq.selenium:htmlunit-driver:3.64.0'`
	`26`	`+// integTestImplementation 'org.htmlunit:htmlunit'`
	`27`	`+ integTestImplementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'`
`26`	`28`	`}`
`27`	`29`
`28`	`30`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ dependencies {`
`21`	`21`	`testImplementation 'org.springframework.boot:spring-boot-starter-test'`
`22`	`22`	`testImplementation 'org.springframework.security:spring-security-test'`
`23`	`23`
`24`		`- integTestImplementation "org.seleniumhq.selenium:htmlunit-driver"`
	`24`	`+ integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`tasks.withType(Test).configureEach {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ dependencies {`
`22`	`22`	`testImplementation 'org.springframework.boot:spring-boot-starter-test'`
`23`	`23`	`testImplementation 'org.springframework.security:spring-security-test'`
`24`	`24`
`25`		`- integTestImplementation 'net.sourceforge.htmlunit:htmlunit'`
	`25`	`+ integTestImplementation 'org.htmlunit:htmlunit'`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`tasks.withType(Test).configureEach {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ dependencies {`
`20`	`20`	`testImplementation 'org.springframework.boot:spring-boot-starter-test'`
`21`	`21`	`testImplementation 'org.springframework.security:spring-security-test'`
`22`	`22`
`23`		`- integTestImplementation 'net.sourceforge.htmlunit:htmlunit'`
	`23`	`+ integTestImplementation 'org.htmlunit:htmlunit'`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`tasks.withType(Test).configureEach {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ dependencies {`
`24`	`24`	`implementation 'org.springframework.security:spring-security-saml2-service-provider'`
`25`	`25`	`implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'`
`26`	`26`
`27`		`- testImplementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'`
	`27`	`+ testImplementation 'org.htmlunit:htmlunit'`
`28`	`28`	`testImplementation 'org.springframework.boot:spring-boot-starter-test'`
`29`	`29`	`testImplementation 'org.springframework.security:spring-security-test'`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ dependencies {`
`26`	`26`	`implementation 'org.springframework.security:spring-security-saml2-service-provider'`
`27`	`27`	`implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'`
`28`	`28`
`29`		`- testImplementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'`
	`29`	`+ testImplementation 'org.htmlunit:htmlunit'`
`30`	`30`	`testImplementation 'org.springframework.boot:spring-boot-starter-test'`
`31`	`31`	`testImplementation 'org.springframework.security:spring-security-test'`
`32`	`32`	`}`