Merge branch '2.3.x' of github.com:grails/grails-core into 2.3.x

Author: graemerocher

gradle/assemble.gradle

@@ -103,7 +103,7 @@ task pluginsFromRepo {
         hibernate: "3.6.10.8",
         jquery: "1.11.0",
         resources: "1.2.1",
-        scaffolding: "2.0.1",
+        scaffolding: "2.0.2",
         tomcat: "7.0.50",
         webxml: "1.4.1"
     ]

grails-resources/src/grails/grails-app/conf/BuildConfig.groovy

@@ -57,7 +57,7 @@ grails.project.dependency.resolution = {
         build ":tomcat:7.0.50"
 
         // plugins for the compile step
-        compile ":scaffolding:2.0.1"
+        compile ":scaffolding:2.0.2"
         compile ':cache:1.1.1'
 
         // plugins needed at runtime but not for compilation

grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/GrailsWebDataBinderSpec.groovy

@@ -1169,6 +1169,25 @@ class GrailsWebDataBinderSpec extends Specification {
         then:
         obj.timeZone == TimeZone.getTimeZone('Europe/Berlin')
     }
+    
+    void 'Test binding to a typed List of non-domain objects'() {
+        given:
+        def obj = new DocumentHolder()
+        
+        when:
+        binder.bind obj, [objectIds: ['two', 'four', 'six', 'eight']] as SimpleMapDataBindingSource
+        
+        then:
+        obj.objectIds.size() == 4
+        obj.objectIds[0] instanceof ObjectId
+        obj.objectIds[0].value == 'two'
+        obj.objectIds[1] instanceof ObjectId
+        obj.objectIds[1].value == 'four'
+        obj.objectIds[2] instanceof ObjectId
+        obj.objectIds[2].value == 'six'
+        obj.objectIds[3] instanceof ObjectId
+        obj.objectIds[3].value == 'eight'
+    }
 }
 
 @Entity
@@ -1295,6 +1314,18 @@ class CollectionContainer {
     List<Long> listOfLong
 }
 
+class DocumentHolder {
+    List<ObjectId> objectIds
+}
+
+class ObjectId {
+    String value
+    
+    ObjectId(String str) {
+        value = str
+    }
+}
+
 class PrimitiveContainer {
     boolean someBoolean
     byte someByte