diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java
index 664650c839..8f3b9114e3 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java
@@ -41,14 +41,14 @@ import org.springframework.security.saml2.provider.service.authentication.OpenSa
 import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationRequestFactory;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
-import org.springframework.security.saml2.provider.service.servlet.HttpSessionSaml2AuthenticationRequestRepository;
-import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.servlet.filter.Saml2WebSsoAuthenticationFilter;
 import org.springframework.security.saml2.provider.service.servlet.filter.Saml2WebSsoAuthenticationRequestFilter;
 import org.springframework.security.saml2.provider.service.web.DefaultRelyingPartyRegistrationResolver;
 import org.springframework.security.saml2.provider.service.web.DefaultSaml2AuthenticationRequestContextResolver;
+import org.springframework.security.saml2.provider.service.web.HttpSessionSaml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.web.RelyingPartyRegistrationResolver;
 import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestContextResolver;
+import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationTokenConverter;
 import org.springframework.security.web.authentication.AuthenticationConverter;
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java
index f3eeab2d43..3a52607267 100644
--- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java
+++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java
@@ -78,9 +78,9 @@ import org.springframework.security.saml2.provider.service.authentication.TestSa
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
 import org.springframework.security.saml2.provider.service.registration.TestRelyingPartyRegistrations;
-import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.servlet.filter.Saml2WebSsoAuthenticationFilter;
 import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestContextResolver;
+import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationTokenConverter;
 import org.springframework.security.web.FilterChainProxy;
 import org.springframework.security.web.SecurityFilterChain;
diff --git a/etc/s101/repository/repository.xml b/etc/s101/repository/repository.xml
index e4db5aa39d..73bfd664c1 100644
--- a/etc/s101/repository/repository.xml
+++ b/etc/s101/repository/repository.xml
@@ -9,6 +9,6 @@
   </xs-configuration>
   <!--Note: All date strings are stored in short US format e.g. 2/1/06 for 1st Feb 2006-->
   <project name="snapshots" dir="snapshots" baselineSnapshot="default" version="19139">
-    <snapshot label="baseline" location="baseline" timestamp="3/16/21, 4:42 PM" version="19139" detail="true" good="true" size="20" />
+    <snapshot label="baseline" location="baseline" timestamp="9/29/21, 2:04 PM" version="19147" detail="true" good="true" size="1530" />
   </project>
 </structure101-repository>
diff --git a/etc/s101/repository/snapshots/baseline/arch.hsx b/etc/s101/repository/snapshots/baseline/arch.hsx
index 2a6b13a937..0490635bd0 100644
Binary files a/etc/s101/repository/snapshots/baseline/arch.hsx and b/etc/s101/repository/snapshots/baseline/arch.hsx differ
diff --git a/etc/s101/repository/snapshots/baseline/key-measures.xml b/etc/s101/repository/snapshots/baseline/key-measures.xml
index c3f7527cc6..fd9b9a3949 100644
--- a/etc/s101/repository/snapshots/baseline/key-measures.xml
+++ b/etc/s101/repository/snapshots/baseline/key-measures.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<KeyMeasureData formatVersion="2" specViolationDependencies="0" specViolationContainers="0" specItemViolations="0" specDependencyViolatingItems="0" biggestUnspecifiedNumber="0" specCoverage="0.0" feedbackDependencies="33" totalProblemDependencies="33" tangledDesign="2" tanglePercentage="21.0" biggestClassTangle="3" fatPackage="1" fatClass="5" fatMethod="11" fatPercentage="16.0" numDiagrams="0" numDiagramDependencyViolations="0" numDiagramDependencyViolatingItems="0" numUnassociatedItems="0" numDiagramViolationContainers="0" moduleAPIViolations="0" moduleRequiresViolations="0" deprecationViolations="0" moduleViolatingItems="0" moduleCoverage="0.0">
+<KeyMeasureData formatVersion="2" specViolationDependencies="0" specViolationContainers="0" specItemViolations="0" specDependencyViolatingItems="0" biggestUnspecifiedNumber="0" specCoverage="0.0" feedbackDependencies="28" totalProblemDependencies="28" tangledDesign="1" tanglePercentage="19.0" biggestClassTangle="3" fatPackage="1" fatClass="5" fatMethod="11" fatPercentage="16.0" numDiagrams="0" numDiagramDependencyViolations="0" numDiagramDependencyViolatingItems="0" numUnassociatedItems="0" numDiagramViolationContainers="0" moduleAPIViolations="0" moduleRequiresViolations="0" deprecationViolations="0" moduleViolatingItems="0" moduleCoverage="0.0">
     <enabled-optional-measures/>
     <specOverlays/>
     <archOverlays/>
     <tangledDesign>
-        <node id="19882" measure="5" impact="3815" threshold="0.0"/>
         <node id="19804" measure="28" impact="40238" threshold="0.0"/>
     </tangledDesign>
     <fatPackage>
@@ -18,23 +17,22 @@
         <node id="33" measure="266" impact="4854" threshold="120.0"/>
     </fatClass>
     <fatMethod>
-        <node id="3772" measure="16" impact="137" threshold="15.0"/>
-        <node id="16792" measure="16" impact="109" threshold="15.0"/>
-        <node id="3815" measure="16" impact="241" threshold="15.0"/>
-        <node id="4224" measure="16" impact="288" threshold="15.0"/>
-        <node id="17252" measure="16" impact="199" threshold="15.0"/>
-        <node id="7446" measure="19" impact="168" threshold="15.0"/>
+        <node id="3782" measure="16" impact="137" threshold="15.0"/>
+        <node id="16796" measure="16" impact="109" threshold="15.0"/>
+        <node id="3825" measure="16" impact="241" threshold="15.0"/>
+        <node id="4234" measure="16" impact="288" threshold="15.0"/>
+        <node id="17256" measure="16" impact="199" threshold="15.0"/>
+        <node id="7455" measure="19" impact="168" threshold="15.0"/>
         <node id="18844" measure="19" impact="283" threshold="15.0"/>
-        <node id="16806" measure="23" impact="387" threshold="15.0"/>
-        <node id="14014" measure="25" impact="371" threshold="15.0"/>
-        <node id="5507" measure="26" impact="299" threshold="15.0"/>
-        <node id="8107" measure="26" impact="370" threshold="15.0"/>
+        <node id="16810" measure="23" impact="387" threshold="15.0"/>
+        <node id="14020" measure="25" impact="371" threshold="15.0"/>
+        <node id="5515" measure="26" impact="299" threshold="15.0"/>
+        <node id="8118" measure="26" impact="370" threshold="15.0"/>
     </fatMethod>
     <specViolationContainers/>
     <specItemViolations/>
     <feedbackDependencies>
         <edge from="19803" to="19862" weight="28" weightDelta="0"/>
-        <edge from="19921" to="20063" weight="5" weightDelta="0"/>
     </feedbackDependencies>
     <biggestClassTangle>
         <node id="1215" measure="353"/>
@@ -46,104 +44,92 @@
     <moduleViolations/>
     <nodeMap>
         <entry>
-            <key>4224</key>
-            <value realName="spring-security-config.org.springframework.security.config.web.servlet.LogoutDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.LogoutConfigurer):void" type="method" localSize="288" size="288" displayName="spring-security-config.org.springframework.security.config.web.servlet.LogoutDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.LogoutConfigurer):void" navigationName="spring-security-config.org.springframework.security.config.web.servlet.LogoutDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.LogoutConfigurer):void" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>33</key>
+            <value realName="spring-security-config.org.springframework.security.config.web.server.ServerHttpSecurity" type="class" localSize="1" size="4854" displayName="spring-security-config.org.springframework.security.config.web.server.ServerHttpSecurity" navigationName="spring-security-config.org.springframework.security.config.web.server.ServerHttpSecurity" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
             <key>1537</key>
             <value realName="spring-security-config.org.springframework.security.config.annotation.web.configurers.CsrfConfigurer" type="class" localSize="1" size="365" displayName="spring-security-config.org.springframework.security.config.annotation.web.configurers.CsrfConfigurer" navigationName="spring-security-config.org.springframework.security.config.annotation.web.configurers.CsrfConfigurer" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>5507</key>
-            <value realName="spring-security-config.org.springframework.security.config.web.server.ServerHttpSecurity.build():org.springframework.security.web.server.SecurityWebFilterChain" type="method" localSize="299" size="299" displayName="spring-security-config.org.springframework.security.config.web.server.ServerHttpSecurity.build():org.springframework.security.web.server.SecurityWebFilterChain" navigationName="spring-security-config.org.springframework.security.config.web.server.ServerHttpSecurity.build():org.springframework.security.web.server.SecurityWebFilterChain" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>14020</key>
+            <value realName="spring-security-config.org.springframework.security.config.web.servlet.HeadersDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.HeadersConfigurer):void" type="method" localSize="371" size="371" displayName="spring-security-config.org.springframework.security.config.web.servlet.HeadersDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.HeadersConfigurer):void" navigationName="spring-security-config.org.springframework.security.config.web.servlet.HeadersDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.HeadersConfigurer):void" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
             <key>19845</key>
             <value realName="spring-security-oauth2-client.org.springframework.security.oauth2.client" type="package" localSize="0" size="21195" displayName="spring-security-oauth2-client.org.springframework.security.oauth2.client" navigationName="spring-security-oauth2-client.org.springframework.security.oauth2.client" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>841</key>
-            <value realName="spring-security-oauth2-client.org.springframework.security.oauth2.client.web.reactive.function.client.ServletOAuth2AuthorizedClientExchangeFilterFunction" type="class" localSize="1" size="1164" displayName="spring-security-oauth2-client.org.springframework.security.oauth2.client.web.reactive.function.client.ServletOAuth2AuthorizedClientExchangeFilterFunction" navigationName="spring-security-oauth2-client.org.springframework.security.oauth2.client.web.reactive.function.client.ServletOAuth2AuthorizedClientExchangeFilterFunction" isModule="false" isModuleInterface="false" isDeprecated="false"/>
-        </entry>
-        <entry>
-            <key>19921</key>
-            <value realName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.web" type="package" localSize="0" size="3234" displayName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.web" navigationName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.web" isModule="false" isModuleInterface="false" isDeprecated="false"/>
-        </entry>
-        <entry>
-            <key>19862</key>
-            <value realName="spring-security-config.org.springframework.security.config.web" type="package" localSize="0" size="19335" displayName="spring-security-config.org.springframework.security.config.web" navigationName="spring-security-config.org.springframework.security.config.web" isModule="false" isModuleInterface="false" isDeprecated="false"/>
-        </entry>
-        <entry>
-            <key>7446</key>
-            <value realName="spring-security-web.org.springframework.security.web.util.TextEscapeUtils.escapeEntities(java.lang.String):java.lang.String" type="method" localSize="168" size="168" displayName="spring-security-web.org.springframework.security.web.util.TextEscapeUtils.escapeEntities(java.lang.String):java.lang.String" navigationName="spring-security-web.org.springframework.security.web.util.TextEscapeUtils.escapeEntities(java.lang.String):java.lang.String" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>3782</key>
+            <value realName="spring-security-core.org.springframework.security.authentication.ProviderManager.authenticate(org.springframework.security.core.Authentication):org.springframework.security.core.Authentication" type="method" localSize="137" size="137" displayName="spring-security-core.org.springframework.security.authentication.ProviderManager.authenticate(org.springframework.security.core.Authentication):org.springframework.security.core.Authentication" navigationName="spring-security-core.org.springframework.security.authentication.ProviderManager.authenticate(org.springframework.security.core.Authentication):org.springframework.security.core.Authentication" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>16792</key>
-            <value realName="spring-security-oauth2-core.org.springframework.security.oauth2.core.oidc.DefaultAddressStandardClaim.equals(java.lang.Object):boolean" type="method" localSize="109" size="109" displayName="spring-security-oauth2-core.org.springframework.security.oauth2.core.oidc.DefaultAddressStandardClaim.equals(java.lang.Object):boolean" navigationName="spring-security-oauth2-core.org.springframework.security.oauth2.core.oidc.DefaultAddressStandardClaim.equals(java.lang.Object):boolean" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>40</key>
+            <value realName="spring-security-config.org.springframework.security.config.http.AuthenticationConfigBuilder" type="class" localSize="1" size="2255" displayName="spring-security-config.org.springframework.security.config.http.AuthenticationConfigBuilder" navigationName="spring-security-config.org.springframework.security.config.http.AuthenticationConfigBuilder" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>986</key>
-            <value realName="spring-security-config.org.springframework.security.config.annotation.web.configurers.SessionManagementConfigurer" type="class" localSize="1" size="731" displayName="spring-security-config.org.springframework.security.config.annotation.web.configurers.SessionManagementConfigurer" navigationName="spring-security-config.org.springframework.security.config.annotation.web.configurers.SessionManagementConfigurer" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>17256</key>
+            <value realName="spring-security-crypto.org.springframework.security.crypto.bcrypt.BCrypt.hashpw(byte[], java.lang.String):java.lang.String" type="method" localSize="199" size="199" displayName="spring-security-crypto.org.springframework.security.crypto.bcrypt.BCrypt.hashpw(byte[], java.lang.String):java.lang.String" navigationName="spring-security-crypto.org.springframework.security.crypto.bcrypt.BCrypt.hashpw(byte[], java.lang.String):java.lang.String" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>19803</key>
-            <value realName="spring-security-config.org.springframework.security.config.annotation" type="package" localSize="0" size="20903" displayName="spring-security-config.org.springframework.security.config.annotation" navigationName="spring-security-config.org.springframework.security.config.annotation" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>841</key>
+            <value realName="spring-security-oauth2-client.org.springframework.security.oauth2.client.web.reactive.function.client.ServletOAuth2AuthorizedClientExchangeFilterFunction" type="class" localSize="1" size="1164" displayName="spring-security-oauth2-client.org.springframework.security.oauth2.client.web.reactive.function.client.ServletOAuth2AuthorizedClientExchangeFilterFunction" navigationName="spring-security-oauth2-client.org.springframework.security.oauth2.client.web.reactive.function.client.ServletOAuth2AuthorizedClientExchangeFilterFunction" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>18844</key>
-            <value realName="spring-security-config.org.springframework.security.config.web.server.ServerHeadersDsl$get$1.invoke(org.springframework.security.config.web.server.ServerHttpSecurity$HeaderSpec):void" type="method" localSize="283" size="283" displayName="spring-security-config.org.springframework.security.config.web.server.ServerHeadersDsl$get$1.invoke(org.springframework.security.config.web.server.ServerHttpSecurity$HeaderSpec):void" navigationName="spring-security-config.org.springframework.security.config.web.server.ServerHeadersDsl$get$1.invoke(org.springframework.security.config.web.server.ServerHttpSecurity$HeaderSpec):void" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>16810</key>
+            <value realName="spring-security-config.org.springframework.security.config.web.servlet.OAuth2LoginDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer):void" type="method" localSize="387" size="387" displayName="spring-security-config.org.springframework.security.config.web.servlet.OAuth2LoginDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer):void" navigationName="spring-security-config.org.springframework.security.config.web.servlet.OAuth2LoginDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer):void" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>19804</key>
-            <value realName="spring-security-config.org.springframework.security.config" type="package" localSize="0" size="58136" displayName="spring-security-config.org.springframework.security.config" navigationName="spring-security-config.org.springframework.security.config" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>4234</key>
+            <value realName="spring-security-config.org.springframework.security.config.web.servlet.LogoutDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.LogoutConfigurer):void" type="method" localSize="288" size="288" displayName="spring-security-config.org.springframework.security.config.web.servlet.LogoutDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.LogoutConfigurer):void" navigationName="spring-security-config.org.springframework.security.config.web.servlet.LogoutDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.LogoutConfigurer):void" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>20063</key>
-            <value realName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.servlet" type="package" localSize="0" size="581" displayName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.servlet" navigationName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.servlet" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>5515</key>
+            <value realName="spring-security-config.org.springframework.security.config.web.server.ServerHttpSecurity.build():org.springframework.security.web.server.SecurityWebFilterChain" type="method" localSize="299" size="299" displayName="spring-security-config.org.springframework.security.config.web.server.ServerHttpSecurity.build():org.springframework.security.web.server.SecurityWebFilterChain" navigationName="spring-security-config.org.springframework.security.config.web.server.ServerHttpSecurity.build():org.springframework.security.web.server.SecurityWebFilterChain" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>33</key>
-            <value realName="spring-security-config.org.springframework.security.config.web.server.ServerHttpSecurity" type="class" localSize="1" size="4854" displayName="spring-security-config.org.springframework.security.config.web.server.ServerHttpSecurity" navigationName="spring-security-config.org.springframework.security.config.web.server.ServerHttpSecurity" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>816</key>
+            <value realName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.authentication.OpenSamlAuthenticationProvider" type="class" localSize="1" size="1274" displayName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.authentication.OpenSamlAuthenticationProvider" navigationName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.authentication.OpenSamlAuthenticationProvider" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>17252</key>
-            <value realName="spring-security-crypto.org.springframework.security.crypto.bcrypt.BCrypt.hashpw(byte[], java.lang.String):java.lang.String" type="method" localSize="199" size="199" displayName="spring-security-crypto.org.springframework.security.crypto.bcrypt.BCrypt.hashpw(byte[], java.lang.String):java.lang.String" navigationName="spring-security-crypto.org.springframework.security.crypto.bcrypt.BCrypt.hashpw(byte[], java.lang.String):java.lang.String" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>3825</key>
+            <value realName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.registration.OpenSamlAssertingPartyMetadataConverter.convert(java.io.InputStream):org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration$Builder" type="method" localSize="241" size="241" displayName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.registration.OpenSamlAssertingPartyMetadataConverter.convert(java.io.InputStream):org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration$Builder" navigationName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.registration.OpenSamlAssertingPartyMetadataConverter.convert(java.io.InputStream):org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration$Builder" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>16806</key>
-            <value realName="spring-security-config.org.springframework.security.config.web.servlet.OAuth2LoginDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer):void" type="method" localSize="387" size="387" displayName="spring-security-config.org.springframework.security.config.web.servlet.OAuth2LoginDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer):void" navigationName="spring-security-config.org.springframework.security.config.web.servlet.OAuth2LoginDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer):void" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>19862</key>
+            <value realName="spring-security-config.org.springframework.security.config.web" type="package" localSize="0" size="19335" displayName="spring-security-config.org.springframework.security.config.web" navigationName="spring-security-config.org.springframework.security.config.web" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>3815</key>
-            <value realName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.registration.OpenSamlAssertingPartyMetadataConverter.convert(java.io.InputStream):org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration$Builder" type="method" localSize="241" size="241" displayName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.registration.OpenSamlAssertingPartyMetadataConverter.convert(java.io.InputStream):org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration$Builder" navigationName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.registration.OpenSamlAssertingPartyMetadataConverter.convert(java.io.InputStream):org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration$Builder" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>8118</key>
+            <value realName="spring-security-config.org.springframework.security.config.http.HttpConfigurationBuilder.createSessionManagementFilters():void" type="method" localSize="370" size="370" displayName="spring-security-config.org.springframework.security.config.http.HttpConfigurationBuilder.createSessionManagementFilters():void" navigationName="spring-security-config.org.springframework.security.config.http.HttpConfigurationBuilder.createSessionManagementFilters():void" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>40</key>
-            <value realName="spring-security-config.org.springframework.security.config.http.AuthenticationConfigBuilder" type="class" localSize="1" size="2255" displayName="spring-security-config.org.springframework.security.config.http.AuthenticationConfigBuilder" navigationName="spring-security-config.org.springframework.security.config.http.AuthenticationConfigBuilder" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>986</key>
+            <value realName="spring-security-config.org.springframework.security.config.annotation.web.configurers.SessionManagementConfigurer" type="class" localSize="1" size="731" displayName="spring-security-config.org.springframework.security.config.annotation.web.configurers.SessionManagementConfigurer" navigationName="spring-security-config.org.springframework.security.config.annotation.web.configurers.SessionManagementConfigurer" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>19882</key>
-            <value realName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service" type="package" localSize="0" size="12577" displayName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service" navigationName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>19803</key>
+            <value realName="spring-security-config.org.springframework.security.config.annotation" type="package" localSize="0" size="20903" displayName="spring-security-config.org.springframework.security.config.annotation" navigationName="spring-security-config.org.springframework.security.config.annotation" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>8107</key>
-            <value realName="spring-security-config.org.springframework.security.config.http.HttpConfigurationBuilder.createSessionManagementFilters():void" type="method" localSize="370" size="370" displayName="spring-security-config.org.springframework.security.config.http.HttpConfigurationBuilder.createSessionManagementFilters():void" navigationName="spring-security-config.org.springframework.security.config.http.HttpConfigurationBuilder.createSessionManagementFilters():void" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>380</key>
+            <value realName="spring-security-core.org.springframework.security.provisioning.JdbcUserDetailsManager" type="class" localSize="1" size="1303" displayName="spring-security-core.org.springframework.security.provisioning.JdbcUserDetailsManager" navigationName="spring-security-core.org.springframework.security.provisioning.JdbcUserDetailsManager" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>816</key>
-            <value realName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.authentication.OpenSamlAuthenticationProvider" type="class" localSize="1" size="1274" displayName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.authentication.OpenSamlAuthenticationProvider" navigationName="spring-security-saml2-service-provider.org.springframework.security.saml2.provider.service.authentication.OpenSamlAuthenticationProvider" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>16796</key>
+            <value realName="spring-security-oauth2-core.org.springframework.security.oauth2.core.oidc.DefaultAddressStandardClaim.equals(java.lang.Object):boolean" type="method" localSize="109" size="109" displayName="spring-security-oauth2-core.org.springframework.security.oauth2.core.oidc.DefaultAddressStandardClaim.equals(java.lang.Object):boolean" navigationName="spring-security-oauth2-core.org.springframework.security.oauth2.core.oidc.DefaultAddressStandardClaim.equals(java.lang.Object):boolean" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>3772</key>
-            <value realName="spring-security-core.org.springframework.security.authentication.ProviderManager.authenticate(org.springframework.security.core.Authentication):org.springframework.security.core.Authentication" type="method" localSize="137" size="137" displayName="spring-security-core.org.springframework.security.authentication.ProviderManager.authenticate(org.springframework.security.core.Authentication):org.springframework.security.core.Authentication" navigationName="spring-security-core.org.springframework.security.authentication.ProviderManager.authenticate(org.springframework.security.core.Authentication):org.springframework.security.core.Authentication" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>18844</key>
+            <value realName="spring-security-config.org.springframework.security.config.web.server.ServerHeadersDsl$get$1.invoke(org.springframework.security.config.web.server.ServerHttpSecurity$HeaderSpec):void" type="method" localSize="283" size="283" displayName="spring-security-config.org.springframework.security.config.web.server.ServerHeadersDsl$get$1.invoke(org.springframework.security.config.web.server.ServerHttpSecurity$HeaderSpec):void" navigationName="spring-security-config.org.springframework.security.config.web.server.ServerHeadersDsl$get$1.invoke(org.springframework.security.config.web.server.ServerHttpSecurity$HeaderSpec):void" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>380</key>
-            <value realName="spring-security-core.org.springframework.security.provisioning.JdbcUserDetailsManager" type="class" localSize="1" size="1303" displayName="spring-security-core.org.springframework.security.provisioning.JdbcUserDetailsManager" navigationName="spring-security-core.org.springframework.security.provisioning.JdbcUserDetailsManager" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>19804</key>
+            <value realName="spring-security-config.org.springframework.security.config" type="package" localSize="0" size="58136" displayName="spring-security-config.org.springframework.security.config" navigationName="spring-security-config.org.springframework.security.config" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
-            <key>14014</key>
-            <value realName="spring-security-config.org.springframework.security.config.web.servlet.HeadersDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.HeadersConfigurer):void" type="method" localSize="371" size="371" displayName="spring-security-config.org.springframework.security.config.web.servlet.HeadersDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.HeadersConfigurer):void" navigationName="spring-security-config.org.springframework.security.config.web.servlet.HeadersDsl$get$1.invoke(org.springframework.security.config.annotation.web.configurers.HeadersConfigurer):void" isModule="false" isModuleInterface="false" isDeprecated="false"/>
+            <key>7455</key>
+            <value realName="spring-security-web.org.springframework.security.web.util.TextEscapeUtils.escapeEntities(java.lang.String):java.lang.String" type="method" localSize="168" size="168" displayName="spring-security-web.org.springframework.security.web.util.TextEscapeUtils.escapeEntities(java.lang.String):java.lang.String" navigationName="spring-security-web.org.springframework.security.web.util.TextEscapeUtils.escapeEntities(java.lang.String):java.lang.String" isModule="false" isModuleInterface="false" isDeprecated="false"/>
         </entry>
         <entry>
             <key>1215</key>
diff --git a/etc/s101/repository/snapshots/baseline/package-slice.hsx b/etc/s101/repository/snapshots/baseline/package-slice.hsx
index f4b009ca6f..f43d49e98e 100644
Binary files a/etc/s101/repository/snapshots/baseline/package-slice.hsx and b/etc/s101/repository/snapshots/baseline/package-slice.hsx differ
diff --git a/etc/s101/repository/snapshots/baseline/settings.hsx b/etc/s101/repository/snapshots/baseline/settings.hsx
index b7946c1fb0..ab19d2271f 100644
Binary files a/etc/s101/repository/snapshots/baseline/settings.hsx and b/etc/s101/repository/snapshots/baseline/settings.hsx differ
diff --git a/etc/s101/repository/snapshots/baseline/spec.hsx b/etc/s101/repository/snapshots/baseline/spec.hsx
index 1ba95e9cbe..c3e4e92e31 100644
Binary files a/etc/s101/repository/snapshots/baseline/spec.hsx and b/etc/s101/repository/snapshots/baseline/spec.hsx differ
diff --git a/etc/s101/repository/snapshots/baseline/summary.hsx b/etc/s101/repository/snapshots/baseline/summary.hsx
index 40dbeef0f0..12d5432bd9 100644
Binary files a/etc/s101/repository/snapshots/baseline/summary.hsx and b/etc/s101/repository/snapshots/baseline/summary.hsx differ
diff --git a/etc/s101/repository/snapshots/baseline/xb.hsx b/etc/s101/repository/snapshots/baseline/xb.hsx
index a8046c6da6..a68939c011 100644
Binary files a/etc/s101/repository/snapshots/baseline/xb.hsx and b/etc/s101/repository/snapshots/baseline/xb.hsx differ
diff --git a/etc/s101/repository/snapshots/baseline/xblite.hsx b/etc/s101/repository/snapshots/baseline/xblite.hsx
index e00f0f8a5d..685d1528e2 100644
Binary files a/etc/s101/repository/snapshots/baseline/xblite.hsx and b/etc/s101/repository/snapshots/baseline/xblite.hsx differ
diff --git a/etc/s101/repository/snapshots/baseline/xs-offenders.hsx b/etc/s101/repository/snapshots/baseline/xs-offenders.hsx
index 711f1eefdc..6b4806467f 100644
Binary files a/etc/s101/repository/snapshots/baseline/xs-offenders.hsx and b/etc/s101/repository/snapshots/baseline/xs-offenders.hsx differ
diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationFilter.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationFilter.java
index 67bca19b44..ff96925fac 100644
--- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationFilter.java
+++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationFilter.java
@@ -28,10 +28,10 @@ import org.springframework.security.saml2.core.Saml2ParameterNames;
 import org.springframework.security.saml2.provider.service.authentication.AbstractSaml2AuthenticationRequest;
 import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationException;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
-import org.springframework.security.saml2.provider.service.servlet.HttpSessionSaml2AuthenticationRequestRepository;
-import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.web.DefaultRelyingPartyRegistrationResolver;
+import org.springframework.security.saml2.provider.service.web.HttpSessionSaml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.web.RelyingPartyRegistrationResolver;
+import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationTokenConverter;
 import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
 import org.springframework.security.web.authentication.AuthenticationConverter;
diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilter.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilter.java
index cc266f971d..8eea145fe3 100644
--- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilter.java
+++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilter.java
@@ -36,12 +36,12 @@ import org.springframework.security.saml2.provider.service.authentication.Saml2R
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
 import org.springframework.security.saml2.provider.service.registration.Saml2MessageBinding;
-import org.springframework.security.saml2.provider.service.servlet.HttpSessionSaml2AuthenticationRequestRepository;
-import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.web.DefaultRelyingPartyRegistrationResolver;
 import org.springframework.security.saml2.provider.service.web.DefaultSaml2AuthenticationRequestContextResolver;
+import org.springframework.security.saml2.provider.service.web.HttpSessionSaml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.web.RelyingPartyRegistrationResolver;
 import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestContextResolver;
+import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher.MatchResult;
diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/HttpSessionSaml2AuthenticationRequestRepository.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/HttpSessionSaml2AuthenticationRequestRepository.java
similarity index 97%
rename from saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/HttpSessionSaml2AuthenticationRequestRepository.java
rename to saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/HttpSessionSaml2AuthenticationRequestRepository.java
index eab739ce9c..3727b22105 100644
--- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/HttpSessionSaml2AuthenticationRequestRepository.java
+++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/HttpSessionSaml2AuthenticationRequestRepository.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.saml2.provider.service.servlet;
+package org.springframework.security.saml2.provider.service.web;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/Saml2AuthenticationRequestRepository.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationRequestRepository.java
similarity index 96%
rename from saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/Saml2AuthenticationRequestRepository.java
rename to saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationRequestRepository.java
index 379f4c43db..585a8ae90a 100644
--- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/Saml2AuthenticationRequestRepository.java
+++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationRequestRepository.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.saml2.provider.service.servlet;
+package org.springframework.security.saml2.provider.service.web;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverter.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverter.java
index d84076af20..b100957d78 100644
--- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverter.java
+++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverter.java
@@ -36,8 +36,6 @@ import org.springframework.security.saml2.provider.service.authentication.Abstra
 import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationException;
 import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationToken;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
-import org.springframework.security.saml2.provider.service.servlet.HttpSessionSaml2AuthenticationRequestRepository;
-import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
 import org.springframework.security.web.authentication.AuthenticationConverter;
 import org.springframework.util.Assert;
 
diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/HttpSessionSaml2AuthenticationRequestRepositoryTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/HttpSessionSaml2AuthenticationRequestRepositoryTests.java
index 9e9463f62b..fd46bd1361 100644
--- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/HttpSessionSaml2AuthenticationRequestRepositoryTests.java
+++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/HttpSessionSaml2AuthenticationRequestRepositoryTests.java
@@ -23,6 +23,7 @@ import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockHttpSession;
 import org.springframework.security.saml2.provider.service.authentication.AbstractSaml2AuthenticationRequest;
+import org.springframework.security.saml2.provider.service.web.HttpSessionSaml2AuthenticationRequestRepository;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationFilterTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationFilterTests.java
index 65ea0f07dc..286acf9bc1 100644
--- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationFilterTests.java
+++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationFilterTests.java
@@ -37,9 +37,9 @@ import org.springframework.security.saml2.provider.service.authentication.TestSa
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
 import org.springframework.security.saml2.provider.service.registration.TestRelyingPartyRegistrations;
-import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.web.DefaultRelyingPartyRegistrationResolver;
 import org.springframework.security.saml2.provider.service.web.RelyingPartyRegistrationResolver;
+import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationTokenConverter;
 import org.springframework.security.web.authentication.AuthenticationConverter;
 import org.springframework.security.web.authentication.WebAuthenticationDetails;
diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java
index 5afcc554b1..5ddd7168ed 100644
--- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java
+++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java
@@ -38,11 +38,11 @@ import org.springframework.security.saml2.provider.service.registration.RelyingP
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
 import org.springframework.security.saml2.provider.service.registration.Saml2MessageBinding;
 import org.springframework.security.saml2.provider.service.registration.TestRelyingPartyRegistrations;
-import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.web.DefaultRelyingPartyRegistrationResolver;
 import org.springframework.security.saml2.provider.service.web.DefaultSaml2AuthenticationRequestContextResolver;
 import org.springframework.security.saml2.provider.service.web.RelyingPartyRegistrationResolver;
 import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestContextResolver;
+import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.web.util.HtmlUtils;
diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverterTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverterTests.java
index fe4c8dfe35..02b4692961 100644
--- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverterTests.java
+++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverterTests.java
@@ -37,7 +37,6 @@ import org.springframework.security.saml2.provider.service.authentication.Saml2A
 import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationToken;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
 import org.springframework.security.saml2.provider.service.registration.TestRelyingPartyRegistrations;
-import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
 import org.springframework.util.StreamUtils;
 import org.springframework.web.util.UriUtils;