From 4414a3b4ede2ecdb9d2d7a97732119c2846588fb Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Tue, 5 Sep 2023 14:29:43 -0400
Subject: [PATCH] Upgrade to latest Apache Ivy

---
 applications/processor/groovy-processor/pom.xml           | 1 -
 .../src/test/resources/script-with-grab.groovy            | 2 --
 applications/processor/script-processor/pom.xml           | 1 -
 .../src/test/resources/script-with-grab.groovy            | 2 --
 applications/sink/router-sink/pom.xml                     | 5 -----
 stream-applications-build/pom.xml                         | 8 +++++++-
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/applications/processor/groovy-processor/pom.xml b/applications/processor/groovy-processor/pom.xml
index 358d4dbc..8f53c260 100644
--- a/applications/processor/groovy-processor/pom.xml
+++ b/applications/processor/groovy-processor/pom.xml
@@ -51,7 +51,6 @@
         <dependency>
             <groupId>org.apache.ivy</groupId>
             <artifactId>ivy</artifactId>
-            <version>${apache-ivy.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud.fn</groupId>
diff --git a/applications/processor/groovy-processor/src/test/resources/script-with-grab.groovy b/applications/processor/groovy-processor/src/test/resources/script-with-grab.groovy
index 6ccec178..1921b0c6 100644
--- a/applications/processor/groovy-processor/src/test/resources/script-with-grab.groovy
+++ b/applications/processor/groovy-processor/src/test/resources/script-with-grab.groovy
@@ -1,6 +1,4 @@
 @Grab('org.grooscript:grooscript:1.3.0')
 import org.grooscript.GrooScript
-@Grab('org.grooscript:grooscript:1.3.0')
-import org.grooscript.GrooScript
 
 GrooScript.convert(new String(payload))
\ No newline at end of file
diff --git a/applications/processor/script-processor/pom.xml b/applications/processor/script-processor/pom.xml
index 276954f8..9ed7d063 100644
--- a/applications/processor/script-processor/pom.xml
+++ b/applications/processor/script-processor/pom.xml
@@ -75,7 +75,6 @@
         <dependency>
             <groupId>org.apache.ivy</groupId>
             <artifactId>ivy</artifactId>
-            <version>${apache-ivy.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud.fn</groupId>
diff --git a/applications/processor/script-processor/src/test/resources/script-with-grab.groovy b/applications/processor/script-processor/src/test/resources/script-with-grab.groovy
index 76002c08..ad538a62 100644
--- a/applications/processor/script-processor/src/test/resources/script-with-grab.groovy
+++ b/applications/processor/script-processor/src/test/resources/script-with-grab.groovy
@@ -1,6 +1,4 @@
 @Grab('org.grooscript:grooscript:1.3.0')
 import org.grooscript.GrooScript
-@Grab('org.grooscript:grooscript:1.3.0')
-import org.grooscript.GrooScript
 
 GrooScript.convert(new String(payload))
diff --git a/applications/sink/router-sink/pom.xml b/applications/sink/router-sink/pom.xml
index fa0341ab..dbffc6ed 100644
--- a/applications/sink/router-sink/pom.xml
+++ b/applications/sink/router-sink/pom.xml
@@ -14,10 +14,6 @@
         <relativePath>../../stream-applications-core/pom.xml</relativePath>
     </parent>
 
-    <properties>
-        <apache-ivy.version>2.5.1</apache-ivy.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.integration</groupId>
@@ -55,7 +51,6 @@
         <dependency>
             <groupId>org.apache.ivy</groupId>
             <artifactId>ivy</artifactId>
-            <version>${apache-ivy.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud.fn</groupId>
diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml
index 1447cf76..361b1f4f 100644
--- a/stream-applications-build/pom.xml
+++ b/stream-applications-build/pom.xml
@@ -51,7 +51,8 @@
         <testcontainers.version>1.18.3</testcontainers.version>
         <mockserver.version>5.13.2</mockserver.version>
 
-        <groovy.version>4.0.5</groovy.version>
+        <groovy.version>4.0.14</groovy.version>
+        <apache-ivy.version>2.5.2</apache-ivy.version>
         <jakarta-jms.version>3.1.0</jakarta-jms.version>
         <spring-cloud-aws.version>3.0.1</spring-cloud-aws.version>
         <spring-integration-aws.version>3.0.1</spring-integration-aws.version>
@@ -115,6 +116,11 @@
                 <artifactId>jakarta.jms-api</artifactId>
                 <version>${jakarta-jms.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.ivy</groupId>
+                <artifactId>ivy</artifactId>
+                <version>${apache-ivy.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.awspring.cloud</groupId>
                 <artifactId>spring-cloud-aws-dependencies</artifactId>