You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2022/02/22 20:56:12 UTC
[nifi] branch main updated: NIFI-9707: Resolved duplicate JLine dependency in nifi-toolkit
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 dc1117d NIFI-9707: Resolved duplicate JLine dependency in nifi-toolkit
dc1117d is described below
commit dc1117d10470b4f57fd9cca3c91f9e9a37a1dbb1
Author: Joe Gresock <jg...@gmail.com>
AuthorDate: Thu Feb 17 14:09:48 2022 -0500
NIFI-9707: Resolved duplicate JLine dependency in nifi-toolkit
- Excluded groovy-groovysh from several toolkit modules
This closes #5782
Signed-off-by: David Handermann <ex...@apache.org>
---
nifi-toolkit/nifi-toolkit-admin/pom.xml | 6 ++++++
nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml | 6 ++++++
nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml | 6 ++++++
3 files changed, 18 insertions(+)
diff --git a/nifi-toolkit/nifi-toolkit-admin/pom.xml b/nifi-toolkit/nifi-toolkit-admin/pom.xml
index 9d65aec..4725ee1 100644
--- a/nifi-toolkit/nifi-toolkit-admin/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-admin/pom.xml
@@ -153,6 +153,12 @@ language governing permissions and limitations under the License. -->
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<type>pom</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-groovysh</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 740d4ba..188a643 100644
--- a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
@@ -143,6 +143,12 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<type>pom</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-groovysh</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
diff --git a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
index ce12e34..a0a8070 100644
--- a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
@@ -71,6 +71,12 @@
<version>${toolkit.groovy.version}</version>
<type>pom</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-groovysh</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>