Fix redirect loop in default/demo-authorizationserver samples

jgrandja · jgrandja · commit d32c185afb6d · 2025-03-04T10:55:19.000-05:00
Closes gh-1920
diff --git a/samples/default-authorizationserver/gradle.properties b/samples/default-authorizationserver/gradle.properties
@@ -1 +1 @@
-spring-security.version=6.3.7
+spring-security.version=6.5.0-M2
diff --git a/samples/default-authorizationserver/samples-default-authorizationserver.gradle b/samples/default-authorizationserver/samples-default-authorizationserver.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id "org.springframework.boot" version "3.2.2"
+	id "org.springframework.boot" version "3.4.3"
 	id "io.spring.dependency-management" version "1.1.0"
 	id "java"
 }
@@ -25,7 +25,7 @@ dependencies {
 	testImplementation "org.springframework.boot:spring-boot-starter-test"
 	testImplementation "org.springframework.security:spring-security-test"
 	testImplementation "org.junit.jupiter:junit-jupiter"
-	testImplementation "net.sourceforge.htmlunit:htmlunit"
+	testImplementation "org.htmlunit:htmlunit"
 }
 
 tasks.named("test") {
diff --git a/samples/default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerApplicationTests.java b/samples/default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,13 @@
 
 import java.io.IOException;
 
-import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.WebResponse;
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.Page;
+import org.htmlunit.WebClient;
+import org.htmlunit.WebResponse;
+import org.htmlunit.html.HtmlButton;
+import org.htmlunit.html.HtmlElement;
+import org.htmlunit.html.HtmlInput;
+import org.htmlunit.html.HtmlPage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -86,7 +86,7 @@ public void whenLoginFailsThenDisplayBadCredentials() throws IOException {
 
 		HtmlElement alert = loginErrorPage.querySelector("div[role=\"alert\"]");
 		assertThat(alert).isNotNull();
-		assertThat(alert.getTextContent()).isEqualTo("Bad credentials");
+		assertThat(alert.getTextContent()).isEqualTo("Invalid credentials");
 	}
 
 	@Test
diff --git a/samples/default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerConsentTests.java b/samples/default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerConsentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.WebResponse;
-import com.gargoylesoftware.htmlunit.html.DomElement;
-import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.WebResponse;
+import org.htmlunit.html.DomElement;
+import org.htmlunit.html.HtmlCheckBoxInput;
+import org.htmlunit.html.HtmlPage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/samples/demo-authorizationserver/gradle.properties b/samples/demo-authorizationserver/gradle.properties
@@ -1 +1 @@
-spring-security.version=6.3.7
+spring-security.version=6.5.0-M2
diff --git a/samples/demo-authorizationserver/samples-demo-authorizationserver.gradle b/samples/demo-authorizationserver/samples-demo-authorizationserver.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id "org.springframework.boot" version "3.2.2"
+	id "org.springframework.boot" version "3.4.3"
 	id "io.spring.dependency-management" version "1.1.0"
 	id "java"
 }
@@ -29,7 +29,7 @@ dependencies {
 	testImplementation "org.springframework.boot:spring-boot-starter-test"
 	testImplementation "org.springframework.security:spring-security-test"
 	testImplementation "org.junit.jupiter:junit-jupiter"
-	testImplementation "net.sourceforge.htmlunit:htmlunit"
+	testImplementation "org.htmlunit:htmlunit"
 }
 
 tasks.named("test") {
diff --git a/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerApplicationTests.java b/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,13 @@
 
 import java.io.IOException;
 
-import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.WebResponse;
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.Page;
+import org.htmlunit.WebClient;
+import org.htmlunit.WebResponse;
+import org.htmlunit.html.HtmlButton;
+import org.htmlunit.html.HtmlElement;
+import org.htmlunit.html.HtmlInput;
+import org.htmlunit.html.HtmlPage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerConsentTests.java b/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerConsentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.WebResponse;
-import com.gargoylesoftware.htmlunit.html.DomElement;
-import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.WebResponse;
+import org.htmlunit.html.DomElement;
+import org.htmlunit.html.HtmlCheckBoxInput;
+import org.htmlunit.html.HtmlPage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-spring-security.version=6.3.7`
	`1`	`+spring-security.version=6.5.0-M2`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id "org.springframework.boot" version "3.2.2"`
	`2`	`+ id "org.springframework.boot" version "3.4.3"`
`3`	`3`	`id "io.spring.dependency-management" version "1.1.0"`
`4`	`4`	`id "java"`
`5`	`5`	`}`
`@@ -25,7 +25,7 @@ dependencies {`
`25`	`25`	`testImplementation "org.springframework.boot:spring-boot-starter-test"`
`26`	`26`	`testImplementation "org.springframework.security:spring-security-test"`
`27`	`27`	`testImplementation "org.junit.jupiter:junit-jupiter"`
`28`		`- testImplementation "net.sourceforge.htmlunit:htmlunit"`
	`28`	`+ testImplementation "org.htmlunit:htmlunit"`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`tasks.named("test") {`