From f4b3a848c73e4bfa7b27daf43b182ac8c53a863f Mon Sep 17 00:00:00 2001
From: Ankit Tomar <tomarankit.nitb@gmail.com>
Date: Mon, 13 Apr 2020 16:55:22 +0530
Subject: [PATCH 1/2] groovy version upgrade for rest-assured

---
 maven/pom.xml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/maven/pom.xml b/maven/pom.xml
index fceb864..4d5570b 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -67,6 +67,18 @@
                     <groupId>${project.groupId}</groupId>
                     <artifactId>strongbox-testing-web</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy-xml</artifactId>
+                </exclusion>
+                 <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy-json</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -307,8 +319,8 @@
 
                             <dependency>
                                 <groupId>org.codehaus.groovy</groupId>
-                                <artifactId>groovy-all</artifactId>
-                                <version>${version.groovy}</version>
+                                <artifactId>groovy</artifactId>
+                                <version>3.0.2</version>
                             </dependency>
                         </dependencies>
                     </plugin>

From 6046925b9e12d99a5a4c13689b48de5762521d5f Mon Sep 17 00:00:00 2001
From: Ankit Tomar <tomarankit.nitb@gmail.com>
Date: Thu, 10 Dec 2020 18:09:34 +0530
Subject: [PATCH 2/2] hard code groovy version removed from pom.xml

---
 maven/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maven/pom.xml b/maven/pom.xml
index 4d5570b..a8f18bb 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -320,7 +320,7 @@
                             <dependency>
                                 <groupId>org.codehaus.groovy</groupId>
                                 <artifactId>groovy</artifactId>
-                                <version>3.0.2</version>
+                                <version>${version.groovy}</version>
                             </dependency>
                         </dependencies>
                     </plugin>