[java-identity-provider] 03/05: IDP-2012 New (maven) Module idp-cli

[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=6b604a1ba6434be46b3ca7af4b498803ae29449c

commit 6b604a1ba6434be46b3ca7af4b498803ae29449c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Sep 24 15:53:43 2022 +0100

    IDP-2012 New (maven) Module idp-cli
    
    https://shibboleth.atlassian.net/browse/IDP-2012
    
    Move some classes from idp-core into idp-cli
    
    Remove shib-cli from the war file and add to distribution.
    This allows us to turn on dependency checking, although
    sig checking of the distributed asrtifact is still off
    pending spring-webflow getting signed.
---
 idp-distribution/pom.xml | 18 +++++++++++++-----
 idp-war/pom.xml          |  4 ----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/idp-distribution/pom.xml b/idp-distribution/pom.xml
index 916f7589e..8723c4421 100644
--- a/idp-distribution/pom.xml
+++ b/idp-distribution/pom.xml
@@ -39,6 +39,11 @@
             <version>${project.version}</version>
         </dependency>
 
+	<dependency>
+            <groupId>${shib-shared.groupId}</groupId>
+            <artifactId>shib-cli</artifactId>
+        </dependency>
+
         <!-- Required if using classes with command line support. -->
         <dependency>
             <groupId>com.beust</groupId>
@@ -46,7 +51,7 @@
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>
-        <!-- Required if you're using classes from the security package. -->
+        <!-- Required if you're using casses from the security package. -->
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
@@ -185,6 +190,10 @@
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>idp-cli</artifactId>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>${shib-shared.groupId}</groupId>
+                                    <artifactId>shib-cli</artifactId>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>idp-installer</artifactId>
@@ -256,7 +265,6 @@
                     <tarLongFileMode>gnu</tarLongFileMode>
                 </configuration>
             </plugin>
-<!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -284,9 +292,10 @@
                                     <parentPomDir>${basedir}/../idp-parent</parentPomDir>
                                     <zipFiles>${project.build.directory}/${idp.finalName}.zip</zipFiles>
                                     <tgzFiles>${project.build.directory}/${idp.finalName}.tar.gz</tgzFiles>
-                                    <checkSignatures>true</checkSignatures>
+                                    <checkSignatures>false</checkSignatures>
                                     <checkDependencies>true</checkDependencies>
-				    <compileRuntimeArtifactFatal>false</compileRuntimeArtifactFatal>
+                                    <compileRuntimeArtifactFatal>false</compileRuntimeArtifactFatal>
+                                    <versionExtensions>-SNAPSHOT -GA -jre -empty-to-avoid-conflict-with-guava -M6</versionExtensions>
                                     <listJarSources>false</listJarSources>
                                     <checkM2>false</checkM2>
                                 </jarEnforcer>
@@ -295,7 +304,6 @@
                     </execution>
                 </executions>
             </plugin>
--->
         </plugins>
     </build>
 </project>
diff --git a/idp-war/pom.xml b/idp-war/pom.xml
index 5001491b8..67d561d43 100644
--- a/idp-war/pom.xml
+++ b/idp-war/pom.xml
@@ -230,10 +230,6 @@
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-xmlsec-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${shib-shared.groupId}</groupId>
-            <artifactId>shib-cli</artifactId>
-        </dependency>
         <dependency>
             <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-networking</artifactId>

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