[java-idp-oidc] 02/02: 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-oidc.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=131a79ab33060b54f63149bbc14d0e522b6527b7

commit 131a79ab33060b54f63149bbc14d0e522b6527b7
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Dec 11 15:44:12 2021 +0000

    Move enforcer up to V3
    
    1) Remove keyrings
    2) Add shibbolethKeys.gpg
    3) Add dependency checking
    4) Add optional M2 Checking
---
 idp-oidc-extension-distribution/pom.xml                 |  14 ++++++++++----
 .../src/main/enforcer/keyRings/com.google.code.gson.gpg | Bin 1238 -> 0 bytes
 .../src/main/enforcer/shibKeys.gpg                      | Bin 0 -> 55209 bytes
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/idp-oidc-extension-distribution/pom.xml b/idp-oidc-extension-distribution/pom.xml
index 378e5a8c..2ab40f1f 100644
--- a/idp-oidc-extension-distribution/pom.xml
+++ b/idp-oidc-extension-distribution/pom.xml
@@ -19,6 +19,7 @@
         <checkstyle.configLocation>${project.basedir}/../resources/checkstyle.xml</checkstyle.configLocation>
         <automatic.module.name>net.shibboleth.idp.plugin.oidc.op.distribution</automatic.module.name>
         <dist.finalName>shibboleth-idp-plugin-oidc-op-${project.version}</dist.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-oidc-extension-impl/target/dependency</jarDirs>
+                                    <zipFiles>${project.build.directory}/${dist.finalName}.zip</zipFiles>
+                                    <tgzFiles>${project.build.directory}/${dist.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-oidc-extension-distribution/src/main/enforcer/keyRings/com.google.code.gson.gpg b/idp-oidc-extension-distribution/src/main/enforcer/keyRings/com.google.code.gson.gpg
deleted file mode 100644
index 26a851fd..00000000
Binary files a/idp-oidc-extension-distribution/src/main/enforcer/keyRings/com.google.code.gson.gpg and /dev/null differ
diff --git a/idp-oidc-extension-distribution/src/main/enforcer/shibKeys.gpg b/idp-oidc-extension-distribution/src/main/enforcer/shibKeys.gpg
new file mode 100644
index 00000000..6669d1ef
Binary files /dev/null and b/idp-oidc-extension-distribution/src/main/enforcer/shibKeys.gpg differ

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