[java-idp-plugin-duo] branch main updated: Move enforcer up to V3

[Rod Widdowson]

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

rdw 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=614e770e0d69d22a71fb2c72135abcd715cdc841

The following commit(s) were added to refs/heads/main by this push:
     new 614e770  Move enforcer up to V3
614e770 is described below

commit 614e770e0d69d22a71fb2c72135abcd715cdc841
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Dec 11 16:48:06 2021 +0000

    Move enforcer up to V3
    
        1) Remove keyrings
        2) Add shibbolethKeys.gpg
        3) Add dependency checking
        4) Add optional M2 Checking
---
 idp-duo-nimbus-distribution/pom.xml                     |  14 ++++++++++----
 .../src/main/enforcer/shibbolethKeys.gpg                | Bin 0 -> 55209 bytes
 idp-duo-sdk-distribution/pom.xml                        |  14 ++++++++++----
 .../src/main/enforcer/shibbolethKeys.gpg                | Bin 0 -> 55209 bytes
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/idp-duo-nimbus-distribution/pom.xml b/idp-duo-nimbus-distribution/pom.xml
index ab4c00a..8dec56c 100644
--- a/idp-duo-nimbus-distribution/pom.xml
+++ b/idp-duo-nimbus-distribution/pom.xml
@@ -17,6 +17,7 @@
     <properties>
         <checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
         <dist.nimbus.finalName>shibboleth-idp-plugin-duo-nimbus-${project.version}</dist.nimbus.finalName>
+        <net.shibboleth.maven.enforcer.rules.checkM2>false</net.shibboleth.maven.enforcer.rules.checkM2>
     </properties>
 
     <build>
@@ -51,7 +52,7 @@
                     <dependency>
                         <groupId>net.shibboleth.maven.enforcer.rules</groupId>
                         <artifactId>maven-dist-enforcer</artifactId>
-                        <version>2.0.0</version>
+                        <version>3.0.0</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -64,12 +65,17 @@
                         <configuration>
                             <rules>
                                 <jarEnforcer implementation="net.shibboleth.mvn.enforcer.impl.JarEnforcer">
-                                    <enforcerData>${basedir}/src/main/enforcer</enforcerData>
+                                    <dataGroupId>net.shibboleth.maven.enforcer.rules</dataGroupId>
+                                    <dataArtifactId>maven-dist-enforcer-data</dataArtifactId>
+                                    <dataVersion>1.0.0-SNAPSHOT</dataVersion>
+                                    <dataKeyRing>${basedir}/src/main/enforcer/shibbolethKeys.gpg</dataKeyRing>
                                     <parentPomDir>${basedir}/..</parentPomDir>
-                                    <jarDirs>${basedir}/../idp-duo-nimbus-client-impl/target/dependency</jarDirs>
+                                    <zipFiles>${project.build.directory}/${dist.nimbus.finalName}.zip</zipFiles>
+                                    <tgzFiles>${project.build.directory}/${dist.nimbus.finalName}.tar.gz</tgzFiles>
                                     <checkSignatures>true</checkSignatures>
-                                    <checkDependencies>false</checkDependencies>
+                                    <checkDependencies>true</checkDependencies>
                                     <listJarSources>false</listJarSources>
+                                    <checkM2>${net.shibboleth.maven.enforcer.rules.checkM2}</checkM2>
                                 </jarEnforcer>
                             </rules>
                         </configuration>
diff --git a/idp-duo-nimbus-distribution/src/main/enforcer/shibbolethKeys.gpg b/idp-duo-nimbus-distribution/src/main/enforcer/shibbolethKeys.gpg
new file mode 100644
index 0000000..6669d1e
Binary files /dev/null and b/idp-duo-nimbus-distribution/src/main/enforcer/shibbolethKeys.gpg differ
diff --git a/idp-duo-sdk-distribution/pom.xml b/idp-duo-sdk-distribution/pom.xml
index c17b788..88cfa5d 100644
--- a/idp-duo-sdk-distribution/pom.xml
+++ b/idp-duo-sdk-distribution/pom.xml
@@ -17,6 +17,7 @@
     <properties>
         <checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
         <dist.duosdk.finalName>shibboleth-idp-plugin-duo-native-sdk-${project.version}</dist.duosdk.finalName>
+        <net.shibboleth.maven.enforcer.rules.checkM2>false</net.shibboleth.maven.enforcer.rules.checkM2>
     </properties>
 
     <build>
@@ -51,7 +52,7 @@
                     <dependency>
                         <groupId>net.shibboleth.maven.enforcer.rules</groupId>
                         <artifactId>maven-dist-enforcer</artifactId>
-                        <version>2.0.0</version>
+                        <version>3.0.0</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -64,12 +65,17 @@
                         <configuration>
                             <rules>
                                 <jarEnforcer implementation="net.shibboleth.mvn.enforcer.impl.JarEnforcer">
-                                    <enforcerData>${basedir}/src/main/enforcer</enforcerData>
+                                    <dataGroupId>net.shibboleth.maven.enforcer.rules</dataGroupId>
+                                    <dataArtifactId>maven-dist-enforcer-data</dataArtifactId>
+                                    <dataVersion>1.0.0-SNAPSHOT</dataVersion>
+                                    <dataKeyRing>${basedir}/src/main/enforcer/shibbolethKeys.gpg</dataKeyRing>
                                     <parentPomDir>${basedir}/..</parentPomDir>
-                                    <jarDirs>${basedir}/../idp-duo-sdk-client-impl/target/dependency</jarDirs>
+                                    <zipFiles>${project.build.directory}/${dist.duosdk.finalName}.zip</zipFiles>
+                                    <tgzFiles>${project.build.directory}/${dist.duosdk.finalName}.tar.gz</tgzFiles>
                                     <checkSignatures>true</checkSignatures>
-                                    <checkDependencies>false</checkDependencies>
+                                    <checkDependencies>true</checkDependencies>
                                     <listJarSources>false</listJarSources>
+                                    <checkM2>${net.shibboleth.maven.enforcer.rules.checkM2}</checkM2>
                                 </jarEnforcer>
                             </rules>
                         </configuration>
diff --git a/idp-duo-sdk-distribution/src/main/enforcer/shibbolethKeys.gpg b/idp-duo-sdk-distribution/src/main/enforcer/shibbolethKeys.gpg
new file mode 100644
index 0000000..6669d1e
Binary files /dev/null and b/idp-duo-sdk-distribution/src/main/enforcer/shibbolethKeys.gpg differ

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