Another small change for Groovy

bintray · Jun 22, 2015 · 53fc09c · 53fc09c
1 parent 38779a5
commit 53fc09c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -54,7 +54,7 @@ subprojects() {
         compile 'joda-time:joda-time:2.2'
         compile 'commons-io:commons-io:2.1'
         compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.5'
-        compile("org.apache.httpcomponents:httpclient:4.3.5") {
+        compile("org.apache.httpcomponents:httpclient:4.4.1") {
             exclude group: 'commons-logging' //DO NOT REMOVE
         }
     }
@@ -154,11 +154,8 @@ project(':bintray-client-java-service') {
     dependencies {
         compile project(':bintray-client-java-api')
         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:1.0-groovy-2.4") {
-            exclude module: 'groovy-all'
-        }
+        testCompile("org.spockframework:spock-core:0.7-groovy-2.0")
     }
 }
 
@@ -177,7 +174,7 @@ def addSlf4J(name) {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.1'
+    gradleVersion = '2.4'
 }
 
 idea {

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
@@ -65,10 +65,11 @@ class BintraySpecSuite {
             new Attribute<String>('b', 'b', 'e'),
             new Attribute<String>('c', 'cee')]
 
-    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 expectedPkgAttributes =
+            '[[values:[ay1, ay2], name:a, type:string], [values:[cee], name:c, type:string], [values:[e, b], name:b, type:string]]'
+    public static String expectedVerAttributes =
+            '[[values:[ay1, ay2], name:a, type:string], [values:[cee], name:c, type:string], [values:[e, b], name:b, type:string]]'
 
     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
@@ -90,7 +90,7 @@ class PackageSpec extends Specification {
         then:
         ['a', 'b', 'c'] == actualPackage.attribute_names.sort()
         and:
-        expectedPkgAttributes.equalsIgnoreCase(actualAttributes.toString())
+        expectedPkgAttributes.equalsIgnoreCase(actualAttributes.sort().toString())
     }
 
     def 'wrong package gives 404'() {