Merge branch '5.8.x' into 6.2.x

servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java

@@ -29,6 +29,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -49,6 +50,7 @@ import static org.awaitility.Awaitility.await;
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = ApplicationConfiguration.class)
 @WebAppConfiguration
+@Disabled("gh-127")
 public class Saml2JavaConfigurationITests {
 
 	private MockMvc mvc;
@@ -71,6 +73,7 @@ public class Saml2JavaConfigurationITests {
 			.build();
 		this.webClient.getOptions().setThrowExceptionOnScriptError(false);
 		this.webClient.getCookieManager().clearCookies();
+		this.webClient.getOptions().setThrowExceptionOnScriptError(false);
 	}
 
 	@Test

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

@@ -106,6 +106,7 @@ public class OAuth2LoginApplicationTests {
 	@BeforeEach
 	void setup() {
 		this.webClient.getCookieManager().clearCookies();
+		this.webClient.getOptions().setThrowExceptionOnScriptError(false);
 	}
 
 	@Test

servlet/spring-boot/java/saml2/login-single-tenant/src/integTest/java/example/Saml2LoginApplicationITests.java

@@ -28,6 +28,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest
 @AutoConfigureMockMvc
+@Disabled("gh-127")
 public class Saml2LoginApplicationITests {
 
 	@Autowired
@@ -51,6 +53,7 @@ public class Saml2LoginApplicationITests {
 	void setup() {
 		this.webClient.getOptions().setThrowExceptionOnScriptError(false);
 		this.webClient.getCookieManager().clearCookies();
+		this.webClient.getOptions().setThrowExceptionOnScriptError(false);
 	}
 
 	@Test

servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java

@@ -28,6 +28,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest
 @AutoConfigureMockMvc
+@Disabled("gh-127")
 public class Saml2LoginApplicationITests {
 
 	@Autowired
@@ -51,6 +53,7 @@ public class Saml2LoginApplicationITests {
 	void setup() {
 		this.webClient.getOptions().setThrowExceptionOnScriptError(false);
 		this.webClient.getCookieManager().clearCookies();
+		this.webClient.getOptions().setThrowExceptionOnScriptError(false);
 	}
 
 	@Test

servlet/spring-boot/java/saml2/refreshable-metadata/src/integTest/java/example/Saml2LoginApplicationITests.java

@@ -24,6 +24,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest
 @AutoConfigureMockMvc
+@Disabled("gh-127")
 public class Saml2LoginApplicationITests {
 
 	@Autowired
@@ -47,6 +49,7 @@ public class Saml2LoginApplicationITests {
 	void setup() {
 		this.webClient.getOptions().setThrowExceptionOnScriptError(false);
 		this.webClient.getCookieManager().clearCookies();
+		this.webClient.getOptions().setThrowExceptionOnScriptError(false);
 	}
 
 	@Test

servlet/xml/java/saml2/login-logout/src/integTest/java/example/Saml2XmlITests.java

@@ -28,6 +28,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -48,6 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @ContextConfiguration(locations = { "file:src/main/webapp/WEB-INF/spring-servlet.xml",
 		"file:src/main/webapp/WEB-INF/spring/security.xml" })
 @WebAppConfiguration
+@Disabled("gh-127")
 public class Saml2XmlITests {
 
 	private MockMvc mvc;
@@ -70,6 +72,7 @@ public class Saml2XmlITests {
 			.build();
 		this.webClient.getOptions().setThrowExceptionOnScriptError(false);
 		this.webClient.getCookieManager().clearCookies();
+		this.webClient.getOptions().setThrowExceptionOnScriptError(false);
 	}
 
 	@Test