[activemq] branch main updated: [AMQ-8513] Upgrade to ant 1.10.12

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/main by this push:
     new 7e21fa011 [AMQ-8513] Upgrade to ant 1.10.12
     new 89b7e9dbf Merge pull request #782 from jbonofre/AMQ-8513
7e21fa011 is described below

commit 7e21fa01106554a49ff90024b3ab89cf0ff08e6c
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Thu Feb 24 15:57:17 2022 +0100

    [AMQ-8513] Upgrade to ant 1.10.12
---
 activemq-openwire-generator/pom.xml | 9 +++++++--
 pom.xml                             | 7 +++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/activemq-openwire-generator/pom.xml 
b/activemq-openwire-generator/pom.xml
index 844198fe2..a33e30a0d 100644
--- a/activemq-openwire-generator/pom.xml
+++ b/activemq-openwire-generator/pom.xml
@@ -33,6 +33,12 @@
       <groupId>groovy</groupId>
       <artifactId>gram</artifactId>
       <version>1.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>ant</groupId>
+          <artifactId>ant</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>groovy</groupId>
@@ -44,9 +50,8 @@
       <artifactId>annogen</artifactId>
     </dependency>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.6.2</version>
     </dependency>
   </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 231fec7b5..33f6cc18f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
     <activemq-protobuf-version>1.1</activemq-protobuf-version>
     <activesoap-version>1.3</activesoap-version>
     <annogen-version>0.1.0</annogen-version>
+    <ant-version>1.10.12</ant-version>
     <aries-version>1.1.0</aries-version>
     <axion-version>1.0-M3-dev</axion-version>
     <camel-version>2.25.4</camel-version>
@@ -445,6 +446,12 @@
       <!-- Required dependencies -->
       <!-- =============================== -->
 
+      <dependency>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant</artifactId>
+        <version>${ant-version}</version>
+      </dependency>
+
       <dependency>
         <groupId>jakarta.jms</groupId>
         <artifactId>jakarta.jms-api</artifactId>