[java-idp-plugin-duo] branch main updated: Refactor gross mistake in API package name
Phil Smart
philip.smart at jisc.ac.uk
Fri Sep 4 09:40:00 UTC 2020
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-idp-plugin-duo.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=e22057631eae993a221e44c0442176ce09252c58
The following commit(s) were added to refs/heads/main by this push:
new e220576 Refactor gross mistake in API package name
e220576 is described below
commit e22057631eae993a221e44c0442176ce09252c58
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Sep 4 10:39:53 2020 +0100
Refactor gross mistake in API package name
- shbboleth instead of shibboleth
---
idp-duo-api/pom.xml | 27 ++++++++++++++++++++++
.../authn/duo/AbstractDuoAuthenticationAction.java | 4 ++--
.../authn/duo/DefaultDuoOIDCIntegration.java | 2 +-
.../idp/plugin/authn/duo/DuoClientException.java | 2 +-
.../duo/DuoClientInitializationException.java | 2 +-
.../idp/plugin/authn/duo/DuoException.java | 2 +-
.../idp/plugin/authn/duo/DuoOIDCAuthAPI.java | 2 +-
.../idp/plugin/authn/duo/DuoOIDCClient.java | 6 ++---
.../idp/plugin/authn/duo/DuoOIDCClientFactory.java | 2 +-
.../plugin/authn/duo/DuoOIDCClientRegistry.java | 2 +-
.../idp/plugin/authn/duo/DuoOIDCIntegration.java | 2 +-
.../idp/plugin/authn/duo/DuoRegistryException.java | 2 +-
.../idp/plugin/authn/duo/Version.java | 2 +-
.../duo/context/DuoOIDCAuthenticationContext.java | 8 +++----
.../plugin/authn/duo/model/DuoAccessDevice.java | 2 +-
.../idp/plugin/authn/duo/model/DuoApplication.java | 2 +-
.../idp/plugin/authn/duo/model/DuoAuthContext.java | 2 +-
.../idp/plugin/authn/duo/model/DuoAuthDevice.java | 2 +-
.../idp/plugin/authn/duo/model/DuoAuthToken.java | 2 +-
.../idp/plugin/authn/duo/model/DuoHealthCheck.java | 2 +-
idp-duo-impl/pom.xml | 24 ++++++++++++++++++-
.../idp/plugin/authn/duo/DuoOIDCDescription.java | 2 +-
.../duo/impl/DefaultDuoOIDCClientRegistry.java | 16 ++++++-------
.../authn/duo/impl/DuoOIDCAuthnController.java | 11 +++++----
.../idp/plugin/authn/duo/impl/DuoSupport.java | 2 +-
.../authn/duo/impl/ExchangeCodeForDuoToken.java | 10 ++++----
.../authn/duo/impl/HealthCheckDuoOIDCAuthAPI.java | 12 +++++-----
.../duo/impl/PopulateDuoAuthenticationContext.java | 10 ++++----
.../authn/duo/impl/ValidateDuoResponseState.java | 4 ++--
.../authn/duo/impl/ValidateDuoTokenAudience.java | 6 ++---
.../impl/ValidateDuoTokenAuthenticationResult.java | 6 ++---
.../impl/ValidateDuoTokenAuthenticationTime.java | 6 ++---
.../duo/impl/ValidateDuoTokenExpirationTime.java | 6 ++---
.../authn/duo/impl/ValidateDuoTokenIssuedAt.java | 6 ++---
.../authn/duo/impl/ValidateDuoTokenIssuer.java | 6 ++---
.../authn/duo/impl/ValidateDuoTokenSubject.java | 6 ++---
.../flows/authn/DuoOIDC/duo-oidc-authn-beans.xml | 2 +-
.../impl/AbstractAuthnXmlFlowExecutionTests.java | 2 +-
.../authn/duo/impl/AbstractDuoActionTest.java | 15 ++++++------
.../duo/impl/DefaultDuoOIDCClientRegistryTest.java | 6 ++---
.../authn/duo/impl/DualDuoIntegrationStrategy.java | 4 ++--
.../plugin/authn/duo/impl/DuoAuthnFlowTest.java | 6 ++---
.../authn/duo/impl/DuoOIDCAuthnControllerTest.java | 6 ++---
.../idp/plugin/authn/duo/impl/DuoSupportTest.java | 2 +-
.../duo/impl/ExchangeCodeForDuoTokenTest.java | 6 ++---
.../duo/impl/HealthCheckDuoOIDCAuthAPITest.java | 6 ++---
.../impl/PopulateDuoAuthenticationContextTest.java | 8 +++----
.../duo/impl/ValidateDuoTokenAudienceTest.java | 2 +-
.../ValidateDuoTokenAuthenticationResultTest.java | 4 ++--
.../ValidateDuoTokenAuthenticationTimeTest.java | 2 +-
.../impl/ValidateDuoTokenExpirationTimeTest.java | 2 +-
.../duo/impl/ValidateDuoTokenIssuedAtTest.java | 2 +-
.../authn/duo/impl/ValidateDuoTokenIssuerTest.java | 2 +-
.../duo/impl/ValidateDuoTokenSubjectTest.java | 2 +-
.../mock/MockDuoOIDCClientFactory_FAIL_Client.java | 8 +++----
.../mock/MockDuoOIDCClientFactory_OK_Client.java | 8 +++----
.../plugin/authn/mock/MockDuoOIDCClient_FAIL.java | 18 +++++++--------
.../plugin/authn/mock/MockDuoOIDCClient_OK.java | 18 +++++++--------
.../mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java | 18 +++++++--------
.../authn/mock/MockDuoOIDCClient_UNKNOWN.java | 18 +++++++--------
.../authn/duo/sdk/impl/DuoSDKClientAdaptor.java | 18 +++++++--------
.../authn/duo/sdk/impl/DuoSDKClientFactory.java | 8 +++----
.../duo/sdk/impl/DuoSDKClientFactoryTest.java | 6 ++---
63 files changed, 229 insertions(+), 180 deletions(-)
diff --git a/idp-duo-api/pom.xml b/idp-duo-api/pom.xml
index 5dd3f45..1cce03f 100644
--- a/idp-duo-api/pom.xml
+++ b/idp-duo-api/pom.xml
@@ -50,5 +50,32 @@
<!-- Test dependencies -->
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <index>true</index>
+ <manifestEntries>
+ <Main-Class>net.shibboleth.idp.plugin.authn.duo.Version</Main-Class>
+ </manifestEntries>
+ <manifestSections>
+ <manifestSection>
+ <name>net/shibboleth/idp/plugin/duo</name>
+ <manifestEntries>
+ <Implementation-Title>${project.artifactId}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>shibboleth.net</Implementation-Vendor>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/AbstractDuoAuthenticationAction.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/AbstractDuoAuthenticationAction.java
similarity index 97%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/AbstractDuoAuthenticationAction.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/AbstractDuoAuthenticationAction.java
index 13f85b4..dca6004 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/AbstractDuoAuthenticationAction.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/AbstractDuoAuthenticationAction.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo;
+package net.shibboleth.idp.plugin.authn.duo;
import java.util.function.Function;
@@ -28,10 +28,10 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
import net.shibboleth.idp.authn.AbstractAuthenticationAction;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DefaultDuoOIDCIntegration.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DefaultDuoOIDCIntegration.java
similarity index 99%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DefaultDuoOIDCIntegration.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DefaultDuoOIDCIntegration.java
index d0b87e0..4f46943 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DefaultDuoOIDCIntegration.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DefaultDuoOIDCIntegration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo;
+package net.shibboleth.idp.plugin.authn.duo;
import java.security.Principal;
import java.util.Collection;
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoClientException.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoClientException.java
similarity index 97%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoClientException.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoClientException.java
index ab8fa56..23a40de 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoClientException.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoClientException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo;
+package net.shibboleth.idp.plugin.authn.duo;
import javax.annotation.concurrent.ThreadSafe;
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoClientInitializationException.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoClientInitializationException.java
similarity index 97%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoClientInitializationException.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoClientInitializationException.java
index fb858d7..55a694c 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoClientInitializationException.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoClientInitializationException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo;
+package net.shibboleth.idp.plugin.authn.duo;
/**
* Indicates an error during registry processing.
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoException.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoException.java
similarity index 97%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoException.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoException.java
index 65beb15..f9bfb19 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoException.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo;
+package net.shibboleth.idp.plugin.authn.duo;
import javax.annotation.concurrent.ThreadSafe;
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCAuthAPI.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCAuthAPI.java
similarity index 97%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCAuthAPI.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCAuthAPI.java
index 10f38fa..916bdb3 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCAuthAPI.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCAuthAPI.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo;
+package net.shibboleth.idp.plugin.authn.duo;
import javax.annotation.Nonnull;
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCClient.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCClient.java
similarity index 93%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCClient.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCClient.java
index be384ab..3fe7333 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCClient.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCClient.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo;
+package net.shibboleth.idp.plugin.authn.duo;
import javax.annotation.Nonnull;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
/**
* A client for handling Duo OIDC 2FA interactions.
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCClientFactory.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCClientFactory.java
similarity index 96%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCClientFactory.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCClientFactory.java
index 313c68d..d9307d5 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCClientFactory.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCClientFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo;
+package net.shibboleth.idp.plugin.authn.duo;
import javax.annotation.Nonnull;
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCClientRegistry.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCClientRegistry.java
similarity index 97%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCClientRegistry.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCClientRegistry.java
index 354961f..f973dd9 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCClientRegistry.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCClientRegistry.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo;
+package net.shibboleth.idp.plugin.authn.duo;
import javax.annotation.Nonnull;
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCIntegration.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCIntegration.java
similarity index 97%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCIntegration.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCIntegration.java
index 7914801..f41a42c 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCIntegration.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCIntegration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo;
+package net.shibboleth.idp.plugin.authn.duo;
import javax.annotation.Nonnull;
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoRegistryException.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoRegistryException.java
similarity index 97%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoRegistryException.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoRegistryException.java
index af2ac44..4131dd8 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoRegistryException.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoRegistryException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo;
+package net.shibboleth.idp.plugin.authn.duo;
/**
* Indicates an error during registry processing.
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/Version.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/Version.java
similarity index 97%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/Version.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/Version.java
index 7f7b7b0..68aac8a 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/Version.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/Version.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo;
+package net.shibboleth.idp.plugin.authn.duo;
import javax.annotation.Nullable;
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/context/DuoOIDCAuthenticationContext.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/context/DuoOIDCAuthenticationContext.java
similarity index 95%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/context/DuoOIDCAuthenticationContext.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/context/DuoOIDCAuthenticationContext.java
index 12967fb..76cc234 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/context/DuoOIDCAuthenticationContext.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/context/DuoOIDCAuthenticationContext.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo.context;
+package net.shibboleth.idp.plugin.authn.duo.context;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opensaml.messaging.context.BaseContext;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
/**
* <p>Context that carries the Duo integration and Duo authentication result token.</p>
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoAccessDevice.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoAccessDevice.java
similarity index 98%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoAccessDevice.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoAccessDevice.java
index 82cb9c3..8bd29f9 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoAccessDevice.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoAccessDevice.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo.model;
+package net.shibboleth.idp.plugin.authn.duo.model;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoApplication.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoApplication.java
similarity index 98%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoApplication.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoApplication.java
index d6cb4bc..423f9fa 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoApplication.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo.model;
+package net.shibboleth.idp.plugin.authn.duo.model;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.Immutable;
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoAuthContext.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoAuthContext.java
similarity index 99%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoAuthContext.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoAuthContext.java
index eb9ec39..2d7f673 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoAuthContext.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoAuthContext.java
@@ -15,7 +15,7 @@
*/
-package net.shbboleth.idp.plugin.authn.duo.model;
+package net.shibboleth.idp.plugin.authn.duo.model;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.Immutable;
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoAuthDevice.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoAuthDevice.java
similarity index 98%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoAuthDevice.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoAuthDevice.java
index 2e660df..a47f118 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoAuthDevice.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoAuthDevice.java
@@ -1,5 +1,5 @@
-package net.shbboleth.idp.plugin.authn.duo.model;
+package net.shibboleth.idp.plugin.authn.duo.model;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoAuthToken.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoAuthToken.java
similarity index 99%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoAuthToken.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoAuthToken.java
index 2d6a8d8..954bca1 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoAuthToken.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoAuthToken.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package net.shbboleth.idp.plugin.authn.duo.model;
+package net.shibboleth.idp.plugin.authn.duo.model;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoHealthCheck.java b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoHealthCheck.java
similarity index 99%
rename from idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoHealthCheck.java
rename to idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoHealthCheck.java
index 3c69d16..988e656 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/model/DuoHealthCheck.java
+++ b/idp-duo-api/src/main/java/net/shibboleth/idp/plugin/authn/duo/model/DuoHealthCheck.java
@@ -1,4 +1,4 @@
-package net.shbboleth.idp.plugin.authn.duo.model;
+package net.shibboleth.idp.plugin.authn.duo.model;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/idp-duo-impl/pom.xml b/idp-duo-impl/pom.xml
index f87fb11..383a0d1 100644
--- a/idp-duo-impl/pom.xml
+++ b/idp-duo-impl/pom.xml
@@ -161,7 +161,29 @@
<exclude>credentials/**</exclude>
</excludes>
</configuration>
- </plugin>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <index>true</index>
+ <manifestEntries>
+ <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+ </manifestEntries>
+ <manifestSections>
+ <manifestSection>
+ <name>net/shibboleth/idp/plugin/duo</name>
+ <manifestEntries>
+ <Implementation-Title>${project.artifactId}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>shibboleth.net</Implementation-Vendor>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCDescription.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCDescription.java
index 698a8f5..eaf1f66 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCDescription.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/DuoOIDCDescription.java
@@ -28,9 +28,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
-import net.shbboleth.idp.plugin.authn.duo.Version;
import net.shibboleth.idp.plugin.AbstractPluginDescription;
import net.shibboleth.idp.plugin.PluginVersion;
+import net.shibboleth.idp.plugin.authn.duo.Version;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DefaultDuoOIDCClientRegistry.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DefaultDuoOIDCClientRegistry.java
index 942946d..65397b1 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DefaultDuoOIDCClientRegistry.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DefaultDuoOIDCClientRegistry.java
@@ -28,14 +28,14 @@ import javax.annotation.concurrent.ThreadSafe;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shbboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientInitializationException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClientFactory;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClientRegistry;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.DuoRegistryException;
+import net.shibboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientInitializationException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientFactory;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientRegistry;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.DuoRegistryException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCAuthnController.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCAuthnController.java
index a4a20b6..0cc1a50 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCAuthnController.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCAuthnController.java
@@ -32,14 +32,15 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
+
import net.shibboleth.idp.authn.ExternalAuthentication;
import net.shibboleth.idp.authn.ExternalAuthenticationException;
import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoSupport.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoSupport.java
index 05814a4..0ef5f5e 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoSupport.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoSupport.java
@@ -25,7 +25,7 @@ import javax.annotation.Nullable;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex;
-import net.shbboleth.idp.plugin.authn.duo.DuoException;
+import net.shibboleth.idp.plugin.authn.duo.DuoException;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ExchangeCodeForDuoToken.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ExchangeCodeForDuoToken.java
index 627f9c6..68a35c6 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ExchangeCodeForDuoToken.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ExchangeCodeForDuoToken.java
@@ -24,13 +24,13 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shbboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
/**
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/HealthCheckDuoOIDCAuthAPI.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/HealthCheckDuoOIDCAuthAPI.java
index 6a2164c..6c7162c 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/HealthCheckDuoOIDCAuthAPI.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/HealthCheckDuoOIDCAuthAPI.java
@@ -25,14 +25,14 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shbboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/**
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/PopulateDuoAuthenticationContext.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/PopulateDuoAuthenticationContext.java
index 12ab0a1..5b79983 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/PopulateDuoAuthenticationContext.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/PopulateDuoAuthenticationContext.java
@@ -28,15 +28,15 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClientRegistry;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.DuoRegistryException;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
import net.shibboleth.idp.authn.AbstractAuthenticationAction;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.duo.DuoIntegration;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientRegistry;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.DuoRegistryException;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
import net.shibboleth.idp.session.context.navigate.CanonicalUsernameLookupStrategy;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoResponseState.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoResponseState.java
index 0503928..480a762 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoResponseState.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoResponseState.java
@@ -24,10 +24,10 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shbboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/**
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAudience.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAudience.java
index 6ea24c7..b3831d1 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAudience.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAudience.java
@@ -25,11 +25,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shbboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
/**
* An action that verifies the Audience (aud) claim in the Duo token contains the client_id of this client (as
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResult.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResult.java
index 27e2963..d176ef0 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResult.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResult.java
@@ -30,15 +30,15 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.idp.authn.AbstractValidationAction;
import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
import net.shibboleth.idp.authn.duo.DuoPrincipal;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationTime.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationTime.java
index 7be6089..a7f64b0 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationTime.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationTime.java
@@ -28,11 +28,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shbboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenExpirationTime.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenExpirationTime.java
index 4a5d949..80a6da2 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenExpirationTime.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenExpirationTime.java
@@ -28,11 +28,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shbboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuedAt.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuedAt.java
index 4ee87c0..3fba868 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuedAt.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuedAt.java
@@ -28,11 +28,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shbboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuer.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuer.java
index 9a3b728..5cba9d4 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuer.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuer.java
@@ -25,11 +25,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shbboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenSubject.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenSubject.java
index b3648a6..1768beb 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenSubject.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenSubject.java
@@ -25,11 +25,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shbboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
/**
* An action that verifies the Subject (sub) claim in the Duo token matches that user which
diff --git a/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml b/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
index 733b3d4..9df31aa 100644
--- a/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
+++ b/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
@@ -25,7 +25,7 @@
<!-- Default Duo Integration -->
<bean id="shibboleth.authn.duo.OIDC.DuoIntegration"
- class="net.shbboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration" p:APIHost="%{idp.duo.oidc.apiHost:none}"
+ class="net.shibboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration" p:APIHost="%{idp.duo.oidc.apiHost:none}"
p:clientId="%{idp.duo.oidc.clientId:none}" p:secretKey="%{idp.duo.oidc.secretKey:none}"
p:redirectURI="%{idp.duo.oidc.redirectUri:none}" />
<bean id="shibboleth.authn.duo.OIDC.DuoIntegrationStrategy" parent="shibboleth.Functions.Constant"
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractAuthnXmlFlowExecutionTests.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractAuthnXmlFlowExecutionTests.java
index 43ab6ef..2637f8c 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractAuthnXmlFlowExecutionTests.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractAuthnXmlFlowExecutionTests.java
@@ -52,10 +52,10 @@ import org.springframework.webflow.test.execution.AbstractExternalizedFlowExecut
import com.google.common.net.HttpHeaders;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClientFactory;
import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientFactory;
import net.shibboleth.idp.plugin.authn.spring.CustomAbstractXmlFlowExecutionTests;
import net.shibboleth.idp.plugin.authn.spring.CustomFlowModelFlowBuilder;
import net.shibboleth.idp.session.IdPSession;
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractDuoActionTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractDuoActionTest.java
index 64f4032..576c1ff 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractDuoActionTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractDuoActionTest.java
@@ -35,16 +35,15 @@ import org.springframework.webflow.execution.RequestContext;
import com.codahale.metrics.MetricRegistry;
-
-import net.shbboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAccessDevice;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoApplication;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthDevice;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAccessDevice;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoApplication;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthDevice;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DefaultDuoOIDCClientRegistryTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DefaultDuoOIDCClientRegistryTest.java
index cae9c06..e07bdb6 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DefaultDuoOIDCClientRegistryTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DefaultDuoOIDCClientRegistryTest.java
@@ -32,9 +32,9 @@ import java.util.concurrent.Future;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shbboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.DuoRegistryException;
+import net.shibboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.DuoRegistryException;
import net.shibboleth.idp.plugin.authn.mock.MockDuoOIDCClientFactory_OK_Client;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DualDuoIntegrationStrategy.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DualDuoIntegrationStrategy.java
index 1802130..1a3cc68 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DualDuoIntegrationStrategy.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DualDuoIntegrationStrategy.java
@@ -22,8 +22,8 @@ import java.util.function.Function;
import org.opensaml.profile.context.ProfileRequestContext;
-import net.shbboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
/**
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoAuthnFlowTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoAuthnFlowTest.java
index 6e2c8d6..9adafd3 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoAuthnFlowTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoAuthnFlowTest.java
@@ -34,14 +34,14 @@ import org.springframework.webflow.engine.Flow;
import org.springframework.webflow.engine.impl.FlowExecutionImpl;
import org.springframework.webflow.execution.FlowExecution;
-import net.shbboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
+import net.shibboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
import net.shibboleth.idp.plugin.authn.mock.MockDuoOIDCClientFactory_FAIL_Client;
import net.shibboleth.idp.plugin.authn.mock.MockDuoOIDCClientFactory_OK_Client;
import net.shibboleth.idp.plugin.authn.mock.MockDuoOIDCClient_OK;
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCAuthnControllerTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCAuthnControllerTest.java
index dec90f3..be4f144 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCAuthnControllerTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCAuthnControllerTest.java
@@ -54,9 +54,6 @@ import org.springframework.webflow.executor.FlowExecutorImpl;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shbboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
import net.shibboleth.idp.authn.ExternalAuthentication;
import net.shibboleth.idp.authn.ExternalAuthenticationException;
@@ -64,6 +61,9 @@ import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.ExternalAuthenticationContext;
import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
import net.shibboleth.idp.authn.impl.ExternalAuthenticationImpl;
+import net.shibboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
import net.shibboleth.idp.plugin.authn.mock.MockDuoOIDCClientFactory_OK_Client;
import net.shibboleth.idp.plugin.authn.mock.MockDuoOIDCClient_OK;
import net.shibboleth.idp.plugin.authn.util.mock.IdPPropertyConfigurer;
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoSupportTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoSupportTest.java
index 6ef73bb..c814a99 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoSupportTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoSupportTest.java
@@ -4,7 +4,7 @@ import static org.junit.Assert.assertEquals;
import org.testng.annotations.Test;
-import net.shbboleth.idp.plugin.authn.duo.DuoException;
+import net.shibboleth.idp.plugin.authn.duo.DuoException;
/**
* Tests for the DuoSupport class.
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ExchangeCodeForDuoTokenTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ExchangeCodeForDuoTokenTest.java
index 792edb3..67dcaa3 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ExchangeCodeForDuoTokenTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ExchangeCodeForDuoTokenTest.java
@@ -24,10 +24,10 @@ import org.testng.AssertJUnit;
import org.mockito.Mockito;
import org.springframework.webflow.execution.Event;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClientRegistry;
-import net.shbboleth.idp.plugin.authn.duo.DuoRegistryException;
import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientRegistry;
+import net.shibboleth.idp.plugin.authn.duo.DuoRegistryException;
import net.shibboleth.idp.plugin.authn.mock.MockDuoOIDCClient_OK;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/HealthCheckDuoOIDCAuthAPITest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/HealthCheckDuoOIDCAuthAPITest.java
index 2d8c513..85f5029 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/HealthCheckDuoOIDCAuthAPITest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/HealthCheckDuoOIDCAuthAPITest.java
@@ -41,10 +41,10 @@ import org.springframework.webflow.execution.Event;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClientRegistry;
-import net.shbboleth.idp.plugin.authn.duo.DuoRegistryException;
import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientRegistry;
+import net.shibboleth.idp.plugin.authn.duo.DuoRegistryException;
import net.shibboleth.idp.plugin.authn.mock.MockDuoOIDCClient_FAIL;
import net.shibboleth.idp.plugin.authn.mock.MockDuoOIDCClient_OK;
import net.shibboleth.idp.plugin.authn.mock.MockDuoOIDCClient_UNKNOWN;
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/PopulateDuoAuthenticationContextTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/PopulateDuoAuthenticationContextTest.java
index 5435352..838a56a 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/PopulateDuoAuthenticationContextTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/PopulateDuoAuthenticationContextTest.java
@@ -25,11 +25,11 @@ import org.springframework.webflow.execution.Event;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shbboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClientRegistry;
-import net.shbboleth.idp.plugin.authn.duo.DuoRegistryException;
import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientRegistry;
+import net.shibboleth.idp.plugin.authn.duo.DuoRegistryException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAudienceTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAudienceTest.java
index 644873f..59f8b60 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAudienceTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAudienceTest.java
@@ -43,8 +43,8 @@ import org.springframework.webflow.execution.Event;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResultTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResultTest.java
index f17ffcd..acb1344 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResultTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationResultTest.java
@@ -39,10 +39,10 @@ import org.springframework.webflow.execution.Event;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
-import net.shbboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
+import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
import net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationTimeTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationTimeTest.java
index 1d6ed14..415c425 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationTimeTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAuthenticationTimeTest.java
@@ -30,8 +30,8 @@ import org.springframework.webflow.execution.Event;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenExpirationTimeTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenExpirationTimeTest.java
index 8163928..7f3edbc 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenExpirationTimeTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenExpirationTimeTest.java
@@ -27,8 +27,8 @@ import org.springframework.webflow.execution.Event;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/** Tests for ValidateDuoTokenExpirationTime class.*/
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuedAtTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuedAtTest.java
index bab9cf0..5ff6741 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuedAtTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuedAtTest.java
@@ -29,8 +29,8 @@ import org.springframework.webflow.execution.Event;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuerTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuerTest.java
index 01add29..4abe483 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuerTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenIssuerTest.java
@@ -9,8 +9,8 @@ import org.springframework.webflow.execution.Event;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
public class ValidateDuoTokenIssuerTest extends AbstractDuoActionTest {
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenSubjectTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenSubjectTest.java
index b32c947..5d09bc0 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenSubjectTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenSubjectTest.java
@@ -26,8 +26,8 @@ import org.springframework.webflow.execution.Event;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
import net.shibboleth.idp.authn.AuthnEventIds;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
class ValidateDuoTokenSubjectTest extends AbstractDuoActionTest {
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClientFactory_FAIL_Client.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClientFactory_FAIL_Client.java
index d5e846c..5959a6a 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClientFactory_FAIL_Client.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClientFactory_FAIL_Client.java
@@ -17,10 +17,10 @@
package net.shibboleth.idp.plugin.authn.mock;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClientFactory;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientFactory;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
/**
* Mock client factory that returns a {@link MockDuoOIDCClient_OK} client.
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClientFactory_OK_Client.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClientFactory_OK_Client.java
index 905ed63..b9b2e23 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClientFactory_OK_Client.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClientFactory_OK_Client.java
@@ -17,10 +17,10 @@
package net.shibboleth.idp.plugin.authn.mock;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClientFactory;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientFactory;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
/**
* Mock client factory that returns a {@link MockDuoOIDCClient_OK} client.
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_FAIL.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_FAIL.java
index 43bc840..0b6929a 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_FAIL.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_FAIL.java
@@ -24,15 +24,15 @@ import java.time.temporal.ChronoUnit;
import javax.annotation.Nonnull;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAccessDevice;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoApplication;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthDevice;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAccessDevice;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoApplication;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthDevice;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
/**
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK.java
index b9595ae..ac61765 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK.java
@@ -24,15 +24,15 @@ import java.time.temporal.ChronoUnit;
import javax.annotation.Nonnull;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAccessDevice;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoApplication;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthDevice;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAccessDevice;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoApplication;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthDevice;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
/**
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java
index f51e310..fd4c82d 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java
@@ -24,15 +24,15 @@ import java.time.temporal.ChronoUnit;
import javax.annotation.Nonnull;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAccessDevice;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoApplication;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthDevice;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAccessDevice;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoApplication;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthDevice;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
/**
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_UNKNOWN.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_UNKNOWN.java
index 917b7ee..a626998 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_UNKNOWN.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_UNKNOWN.java
@@ -24,15 +24,15 @@ import java.time.temporal.ChronoUnit;
import javax.annotation.Nonnull;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAccessDevice;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoApplication;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthDevice;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAccessDevice;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoApplication;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthDevice;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
/**
diff --git a/idp-duo-native-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java b/idp-duo-native-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java
index 7b02d8d..7b1e279 100644
--- a/idp-duo-native-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java
+++ b/idp-duo-native-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java
@@ -11,15 +11,15 @@ import com.duosecurity.exception.DuoException;
import com.duosecurity.model.HealthCheckResponse;
import com.duosecurity.model.Token;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAccessDevice;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoApplication;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthContext;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthDevice;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoAuthToken;
-import net.shbboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAccessDevice;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoApplication;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthContext;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthDevice;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoAuthToken;
+import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/idp-duo-native-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java b/idp-duo-native-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java
index ef0872f..69d5572 100644
--- a/idp-duo-native-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java
+++ b/idp-duo-native-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java
@@ -8,10 +8,10 @@ import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClientFactory;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientFactory;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/idp-duo-native-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactoryTest.java b/idp-duo-native-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactoryTest.java
index 8a3dd1b..c196df4 100644
--- a/idp-duo-native-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactoryTest.java
+++ b/idp-duo-native-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactoryTest.java
@@ -8,9 +8,9 @@ import java.util.List;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shbboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
-import net.shbboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shbboleth.idp.plugin.authn.duo.DuoOIDCClient;
+import net.shibboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
+import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
+import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
public class DuoSDKClientFactoryTest {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list