From 170fb58c9946a96f39647cae4e114235fff084d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Bigorajski?= <lbg@touk.pl>
Date: Wed, 7 Oct 2020 13:25:07 +0200
Subject: [PATCH] Bump groovy version

---
 .gitignore                |  1 +
 mockserver-client/pom.xml | 10 +++++++++-
 mockserver-tests/pom.xml  |  2 +-
 mockserver/pom.xml        | 10 +++++++++-
 pom.xml                   | 16 +++++++++++++---
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f995f3..18e3da1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.iml
 target/
+.idea
diff --git a/mockserver-client/pom.xml b/mockserver-client/pom.xml
index 48e8824..31f2353 100644
--- a/mockserver-client/pom.xml
+++ b/mockserver-client/pom.xml
@@ -15,7 +15,15 @@
     <dependencies>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-xml</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
diff --git a/mockserver-tests/pom.xml b/mockserver-tests/pom.xml
index 3b85e8b..1015716 100644
--- a/mockserver-tests/pom.xml
+++ b/mockserver-tests/pom.xml
@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy</artifactId>
         </dependency>
         <dependency>
             <groupId>org.spockframework</groupId>
diff --git a/mockserver/pom.xml b/mockserver/pom.xml
index 985da28..3a10008 100644
--- a/mockserver/pom.xml
+++ b/mockserver/pom.xml
@@ -12,7 +12,15 @@
     <dependencies>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-xml</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/pom.xml b/pom.xml
index 8f1b899..7a94c96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,9 +24,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
-        <groovy.version>2.4.11</groovy.version>
+        <groovy.version>2.5.7</groovy.version>
         <httpclient.version>4.3.6</httpclient.version>
-        <spock-core.version>1.0-groovy-2.4</spock-core.version>
+        <spock-core.version>1.3-groovy-2.5</spock-core.version>
         <commons-lang3.version>3.3.2</commons-lang3.version>
         <slf4j-api.version>1.7.7</slf4j-api.version>
         <logback-classic.version>1.0.13</logback-classic.version>
@@ -49,7 +49,17 @@
         <dependencies>
             <dependency>
                 <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-all</artifactId>
+                <artifactId>groovy</artifactId>
+                <version>${groovy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-json</artifactId>
+                <version>${groovy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-xml</artifactId>
                 <version>${groovy.version}</version>
             </dependency>
             <dependency>