NIFI-12872 Upgraded Groovy from 4.0.18 to 4.0.19

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com> This closes apache#8481.
gforeman02 · Mar 7, 2024 · 04d213a · 04d213a
1 parent bee65b8
commit 04d213a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
@@ -94,12 +94,12 @@
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <version>${nifi.groovy.version}</version>
+            <version>${groovy.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-dateutil</artifactId>
-            <version>${nifi.groovy.version}</version>
+            <version>${groovy.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>

diff --git a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml
@@ -43,20 +43,20 @@
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-json</artifactId>
-            <version>${nifi.groovy.version}</version>
+            <version>${groovy.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-sql</artifactId>
-            <version>${nifi.groovy.version}</version>
+            <version>${groovy.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- groovy-all does not include groovy-dateutil by default, so must explicitly include it here -->
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-dateutil</artifactId>
-            <version>${nifi.groovy.version}</version>
+            <version>${groovy.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ivy</groupId>

diff --git a/nifi-nar-bundles/nifi-groovyx-bundle/pom.xml b/nifi-nar-bundles/nifi-groovyx-bundle/pom.xml
@@ -44,7 +44,7 @@
             <dependency>
                 <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy-all</artifactId>
-                <version>${nifi.groovy.version}</version>
+                <version>${groovy.version}</version>
                 <type>pom</type>
                 <scope>provided</scope>
             </dependency>

diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
@@ -102,26 +102,26 @@
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-json</artifactId>
-            <version>${nifi.groovy.version}</version>
+            <version>${groovy.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-jsr223</artifactId>
-            <version>${nifi.groovy.version}</version>
+            <version>${groovy.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-xml</artifactId>
-            <version>${nifi.groovy.version}</version>
+            <version>${groovy.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- groovy-all does not include groovy-dateutil by default, so must explicitly include it here -->
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-dateutil</artifactId>
-            <version>${nifi.groovy.version}</version>
+            <version>${groovy.version}</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/nifi-nar-bundles/nifi-scripting-bundle/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/pom.xml
@@ -73,7 +73,7 @@
             <dependency>
                 <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy-all</artifactId>
-                <version>${nifi.groovy.version}</version>
+                <version>${groovy.version}</version>
                 <type>pom</type>
                 <scope>provided</scope>
             </dependency>

diff --git a/pom.xml b/pom.xml
@@ -137,7 +137,7 @@
         <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
         <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
         <json.smart.version>2.5.0</json.smart.version>
-        <nifi.groovy.version>4.0.18</nifi.groovy.version>
+        <groovy.version>4.0.19</groovy.version>
         <surefire.version>3.1.2</surefire.version>
         <hadoop.version>3.3.6</hadoop.version>
         <ozone.version>1.2.1</ozone.version>
@@ -339,7 +339,7 @@
             <dependency>
                 <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy-all</artifactId>
-                <version>${nifi.groovy.version}</version>
+                <version>${groovy.version}</version>
                 <type>pom</type>
                 <exclusions>
                     <exclusion>