From 57a3de019e7aed647ecc78d88817465f5bee58da Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Wed, 27 Jul 2022 16:43:14 -0600 Subject: [PATCH] Update Dependencies for Saml2 Login Sample --- servlet/spring-boot/java/saml2/login/build.gradle | 10 +++++----- servlet/spring-boot/java/saml2/login/gradle.properties | 1 - .../java/example/Saml2LoginApplicationITests.java | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/servlet/spring-boot/java/saml2/login/build.gradle b/servlet/spring-boot/java/saml2/login/build.gradle index 87351e1..9dddc2d 100644 --- a/servlet/spring-boot/java/saml2/login/build.gradle +++ b/servlet/spring-boot/java/saml2/login/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '2.5.2' + id 'org.springframework.boot' version '2.7.1' id 'io.spring.dependency-management' version '1.0.10.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' @@ -14,9 +14,9 @@ repositories { dependencies { constraints { - implementation "org.opensaml:opensaml-core:4.1.1" - implementation "org.opensaml:opensaml-saml-api:4.1.1" - implementation "org.opensaml:opensaml-saml-impl:4.1.1" + implementation "org.opensaml:opensaml-core:4.2.0" + implementation "org.opensaml:opensaml-saml-api:4.2.0" + implementation "org.opensaml:opensaml-saml-impl:4.2.0" } implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' @@ -24,7 +24,7 @@ dependencies { implementation 'org.springframework.security:spring-security-saml2-service-provider' implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' - testImplementation 'net.sourceforge.htmlunit:htmlunit:2.44.0' + testImplementation 'net.sourceforge.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/gradle.properties b/servlet/spring-boot/java/saml2/login/gradle.properties index eeb7238..bd54891 100644 --- a/servlet/spring-boot/java/saml2/login/gradle.properties +++ b/servlet/spring-boot/java/saml2/login/gradle.properties @@ -1,3 +1,2 @@ version=5.8.0-SNAPSHOT spring-security.version=5.8.0-SNAPSHOT -selenium-htmlunit.version=2.44.0 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 index 00c98b9..261092b 100644 --- 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 @@ -89,7 +89,7 @@ public class Saml2LoginApplicationITests { void authenticationAttemptWhenValidThenShowsUserEmailAddress() throws Exception { performLogin("one"); HtmlPage home = (HtmlPage) Saml2LoginApplicationITests.this.webClient.getCurrentWindow().getEnclosedPage(); - assertThat(home.asText()).contains("You're email address is testuser@spring.security.saml"); + assertThat(home.asNormalizedText()).contains("You're email address is testuser@spring.security.saml"); } @Test @@ -111,7 +111,7 @@ public class Saml2LoginApplicationITests { void authenticationAttemptWhenValidThenShowsUserEmailAddress() throws Exception { performLogin("two"); HtmlPage home = (HtmlPage) Saml2LoginApplicationITests.this.webClient.getCurrentWindow().getEnclosedPage(); - assertThat(home.asText()).contains("You're email address is testuser@spring.security.saml"); + assertThat(home.asNormalizedText()).contains("You're email address is testuser@spring.security.saml"); } @Test