[java-identity-provider] 02/02: JPAR-182 Check our Distributions for consistency

[Rod Widdowson]

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

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=cb647cb2c19ec6a87a1f5943bb8e1668aa1bab48

commit cb647cb2c19ec6a87a1f5943bb8e1668aa1bab48
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Sep 26 13:09:59 2021 +0100

    JPAR-182 Check our Distributions for consistency
    
    https://shibboleth.atlassian.net/browse/JPAR-182
    
    Re-enable the enforcer with the bugs fixed and new features added.
---
 idp-distribution/pom.xml                           | 17 +++++++-------
 .../src/main/enforcer/artifactMap.properties       | 26 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/idp-distribution/pom.xml b/idp-distribution/pom.xml
index 329abc8ec..3c44ce42b 100644
--- a/idp-distribution/pom.xml
+++ b/idp-distribution/pom.xml
@@ -250,10 +250,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <dependencies>
-		    <dependency>
-			<groupId>net.shibboleth.maven.enforcer.rules</groupId>
-			<artifactId>maven-dist-enforcer</artifactId>
-			<version>1.0.0</version>
+                    <dependency>
+                        <groupId>net.shibboleth.maven.enforcer.rules</groupId>
+                        <artifactId>maven-dist-enforcer</artifactId>
+                        <version>2.0.0</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -265,14 +265,15 @@
                         </goals>
                         <configuration>
                             <rules>
-                                <idpEnforcer implementation="net.shibboleth.idp.enforcer.impl.IdPEnforcer">
-				    <enforcerData>${basedir}/src/main/enforcer</enforcerData>
-                                    <parentPomDir>../idp-parent</parentPomDir>
+                                <jarEnforcer implementation="net.shibboleth.mvn.enforcer.impl.JarEnforcer">
+                                    <enforcerData>${basedir}/src/main/enforcer</enforcerData>
+                                    <parentPomDir>${basedir}/../idp-parent</parentPomDir>
                                     <jarDirs>${project.build.directory}/${idp.finalName}/bin/lib ${project.build.directory}/${idp.finalName}/webapp/WEB-INF/lib</jarDirs>
                                     <checkSignatures>true</checkSignatures>
                                     <checkDependencies>true</checkDependencies>
                                     <listJarSources>false</listJarSources>
-                                </idpEnforcer>
+                                    <artifactMap>${basedir}/src/main/enforcer/artifactMap.properties</artifactMap>
+                                </jarEnforcer>
                             </rules>
                         </configuration>
                     </execution>
diff --git a/idp-distribution/src/main/enforcer/artifactMap.properties b/idp-distribution/src/main/enforcer/artifactMap.properties
new file mode 100644
index 000000000..04dd54674
--- /dev/null
+++ b/idp-distribution/src/main/enforcer/artifactMap.properties
@@ -0,0 +1,26 @@
+annotations=org.jetbrains
+antlr=antlr
+byte-buddy=net.bytebuddy
+checker-qual=org.checkerframework
+classmate=com.fasterxml
+commons-cli=commons-cli
+commons-compiler=org.codehaus.janino
+commons-lang3=org.apache.commons
+commons-pool2=org.apache.commons
+dom4j=org.dom4j
+error_prone_annotations=com.google.errorprone
+failureaccess=com.google.guava
+hibernate-commons-annotations=org.hibernate.common
+istack-commons-runtime=com.sun.istack
+j2objc-annotations=com.google.j2objc
+jandex=org.jboss
+jboss-logging=org.jboss.logging
+jboss-transaction-api_1.2_spec=org.jboss.spec.javax.transaction
+javassist=org.javassist
+javax.persistence-api=javax.persistence
+listenablefuture=com.google.guava
+spymemcached=net.spy
+spring-binding=org.springframework.webflow
+stax2-api=org.codehaus.woodstox
+txw2=org.glassfish.jaxb
+woodstox-core=com.fasterxml.woodstox

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