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 7eec507118 NIFI-10181: Upgrade Groovy to 3.0.9
7eec507118 is described below
commit 7eec5071189095eab3da9b901781850697e0a01f
Author: Matthew Burgess <[email protected]>
AuthorDate: Thu Jun 30 12:19:23 2022 -0400
NIFI-10181: Upgrade Groovy to 3.0.9
This closes #6170
Signed-off-by: David Handermann <[email protected]>
---
nifi-nar-bundles/nifi-groovyx-bundle/pom.xml | 2 +-
nifi-registry/pom.xml | 2 +-
pom.xml | 7 ++++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/nifi-nar-bundles/nifi-groovyx-bundle/pom.xml
b/nifi-nar-bundles/nifi-groovyx-bundle/pom.xml
index 7b9029f5de..acb3e34b04 100644
--- a/nifi-nar-bundles/nifi-groovyx-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-groovyx-bundle/pom.xml
@@ -31,7 +31,7 @@
</modules>
<properties>
- <groovyx.groovy.version>2.5.14</groovyx.groovy.version>
+ <groovyx.groovy.version>${nifi.groovy.version}</groovyx.groovy.version>
</properties>
<dependencyManagement>
diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml
index 44b53864bc..82bf000f35 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -359,7 +359,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>${nifi.groovy.version}-01</version>
+ <version>${groovy.eclipse.batch.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/pom.xml b/pom.xml
index 70c3d0b36b..7112e9a0e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,8 @@
<jaxb.runtime.version>2.3.5</jaxb.runtime.version>
<jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>
<json.smart.version>2.4.8</json.smart.version>
- <nifi.groovy.version>3.0.8</nifi.groovy.version>
+ <nifi.groovy.version>3.0.9</nifi.groovy.version>
+ <groovy.eclipse.batch.version>3.0.8-01</groovy.eclipse.batch.version>
<surefire.version>3.0.0-M7</surefire.version>
<!-- The Hadoop version used by nifi-hadoop-libraries-nar and any NARs
that depend on it, other NARs that need
a specific version should override this property, or use a more
specific property like abc.hadoop.version -->
@@ -620,7 +621,7 @@
<plugin>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>${nifi.groovy.version}-01</version>
+ <version>${groovy.eclipse.batch.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -767,7 +768,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>${nifi.groovy.version}-01</version>
+ <version>${groovy.eclipse.batch.version}</version>
</dependency>
</dependencies>
</plugin>
