[java-identity-provider] 01/03: IDP-1860 Same Jars in bin/lib and bin/webapp/WEB-INF/lib

[Rod Widdowson]

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

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

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

commit 6c1bf4de8b3b1c398c9171aba39ebe71d01cd078
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Sep 20 16:46:25 2021 +0100

    IDP-1860 Same Jars in bin/lib and bin/webapp/WEB-INF/lib
    
    https://shibboleth.atlassian.net/browse/IDP-1860
    
    Remove bcpkix-jdk15on from lib/bin
    Remove jcommander from dist/webapp/WEB-INF/lib
---
 idp-admin-impl/pom.xml   | 5 +++++
 idp-core/pom.xml         | 9 +++++----
 idp-distribution/pom.xml | 6 +-----
 idp-installer/pom.xml    | 6 ++++++
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/idp-admin-impl/pom.xml b/idp-admin-impl/pom.xml
index 8ab965ec0..9293f3583 100644
--- a/idp-admin-impl/pom.xml
+++ b/idp-admin-impl/pom.xml
@@ -131,6 +131,11 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>jcommander</artifactId>
+	    <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <!--  Only used in a command line --> 
diff --git a/idp-core/pom.xml b/idp-core/pom.xml
index 62c3a877c..14b60a064 100644
--- a/idp-core/pom.xml
+++ b/idp-core/pom.xml
@@ -22,10 +22,6 @@
 
     <dependencies>
         <!-- Compile Dependencies -->
-        <dependency>
-            <groupId>com.beust</groupId>
-            <artifactId>jcommander</artifactId>
-        </dependency>
         <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-core</artifactId>
@@ -109,6 +105,11 @@
             <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>jcommander</artifactId>
+	    <scope>provided</scope>
+        </dependency>
 
         <!-- Runtime Dependencies -->
 
diff --git a/idp-distribution/pom.xml b/idp-distribution/pom.xml
index 84237d22a..6acc79bdc 100644
--- a/idp-distribution/pom.xml
+++ b/idp-distribution/pom.xml
@@ -38,7 +38,7 @@
             <groupId>com.beust</groupId>
             <artifactId>jcommander</artifactId>
             <optional>true</optional>
-            <scope>runtime</scope>
+            <scope>provided</scope>
         </dependency>
         <!-- Required if you're using classes from the security package. -->
         <dependency>
@@ -183,10 +183,6 @@
                                     <groupId>com.beust</groupId>
                                     <artifactId>jcommander</artifactId>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.bouncycastle</groupId>
-                                    <artifactId>bcpkix-jdk15on</artifactId>
-                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.bouncycastle</groupId>
                                     <artifactId>bcpg-jdk15on</artifactId>
diff --git a/idp-installer/pom.xml b/idp-installer/pom.xml
index 36ee167e2..65fba1e1a 100644
--- a/idp-installer/pom.xml
+++ b/idp-installer/pom.xml
@@ -30,6 +30,7 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-admin-api</artifactId>
@@ -68,6 +69,11 @@
             <artifactId>logback-core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>jcommander</artifactId>
+	    <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>${opensaml.groupId}</groupId>

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