You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2022/04/19 07:40:02 UTC
[nifi] branch main updated: NIFI-9933 Upgraded Apache Ant to 1.10.12
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 876e16f6a8 NIFI-9933 Upgraded Apache Ant to 1.10.12
876e16f6a8 is described below
commit 876e16f6a8e356d136d6d3a8cd6c48ee9c9f4566
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Mon Apr 18 14:11:40 2022 -0500
NIFI-9933 Upgraded Apache Ant to 1.10.12
- Upgraded nifi-groovyx-nar
- Upgraded nifi-scripting-nar
- Upgraded nifi-toolkit-admin
- Upgraded nifi-toolkit-encrypt-config
- Upgraded multiple nifi-hive modules
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #5973.
---
.../nifi-groovyx-bundle/nifi-groovyx-nar/pom.xml | 17 +++++++++++++++++
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 6 ++++++
.../nifi-scripting-bundle/nifi-scripting-nar/pom.xml | 17 +++++++++++++++++
nifi-toolkit/nifi-toolkit-admin/pom.xml | 4 ++++
nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml | 4 ++++
5 files changed, 48 insertions(+)
diff --git a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-nar/pom.xml b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-nar/pom.xml
index 0161c52280..9e95563246 100644
--- a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-nar/pom.xml
@@ -27,6 +27,7 @@
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
<source.skip>true</source.skip>
+ <ant.version>1.10.12</ant.version>
</properties>
<dependencies>
@@ -60,8 +61,24 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-testng</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <!-- Override ant from groovy-ant -->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <!-- Override ant from groovy-ant -->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-antlr</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
index d917e93e3e..392cc1ed5d 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -102,6 +102,12 @@
<artifactId>zookeeper</artifactId>
<version>3.4.14</version>
</dependency>
+ <!-- Override ant -->
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.10.12</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/pom.xml
index a871f96a79..7a64437c93 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/pom.xml
@@ -27,6 +27,7 @@
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
<source.skip>true</source.skip>
+ <ant.version>1.10.12</ant.version>
</properties>
<dependencies>
@@ -68,7 +69,23 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-testng</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <!-- Override ant from groovy-ant -->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <!-- Override ant from groovy-ant -->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-antlr</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/nifi-toolkit/nifi-toolkit-admin/pom.xml b/nifi-toolkit/nifi-toolkit-admin/pom.xml
index 6d7c9f3b5b..851465851d 100644
--- a/nifi-toolkit/nifi-toolkit-admin/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-admin/pom.xml
@@ -158,6 +158,10 @@ language governing permissions and limitations under the License. -->
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-groovysh</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
index 51272abca5..306e4516e7 100644
--- a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
@@ -148,6 +148,10 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-groovysh</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>