[java-identity-provider] 01/02: IDP-1595 Add required jars to distribution

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

commit 6b09d4f13a9e4e9c46bb3524ff82013650f2a1c4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Aug 18 16:06:19 2020 +0100

    IDP-1595 Add required jars to distribution
    
    https://issues.shibboleth.net/jira/browse/IDP-1595
    
    The plugin installer needs Apache commons compress and Bouncy castle
    gpg support placed into bin.
---
 idp-distribution/pom.xml | 24 ++++++++++++++++++++++++
 idp-installer/pom.xml    | 45 ++++++++++++++++++++++++++++++---------------
 2 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/idp-distribution/pom.xml b/idp-distribution/pom.xml
index c59b75968..6b1e99629 100644
--- a/idp-distribution/pom.xml
+++ b/idp-distribution/pom.xml
@@ -47,6 +47,22 @@
             <optional>true</optional>
             <scope>runtime</scope>
         </dependency>
+
+        <!--  For the installers -->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpg-jdk15on</artifactId>
+            <version>${bouncycastle.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-compress</artifactId>
+          <version>${commons.compress.version}</version>
+          <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
@@ -173,6 +189,14 @@
                                     <groupId>org.bouncycastle</groupId>
                                     <artifactId>bcpkix-jdk15on</artifactId>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.bouncycastle</groupId>
+                                    <artifactId>bcpg-jdk15on</artifactId>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.commons</groupId>
+                                    <artifactId>commons-compress</artifactId>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.ant</groupId>
                                     <artifactId>ant</artifactId>
diff --git a/idp-installer/pom.xml b/idp-installer/pom.xml
index b36718a5a..d373bb23d 100644
--- a/idp-installer/pom.xml
+++ b/idp-installer/pom.xml
@@ -21,121 +21,136 @@
     </properties>
 
     <dependencies>
-        <!-- Compile Dependencies -->
-        <dependency>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-compress</artifactId>
-          <version>1.20</version>
-        </dependency>
-        
+        <!-- Provided Dependencies - All dependencies are provided, reflecting the fact that
+             IdP Distribution has to pull them together and all the installer stuff has a carefully
+             constructed classpath. -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-core</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-admin-api</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-admin-impl</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-saml-api</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-profile-spring</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.shibboleth.ext</groupId>
             <artifactId>spring-extensions</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.shibboleth.utilities</groupId>
             <artifactId>java-support</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
-            <scope>compile</scope><!-- normally runtime -->
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-saml-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-xmlsec-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
-            <scope>compile</scope><!-- normally runtime -->
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant-launcher</artifactId>
-            <scope>compile</scope><!-- normally runtime -->
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-context</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpg-jdk15on</artifactId>
             <version>${bouncycastle.version}</version>
+            <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
+            <scope>provided</scope>
 	   </dependency>
 
        <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Provided Dependencies -->
-
-        <!-- Runtime Dependencies -->
-
+        <dependency>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-compress</artifactId>
+          <version>${commons.compress.version}</version>
+          <scope>provided</scope>
+        </dependency>
+        
         <!-- Test Dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>

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