[java-idp-plugin-scripting] 01/02: Move to V3 enforcer
Rod Widdowson
rdw at steadingsoftware.com
Tue Dec 14 20:13:29 UTC 2021
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-idp-plugin-scripting.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-scripting.git;a=commit;h=50cdba91848cbd76671ab57a90e6c6798bbe85cb
commit 50cdba91848cbd76671ab57a90e6c6798bbe85cb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Dec 12 11:46:52 2021 +0000
Move to V3 enforcer
1) Remove keyrings
2) Add shibbolethKeys.gpg
3) Add dependency checking
4) Add optional M2 Checking
---
nashorn-graalvm-dist/pom.xml | 16 +++++++++++-----
.../src/main/enforcer/shibbolethKeys.gpg | Bin 0 -> 55209 bytes
nashorn-jdk-dist/pom.xml | 14 ++++++++++----
nashorn-jdk-dist/src/main/enforcer/shibbolethKeys.gpg | Bin 0 -> 55209 bytes
rhino-dist/pom.xml | 16 +++++++++++-----
rhino-dist/src/main/enforcer/shibbolethKeys.gpg | Bin 0 -> 55209 bytes
6 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/nashorn-graalvm-dist/pom.xml b/nashorn-graalvm-dist/pom.xml
index 361b14b..228e4f7 100644
--- a/nashorn-graalvm-dist/pom.xml
+++ b/nashorn-graalvm-dist/pom.xml
@@ -21,6 +21,7 @@
<properties>
<checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
<nashorn.finalName>shibboleth-idp-plugin-nashorn-graalvm-${project.version}</nashorn.finalName>
+ <net.shibboleth.maven.enforcer.rules.checkM2>false</net.shibboleth.maven.enforcer.rules.checkM2>
</properties>
<build>
@@ -54,7 +55,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>
@@ -67,13 +68,18 @@
<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}/../nashorn-graalvm-impl/target/dependency</jarDirs>
+ <zipFiles>${project.build.directory}/${nashorn.finalName}.zip</zipFiles>
+ <tgzFiles>${project.build.directory}/${nashorn.finalName}.tar.gz</tgzFiles>
<checkSignatures>true</checkSignatures>
- <checkDependencies>false</checkDependencies>
+ <checkDependencies>true</checkDependencies>
<listJarSources>false</listJarSources>
- </jarEnforcer>
+ <checkM2>${net.shibboleth.maven.enforcer.rules.checkM2}</checkM2>
+ </jarEnforcer>
</rules>
</configuration>
</execution>
diff --git a/nashorn-graalvm-dist/src/main/enforcer/shibbolethKeys.gpg b/nashorn-graalvm-dist/src/main/enforcer/shibbolethKeys.gpg
new file mode 100644
index 0000000..6669d1e
Binary files /dev/null and b/nashorn-graalvm-dist/src/main/enforcer/shibbolethKeys.gpg differ
diff --git a/nashorn-jdk-dist/pom.xml b/nashorn-jdk-dist/pom.xml
index 83e049a..c67a6df 100644
--- a/nashorn-jdk-dist/pom.xml
+++ b/nashorn-jdk-dist/pom.xml
@@ -21,6 +21,7 @@
<properties>
<checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
<nashorn.finalName>shibboleth-idp-plugin-nashorn-jdk-${project.version}</nashorn.finalName>
+ <net.shibboleth.maven.enforcer.rules.checkM2>false</net.shibboleth.maven.enforcer.rules.checkM2>
</properties>
<build>
@@ -54,7 +55,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>
@@ -67,12 +68,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}/../nashorn-jdk-impl/target/dependency</jarDirs>
+ <zipFiles>${project.build.directory}/${nashorn.finalName}.zip</zipFiles>
+ <tgzFiles>${project.build.directory}/${nashorn.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/nashorn-jdk-dist/src/main/enforcer/shibbolethKeys.gpg b/nashorn-jdk-dist/src/main/enforcer/shibbolethKeys.gpg
new file mode 100644
index 0000000..6669d1e
Binary files /dev/null and b/nashorn-jdk-dist/src/main/enforcer/shibbolethKeys.gpg differ
diff --git a/rhino-dist/pom.xml b/rhino-dist/pom.xml
index 3f6ea27..6b24ee0 100644
--- a/rhino-dist/pom.xml
+++ b/rhino-dist/pom.xml
@@ -21,6 +21,7 @@
<properties>
<checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
<dist.finalName>shibboleth-idp-plugin-rhino-${project.version}</dist.finalName>
+ <net.shibboleth.maven.enforcer.rules.checkM2>false</net.shibboleth.maven.enforcer.rules.checkM2>
</properties>
<build>
@@ -54,7 +55,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>
@@ -67,13 +68,18 @@
<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}/../rhino-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>
- </jarEnforcer>
+ <checkM2>${net.shibboleth.maven.enforcer.rules.checkM2}</checkM2>
+ </jarEnforcer>
</rules>
</configuration>
</execution>
diff --git a/rhino-dist/src/main/enforcer/shibbolethKeys.gpg b/rhino-dist/src/main/enforcer/shibbolethKeys.gpg
new file mode 100644
index 0000000..6669d1e
Binary files /dev/null and b/rhino-dist/src/main/enforcer/shibbolethKeys.gpg differ
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list