From 53f3bbd32d6c588b2a4abd80d2e2c5ce6c20b76b Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
Date: Fri, 18 Sep 2020 06:25:04 +1000
Subject: [PATCH] upgrade ant dependencies version to 1.10.8 to avoid security
 warning (#5275)

* upgrade ant dependency version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* ant 1.10.8
---
 jetty-ant/pom.xml               |  6 ++----
 jetty-jspc-maven-plugin/pom.xml |  1 -
 pom.xml                         | 11 +++++++++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml
index fd2a7ea4ae9..1bd543e8da4 100644
--- a/jetty-ant/pom.xml
+++ b/jetty-ant/pom.xml
@@ -49,14 +49,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.6.5</version>
     </dependency>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant-launcher</artifactId>
-      <version>1.6.5</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml
index 85eea01ff95..a5d5d6b0d8e 100644
--- a/jetty-jspc-maven-plugin/pom.xml
+++ b/jetty-jspc-maven-plugin/pom.xml
@@ -109,7 +109,6 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.4</version>
     </dependency>
   </dependencies>
   <reporting>
diff --git a/pom.xml b/pom.xml
index 976d20814e3..4ef4e2b6cdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
     <javax.servlet.api.version>3.1.0</javax.servlet.api.version>
     <weld.version>3.1.3.Final</weld.version>
     <jetty.perf-helper.version>1.0.5</jetty.perf-helper.version>
+    <ant.version>1.10.8</ant.version>
     <unix.socket.tmp></unix.socket.tmp>
     <!-- enable or not TestTracker junit5 extension i.e log message when test method is starting -->
     <jetty.testtracker.log>false</jetty.testtracker.log>
@@ -1146,6 +1147,16 @@
         <artifactId>grpc-core</artifactId>
         <version>1.0.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant</artifactId>
+        <version>${ant.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant-launcher</artifactId>
+        <version>${ant.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>