From 38779a5e989040e2a392a9cda9503cbb40e6dc39 Mon Sep 17 00:00:00 2001
From: danf <danf@jfrog.com>
Date: Mon, 22 Jun 2015 12:36:35 +0300
Subject: [PATCH] Update Groovy version -> 2.4.1

---
 build.gradle                                                | 4 ++--
 .../com/jfrog/bintray/client/test/BintraySpecSuite.groovy   | 6 ++++--
 .../com/jfrog/bintray/client/test/spec/PackageSpec.groovy   | 2 +-
 .../com/jfrog/bintray/client/test/spec/VersionSpec.groovy   | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 996f3e8..8dd165d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -153,10 +153,10 @@ subprojects() {
 project(':bintray-client-java-service') {
     dependencies {
         compile project(':bintray-client-java-api')
-        compile 'org.codehaus.groovy:groovy:1.8.0'
         compile 'commons-lang:commons-lang:2.6'
+        testCompile 'org.codehaus.groovy:groovy-all:2.4.1'
         testCompile group: 'com.timgroup', name: 'jgravatar', version: '1.0'
-        testCompile("org.spockframework:spock-core:0.7-groovy-1.8") {
+        testCompile("org.spockframework:spock-core:1.0-groovy-2.4") {
             exclude module: 'groovy-all'
         }
     }
diff --git a/impl/src/test/groovy/com/jfrog/bintray/client/test/BintraySpecSuite.groovy b/impl/src/test/groovy/com/jfrog/bintray/client/test/BintraySpecSuite.groovy
index 4504e65..aa89c92 100644
--- a/impl/src/test/groovy/com/jfrog/bintray/client/test/BintraySpecSuite.groovy
+++ b/impl/src/test/groovy/com/jfrog/bintray/client/test/BintraySpecSuite.groovy
@@ -65,8 +65,10 @@ class BintraySpecSuite {
             new Attribute<String>('b', 'b', 'e'),
             new Attribute<String>('c', 'cee')]
 
-    public static String expectedAttributes = '[[values:[ay1, ay2], name:a, type:string], ' +
-            '[values:[cee], name:c, type:string], [values:[e, b], name:b, type:string]]'
+    public
+    static String expectedPkgAttributes = '[[name:c, type:string, values:[cee]], [name:a, type:string, values:[ay1, ay2]], [name:b, type:string, values:[e, b]]]'
+    public
+    static String expectedVerAttributes = '[[name:a, type:string, values:[ay1, ay2]], [name:c, type:string, values:[cee]], [name:b, type:string, values:[e, b]]]'
 
     public
     static String assortedAttributes = "[{\"name\":\"verAttr2\",\"values\":[\"val1\",\"val2\"],\"type\":\"string\"}," +
diff --git a/impl/src/test/groovy/com/jfrog/bintray/client/test/spec/PackageSpec.groovy b/impl/src/test/groovy/com/jfrog/bintray/client/test/spec/PackageSpec.groovy
index b9a8ca7..9149af3 100644
--- a/impl/src/test/groovy/com/jfrog/bintray/client/test/spec/PackageSpec.groovy
+++ b/impl/src/test/groovy/com/jfrog/bintray/client/test/spec/PackageSpec.groovy
@@ -90,7 +90,7 @@ class PackageSpec extends Specification {
         then:
         ['a', 'b', 'c'] == actualPackage.attribute_names.sort()
         and:
-        expectedAttributes.equalsIgnoreCase(actualAttributes.sort().toString())
+        expectedPkgAttributes.equalsIgnoreCase(actualAttributes.toString())
     }
 
     def 'wrong package gives 404'() {
diff --git a/impl/src/test/groovy/com/jfrog/bintray/client/test/spec/VersionSpec.groovy b/impl/src/test/groovy/com/jfrog/bintray/client/test/spec/VersionSpec.groovy
index fdd9181..f6f6244 100644
--- a/impl/src/test/groovy/com/jfrog/bintray/client/test/spec/VersionSpec.groovy
+++ b/impl/src/test/groovy/com/jfrog/bintray/client/test/spec/VersionSpec.groovy
@@ -86,7 +86,7 @@ class VersionSpec extends Specification {
         then:
         ['a', 'b', 'c'] == actualVersion.attribute_names.sort()
         and:
-        expectedAttributes == actualAttributes.sort().toString()
+        expectedVerAttributes.equalsIgnoreCase(actualAttributes.sort().toString())
 
     }