[java-oidc-common] 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-oidc-common.

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

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

commit af6850d7d84198a41aca3b77772102a84e5c1aa2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Dec 14 20:20:17 2021 +0000

    Move enforcer up to V3
    
        1) Remove keyrings
        2) Add shibbolethKeys.gpg
        3) Add dependency checking
        4) Add optional M2 Checking
---
 oidc-common-dist/pom.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/oidc-common-dist/pom.xml b/oidc-common-dist/pom.xml
index d6c0fbb..11875a3 100644
--- a/oidc-common-dist/pom.xml
+++ b/oidc-common-dist/pom.xml
@@ -17,6 +17,7 @@
         <checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
         <dist.finalName>shibboleth-idp-plugin-oidc-common-${project.version}</dist.finalName>
         <dist.assemblyDirectory>${project.build.directory}/${dist.finalName}</dist.assemblyDirectory>
+        <net.shibboleth.maven.enforcer.rules.checkM2>false</net.shibboleth.maven.enforcer.rules.checkM2>
     </properties>
 
     <build>
@@ -72,7 +73,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>
@@ -85,12 +86,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/shibKeys.gpg</dataKeyRing>
                                     <parentPomDir>${basedir}/..</parentPomDir>
-                                    <jarDirs>${basedir}/../oidc-common-attribute-api/target/dependency {basedir}/../oidc-common-attribute-impl/target/dependency ${basedir}/../oidc-common-crypto-api/target/dependency ${basedir}/../oidc-common-crypto-impl/target/dependency ${basedir}/../oidc-common-metadata-api/target/dependency ${basedir}/../oidc-common-metadata-impl/target/dependency  ${basedir}/../oidc-common-saml-api/target/dependency  ${basedir}/../oidc-common-saml/target/dependency</ [...]
+                                    <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>

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