[java-idp-plugin-duo] branch master updated: Cleanup module POMs. Still WIP.

Phil Smart philip.smart at jisc.ac.uk
Thu Jul 16 11:10:51 UTC 2020


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

philsmart pushed a commit to branch master
in repository java-idp-plugin-duo.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=23c3f353175413cef6c983b384e58124e8efc3df

The following commit(s) were added to refs/heads/master by this push:
       new  23c3f35   Cleanup module POMs. Still WIP.
23c3f35 is described below

commit 23c3f353175413cef6c983b384e58124e8efc3df
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Jul 16 12:10:48 2020 +0100

    Cleanup module POMs. Still WIP.
---
 idp-duo-api/pom.xml                                |  59 +++++-
 .../AbstractDuoClientAuthenticationActionTest.java |   2 +-
 idp-duo-distribution/pom.xml                       |  11 +-
 idp-duo-impl/pom.xml                               | 102 ++++++++---
 .../authn/duo/impl/ValidateDuoTokenAudience.java   |   1 -
 idp-duo-native-client-impl/pom.xml                 |  34 +++-
 pom.xml                                            | 198 ++++-----------------
 7 files changed, 192 insertions(+), 215 deletions(-)

diff --git a/idp-duo-api/pom.xml b/idp-duo-api/pom.xml
index b2a152b..8290e28 100644
--- a/idp-duo-api/pom.xml
+++ b/idp-duo-api/pom.xml
@@ -6,24 +6,73 @@
         <artifactId>idp-plugin-duo-parent</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <artifactId>idp-plugin-duo-api</artifactId>
+
+    <artifactId>idp-plugin-${plugin.base}-api</artifactId>
     <name>Shibboleth IdP :: Plugins :: Duo 2FA Login Flow API</name>
+    <description>IdP Duo OIDC 2FA plugin API.</description>
+    <packaging>jar</packaging>
 
     <properties>
-        <automatic.module.name>net.shibboleth.idp.plugin.duo.api</automatic.module.name>
+        <checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
+        <automatic.module.name>net.shibboleth.idp.plugin.${plugin.base}.api</automatic.module.name>
     </properties>
 
 
     <dependencies>
+        <!-- Provided dependencies -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${spring-webflow.groupId}</groupId>
+            <artifactId>spring-webflow</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-profile-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-profile-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-authn-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-messaging-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.shibboleth.utilities</groupId>
+            <artifactId>java-support</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>net.shibboleth.idp</groupId>
             <artifactId>idp-profile-api</artifactId>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
-        
     </dependencies>
 
-
-   
 </project>
\ No newline at end of file
diff --git a/idp-duo-api/src/test/java/net/shbboleth/idp/plugin/authn/duo/AbstractDuoClientAuthenticationActionTest.java b/idp-duo-api/src/test/java/net/shbboleth/idp/plugin/authn/duo/AbstractDuoClientAuthenticationActionTest.java
index 3515e1d..9ca773b 100644
--- a/idp-duo-api/src/test/java/net/shbboleth/idp/plugin/authn/duo/AbstractDuoClientAuthenticationActionTest.java
+++ b/idp-duo-api/src/test/java/net/shbboleth/idp/plugin/authn/duo/AbstractDuoClientAuthenticationActionTest.java
@@ -16,7 +16,7 @@
  */
 package net.shbboleth.idp.plugin.authn.duo;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertThrows;
 import static org.testng.Assert.assertTrue;
diff --git a/idp-duo-distribution/pom.xml b/idp-duo-distribution/pom.xml
index 0e9dfdd..2221a81 100644
--- a/idp-duo-distribution/pom.xml
+++ b/idp-duo-distribution/pom.xml
@@ -1,17 +1,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>net.shibboleth.idp.plugin</groupId>
         <artifactId>idp-plugin-duo-parent</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <artifactId>idp-plugin-duo-dist</artifactId>
+    
+    <artifactId>idp-plugin-${plugin.base}-dist</artifactId>
     <name>Shibboleth IdP :: Plugins :: Duo 2FA Login Flow Distribution</name>
+    <description>IdP Duo OIDC 2FA plugin packaging.</description>
     <packaging>pom</packaging>
 
     <properties>
-        <dist.finalName>shibboleth-idp-plugin-duo-${project.version}</dist.finalName>
+        <checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
+        <dist.finalName>shibboleth-idp-plugin-${plugin.base}-${project.version}</dist.finalName>
     </properties>
 
     <build>
@@ -31,7 +36,7 @@
                 <configuration>
                     <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>
-                        <descriptor>src/main/assembly/duo-assembly.xml</descriptor>
+                        <descriptor>src/main/assembly/${plugin.base}-assembly.xml</descriptor>
                     </descriptors>
                     <finalName>${dist.finalName}</finalName>
                     <tarLongFileMode>gnu</tarLongFileMode>
diff --git a/idp-duo-impl/pom.xml b/idp-duo-impl/pom.xml
index b7c0b6f..caca5a0 100644
--- a/idp-duo-impl/pom.xml
+++ b/idp-duo-impl/pom.xml
@@ -2,48 +2,54 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <name>Shibboleth IdP :: Plugins :: Duo 2FA Login Flow Impl</name>
     <parent>
         <groupId>net.shibboleth.idp.plugin</groupId>
         <artifactId>idp-plugin-duo-parent</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-
-    <artifactId>idp-plugin-duo-impl</artifactId>
+    <name>Shibboleth IdP :: Plugins :: Duo 2FA Login Flow Impl</name>
+    <description>IdP Duo OIDC 2FA plugin implementation.</description>
+    <artifactId>idp-plugin-${plugin.base}-impl</artifactId>
+    <packaging>jar</packaging>
 
     <properties>
-        <automatic.module.name>net.shibboleth.idp.plugin.duo.impl</automatic.module.name>
+        <checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
+        <automatic.module.name>net.shibboleth.idp.plugin.${plugin.base}.impl</automatic.module.name>
         <apache.commons.lang.version>3.10</apache.commons.lang.version>
     </properties>
 
-
-    <!-- TODO: make sure any classes we are using explicitly in our code are directly imported, and not transitively imported 
-        for best practice. -->
     <dependencies>
-
-        <!-- compile time depedencies -->
+        <!-- compile time dependencies -->
         <dependency>
             <groupId>net.shibboleth.idp.plugin</groupId>
             <artifactId>idp-plugin-duo-api</artifactId>
         </dependency>
 
-        <!-- Provided compile time dependencies the project builds against -->
-
-        <dependency> <!-- Provides some lookup strategies -->
+        <!-- Provided dependencies -->
+        <dependency>
             <groupId>${idp.groupId}</groupId>
             <artifactId>idp-session-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>net.shibboleth.ext</groupId>
-            <artifactId>spring-extensions</artifactId>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-authn-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-messaging-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.shibboleth.utilities</groupId>
+            <artifactId>java-support</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -52,28 +58,66 @@
             <version>${apache.commons.lang.version}</version>
             <scope>provided</scope>
         </dependency>
-
-        <!-- Duo client implementation is a runtime dependency that can be swapped out -->
         <dependency>
-            <groupId>net.shibboleth.idp.plugin</groupId>
-            <artifactId>idp-plugin-duo-native-client-impl</artifactId>
-            <scope>runtime</scope>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${spring-webflow.groupId}</groupId>
+            <artifactId>spring-webflow</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-profile-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-beans</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-profile-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Test Dependencies -->
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>       
         <dependency>
             <groupId>net.shibboleth.idp</groupId>
-            <artifactId>idp-profile-impl</artifactId>
+            <artifactId>idp-conf</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>net.shibboleth.idp</groupId>
-            <artifactId>idp-authn-impl</artifactId>
+            <artifactId>idp-profile-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>net.shibboleth.idp</groupId>
-            <artifactId>idp-conf</artifactId>
+            <artifactId>idp-authn-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -82,7 +126,7 @@
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
-        <!-- Spring webflow tests require Junit4 / will junit-vintage-engine help? -->
+        <!-- Spring webflow tests require Junit4, runs in TestNG bridge -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
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 953be95..6ea24c7 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
@@ -70,7 +70,6 @@ public class ValidateDuoTokenAudience extends AbstractDuoAuthenticationAction {
             return false;
         }
         return true;
-
     }
 
     @Override
diff --git a/idp-duo-native-client-impl/pom.xml b/idp-duo-native-client-impl/pom.xml
index 2c2b830..fec26f8 100644
--- a/idp-duo-native-client-impl/pom.xml
+++ b/idp-duo-native-client-impl/pom.xml
@@ -1,33 +1,49 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>net.shibboleth.idp.plugin</groupId>
         <artifactId>idp-plugin-duo-parent</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <artifactId>idp-plugin-duo-native-client-impl</artifactId>
+    
+    <artifactId>idp-plugin-${plugin.base}-native-client-impl</artifactId>
     <name>Shibboleth IdP :: Plugins :: Native Duo SDK implementation</name>
+    <description>IdP Duo OIDC 2FA native Duo SDK implementation.</description>
+    <packaging>jar</packaging>
 
     <properties>
-        <automatic.module.name>net.shibboleth.idp.plugin.duo.sdk.impl</automatic.module.name>
+        <checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
+        <automatic.module.name>net.shibboleth.idp.plugin.${plugin.base}.sdk.impl</automatic.module.name>
     </properties>
 
-    <!-- FIXME: LOTS of unwanted inherited from parent deps!! -->
     <dependencies>
+        <!-- compile dependencies -->
         <dependency>
             <groupId>com.duosecurity</groupId>
-            <artifactId>duo-client</artifactId>      
+            <artifactId>duo-client</artifactId>
         </dependency>
         <dependency>
             <groupId>net.shibboleth.idp.plugin</groupId>
             <artifactId>idp-plugin-duo-api</artifactId>
         </dependency>
-        
-        <!-- provided deps -->
-        <dependency> 
-            <groupId>net.shibboleth.ext</groupId>
-            <artifactId>spring-extensions</artifactId>            
+
+        <!-- provided dependencies -->
+        <dependency>
+            <groupId>net.shibboleth.utilities</groupId>
+            <artifactId>java-support</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency> <!-- required for the DuoIntegration -->
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-authn-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index bb05603..993793b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,44 +1,33 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <!-- TODO: The POM is a mess, and is not yet properly following the current guidance -->
-
     <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>net.shibboleth.idp</groupId>
+        <artifactId>idp-parent</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+    </parent>
+
     <groupId>net.shibboleth.idp.plugin</groupId>
     <artifactId>idp-plugin-duo-parent</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>Shibboleth IdP :: Plugins :: Duo 2FA Login Flow</name>
     <packaging>pom</packaging>
 
-    <properties> <!-- TODO most of these not needed if parent is idp-parent -->
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <maven.compiler.release>11</maven.compiler.release>
-        <shib.idp.version>4.1.0-SNAPSHOT</shib.idp.version>       
-        <opensaml.version>4.0.0</opensaml.version>
-        <opensaml.groupId>org.opensaml</opensaml.groupId>
+    <description>
+        Duo OIDC based 2FA plugin for the Shibboleth IdP.
+    </description>
+
+    <properties>
+        <plugin.base>duo</plugin.base>
         <idp.groupId>net.shibboleth.idp</idp.groupId>
+        <idp.version>4.1.0-SNAPSHOT</idp.version>
         <duo.client.version>1.0-SNAPSHOT</duo.client.version>
-        <slf4j.groupId>org.slf4j</slf4j.groupId>
-        <slf4j.version>1.7.30</slf4j.version>     
-        <spring.groupId>org.springframework</spring.groupId>
-        <java-support.version>8.1.0-SNAPSHOT</java-support.version>
-        <spring-webflow.groupId>org.springframework.webflow</spring-webflow.groupId>
-        <spring-webflow.version>2.5.1.RELEASE</spring-webflow.version>
-        <checkstyle.configLocation>${project.basedir}/../resources/checkstyle.xml</checkstyle.configLocation>
+        <checkstyle.configLocation>${project.basedir}/checkstyle.xml</checkstyle.configLocation>
     </properties>
 
-    <!-- required for general project properties. REMOVED THE PARENT because of surefire-testng conflict -->
-
-    <parent>
-        <groupId>net.shibboleth.idp</groupId>
-        <artifactId>idp-parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-
     <modules>
-        <!-- switch to? <module>idp-plugin-duo-api</module> <module>idp-plugin-duo-impl</module> <module>idp-plugin-duo-native-client-impl</module> 
-            <module>idp-plugin-duo-dist</module> -->
         <module>idp-duo-api</module>
         <module>idp-duo-impl</module>
         <module>idp-duo-native-client-impl</module>
@@ -64,124 +53,13 @@
 
 
     <dependencies>
-
-        <!-- Compile Dependencies provided by the IdP -->
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-profile-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${idp.groupId}</groupId>
-            <artifactId>idp-authn-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-messaging-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.shibboleth.utilities</groupId>
-            <artifactId>java-support</artifactId>
-            <version>${java-support.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${idp.groupId}</groupId>
-            <artifactId>idp-profile-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${slf4j.groupId}</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${slf4j.groupId}</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${spring-webflow.groupId}</groupId>
-            <artifactId>spring-webflow</artifactId> 
-            <version>${spring-webflow.version}</version>    
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>      
-            <scope>provided</scope>
-        </dependency>  
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-
-        <!-- Test Dependencies -->
-
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-test</artifactId>
-        </dependency>
-
-        <!-- FIXME: change SWF to testng? -->
-        <!-- For compatibility with SWF flow tests -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Inline with the inherited IdP testNG for all tests
-        other than the flows tests  -->
+        <!-- Project wide test Dependencies -->          
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <version>7.1.0</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -189,37 +67,29 @@
         </dependency>
     </dependencies>
 
-
-
     <dependencyManagement>
         <dependencies>
-            <!-- IdP BOM when importing IdP deps TODO: this inherits properties from java-parent as well -->
+            <!-- IdP BOM when importing IdP dependencies -->
             <dependency>
                 <groupId>net.shibboleth.idp</groupId>
                 <artifactId>idp-bom</artifactId>
-                <version>${shib.idp.version}</version>
+                <version>${idp.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
-            <!-- OpenSAML BOM when importing opensaml deps -->
+            <!-- Provided support dependencies -->
             <dependency>
-                <groupId>org.opensaml</groupId>
-                <artifactId>opensaml-bom</artifactId>
-                <version>${opensaml.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
+                <groupId>net.shibboleth.utilities</groupId>
+                <artifactId>java-support</artifactId>
+                <version>${java-support.version}</version>
+                <scope>provided</scope>
             </dependency>
-
-
-
-            <!-- Duo dependencies -->
+            <!-- Duo client and plugin dependencies -->
             <dependency>
                 <groupId>com.duosecurity</groupId>
                 <artifactId>duo-client</artifactId>
                 <version>${duo.client.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>net.shibboleth.idp.plugin</groupId>
                 <artifactId>idp-plugin-duo-api</artifactId>
@@ -229,22 +99,16 @@
                 <groupId>net.shibboleth.idp.plugin</groupId>
                 <artifactId>idp-plugin-duo-native-client-impl</artifactId>
                 <version>${project.version}</version>
-            </dependency>
-
-            <!-- test dependencies -->
-
+            </dependency>     
+            <!-- test bom dependencies -->
             <dependency>
-                <groupId>net.shibboleth.idp</groupId>
-                <version>${shib.idp.version}</version>
-                <artifactId>idp-profile-api</artifactId>
-                <type>test-jar</type>
-                <scope>test</scope>
+                <groupId>${idp.groupId}</groupId>
+                <artifactId>idp-tests-bom</artifactId>
+                <version>${idp.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
-
-
         </dependencies>
     </dependencyManagement>
 
-
-
 </project>

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


More information about the commits mailing list