[java-identity-provider] 01/03: IDP-1465 - Centralise ant dependency management

[Ian Young]

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

iay pushed a commit to branch master
in repository java-identity-provider.

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

commit dbddd5abd46f348c1b74ec7d10bd66cd9d5d52ec
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Wed Jan 29 15:26:25 2020 +0000

    IDP-1465 - Centralise ant dependency management
    
    https://issues.shibboleth.net/jira/browse/IDP-1465
---
 idp-distribution/pom.xml |  3 ---
 idp-installer/pom.xml    |  7 ++++++-
 idp-parent/pom.xml       | 13 +++++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/idp-distribution/pom.xml b/idp-distribution/pom.xml
index 81cfe22..28ad6ba 100644
--- a/idp-distribution/pom.xml
+++ b/idp-distribution/pom.xml
@@ -19,7 +19,6 @@
     <properties>
         <idp.finalName>shibboleth-identity-provider-${project.version}</idp.finalName>
         <idp.assemblyDirectory>${project.build.directory}/${idp.finalName}</idp.assemblyDirectory>
-        <ant.version>1.10.7</ant.version>
     </properties>
 
     <dependencies>
@@ -51,13 +50,11 @@
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
-            <version>${ant.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant-launcher</artifactId>
-            <version>${ant.version}</version>
             <scope>runtime</scope>
         </dependency>
         <!-- Logging dependencies, per JPAR-57. -->
diff --git a/idp-installer/pom.xml b/idp-installer/pom.xml
index 350fd0b..a0e2974 100644
--- a/idp-installer/pom.xml
+++ b/idp-installer/pom.xml
@@ -60,7 +60,12 @@
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
-            <version>1.9.4</version>
+            <scope>compile</scope><!-- normally runtime -->
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant-launcher</artifactId>
+            <scope>compile</scope><!-- normally runtime -->
         </dependency>
         
         <dependency>
diff --git a/idp-parent/pom.xml b/idp-parent/pom.xml
index 0415616..70d6af8 100644
--- a/idp-parent/pom.xml
+++ b/idp-parent/pom.xml
@@ -66,6 +66,7 @@
     </modules>
 
     <properties>
+        <ant.version>1.10.7</ant.version>
         <duoweb.version>1.3</duoweb.version>
         <u2flib.version>0.16.0</u2flib.version>
         <cas-client.version>3.5.1</cas-client.version>
@@ -222,6 +223,18 @@
             <!-- Provided Dependencies -->
 
             <!-- Runtime Dependencies -->
+            <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant</artifactId>
+                <version>${ant.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-launcher</artifactId>
+                <version>${ant.version}</version>
+                <scope>runtime</scope>
+            </dependency>
 
             <!-- Test Dependencies -->
             <dependency>

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