[java-idp-plugin-totp] branch master updated: IDP-1595 Move to new class locations

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-idp-plugin-totp.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-totp.git;a=commit;h=71a0a4164b1be4cb345bf565cb94ff10a53f881d

The following commit(s) were added to refs/heads/master by this push:
       new  71a0a41   IDP-1595 Move to new class locations
71a0a41 is described below

commit 71a0a4164b1be4cb345bf565cb94ff10a53f881d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jul 15 16:15:56 2020 +0100

    IDP-1595 Move to new class locations
    
    https://issues.shibboleth.net/jira/browse/IDP-1595
---
 totp-impl/pom.xml                                  | 39 ++++++++++++++++++++--
 .../idp/plugin/totp/TOTPDescription.java           |  2 +-
 ...=> net.shibboleth.idp.plugin.PluginDescription} |  0
 .../net/shibboleth/idp/plugin/totp/PluginTest.java |  4 +--
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/totp-impl/pom.xml b/totp-impl/pom.xml
index 760e34f..3a4b2f3 100644
--- a/totp-impl/pom.xml
+++ b/totp-impl/pom.xml
@@ -44,6 +44,11 @@
             <artifactId>spring-webflow</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-admin-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${idp.groupId}</groupId>
             <artifactId>idp-attribute-api</artifactId>
@@ -60,6 +65,34 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-messaging-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-profile-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- test dependencies -->
         <dependency>
             <groupId>${idp.groupId}</groupId>
@@ -85,14 +118,14 @@
         </dependency>
         <dependency>
             <groupId>${idp.groupId}</groupId>
-            <artifactId>idp-installer</artifactId>
+            <artifactId>idp-profile-api</artifactId>
             <scope>test</scope>
+            <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>${idp.groupId}</groupId>
-            <artifactId>idp-profile-api</artifactId>
+            <artifactId>idp-admin-impl</artifactId>
             <scope>test</scope>
-            <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/TOTPDescription.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/TOTPDescription.java
index 9de5ea5..1a70358 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/TOTPDescription.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/TOTPDescription.java
@@ -27,10 +27,10 @@ import javax.annotation.Nonnull;
 
 import org.springframework.core.io.ClassPathResource;
 
+import net.shibboleth.idp.plugin.AbstractPluginDescription;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.plugin.AbstractPluginDescription;
 
 /**
  * Details about the TOTP login plugin.
diff --git a/totp-impl/src/main/resources/META-INF/services/net.shibboleth.utilities.java.support.plugin.PluginDescription b/totp-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.PluginDescription
similarity index 100%
rename from totp-impl/src/main/resources/META-INF/services/net.shibboleth.utilities.java.support.plugin.PluginDescription
rename to totp-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.PluginDescription
diff --git a/totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/PluginTest.java b/totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/PluginTest.java
index 1306a4a..dfde84c 100644
--- a/totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/PluginTest.java
+++ b/totp-impl/src/test/java/net/shibboleth/idp/plugin/totp/PluginTest.java
@@ -24,9 +24,9 @@ import java.util.ServiceLoader;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import net.shibboleth.idp.installer.plugin.impl.PluginState;
+import net.shibboleth.idp.plugin.PluginDescription;
+import net.shibboleth.idp.plugin.impl.PluginState;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.plugin.PluginDescription;
 
 /**  basic sanity tests */
 @SuppressWarnings("javadoc")

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