Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <pierre.villard.fr@gmail.com>

This closes #5973.
This commit is contained in:
exceptionfactory 2022-04-18 14:11:40 -05:00 committed by Pierre Villard
parent 081154530a
commit 876e16f6a8
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
5 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-nar/pom.xml
View File

@ -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>

6
nifi-nar-bundles/nifi-hive-bundle/pom.xml
View File

@ -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>

17
nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/pom.xml
View File

@ -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>

4
nifi-toolkit/nifi-toolkit-admin/pom.xml
View File

@ -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>

4
nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
View File

@ -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>