[java-identity-provider] branch main updated: Move deprecated class down into impl.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=d069b4438b5f57d803ae4b12f52c4b786533fb5c

The following commit(s) were added to refs/heads/main by this push:
     new d069b4438 Move deprecated class down into impl.
d069b4438 is described below

commit d069b4438b5f57d803ae4b12f52c4b786533fb5c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 27 09:53:28 2022 -0400

    Move deprecated class down into impl.
---
 .../authn/impl}/DefaultPrincipalDeterminationStrategy.java    |  2 +-
 .../net/shibboleth/idp/flows/saml/saml1/common-beans.xml      |  2 +-
 .../net/shibboleth/idp/flows/saml/saml2/common-beans.xml      |  2 +-
 idp-saml-impl/pom.xml                                         | 11 +++++------
 .../profile/impl/AddAuthenticationStatementToAssertion.java   |  2 +-
 .../saml/saml2/profile/impl/AddAuthnStatementToAssertion.java |  2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/DefaultPrincipalDeterminationStrategy.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DefaultPrincipalDeterminationStrategy.java
similarity index 98%
rename from idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/DefaultPrincipalDeterminationStrategy.java
rename to idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DefaultPrincipalDeterminationStrategy.java
index bd8d1d7ab..ff98afb21 100644
--- a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/DefaultPrincipalDeterminationStrategy.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DefaultPrincipalDeterminationStrategy.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.authn.principal;
+package net.shibboleth.idp.authn.impl;
 
 import java.security.Principal;
 import java.util.Set;
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/common-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/common-beans.xml
index f7ef149bb..d3dd248db 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/common-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/common-beans.xml
@@ -36,7 +36,7 @@
                 p:defaultIdentifierGenerationStrategy-ref="shibboleth.DefaultIdentifierGenerationStrategy" />
         </property>
         <property name="authenticationMethodLookupStrategy">
-            <bean class="net.shibboleth.idp.authn.principal.DefaultPrincipalDeterminationStrategy"
+            <bean class="net.shibboleth.idp.authn.impl.DefaultPrincipalDeterminationStrategy"
                     c:type="net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal">
                 <constructor-arg name="principal">
                     <bean class="net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/common-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/common-beans.xml
index 9e08c4cea..a547497c5 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/common-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/common-beans.xml
@@ -37,7 +37,7 @@
                 p:defaultIdentifierGenerationStrategy-ref="shibboleth.DefaultIdentifierGenerationStrategy" />
         </property>
         <property name="classRefLookupStrategy">
-            <bean class="net.shibboleth.idp.authn.principal.DefaultPrincipalDeterminationStrategy"
+            <bean class="net.shibboleth.idp.authn.impl.DefaultPrincipalDeterminationStrategy"
                     c:type="net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal">
                 <constructor-arg name="principal">
                     <bean class="net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal"
diff --git a/idp-saml-impl/pom.xml b/idp-saml-impl/pom.xml
index cca9d83f7..4679a464e 100644
--- a/idp-saml-impl/pom.xml
+++ b/idp-saml-impl/pom.xml
@@ -32,6 +32,11 @@
             <artifactId>idp-authn-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-authn-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-profile-api</artifactId>
@@ -166,12 +171,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-authn-impl</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-testing</artifactId>
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertion.java
index 5cba452f5..1763254ce 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertion.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
 
 import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
-import net.shibboleth.idp.authn.principal.DefaultPrincipalDeterminationStrategy;
+import net.shibboleth.idp.authn.impl.DefaultPrincipalDeterminationStrategy;
 import net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal;
 import net.shibboleth.idp.saml.profile.impl.BaseAddAuthenticationStatementToAssertion;
 import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertion.java
index 088c04ea3..0bd8b9715 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertion.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
 
 import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
-import net.shibboleth.idp.authn.principal.DefaultPrincipalDeterminationStrategy;
+import net.shibboleth.idp.authn.impl.DefaultPrincipalDeterminationStrategy;
 import net.shibboleth.idp.authn.principal.ProxyAuthenticationPrincipal;
 import net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal;
 import net.shibboleth.idp.saml.authn.principal.AuthnContextDeclRefPrincipal;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.