Merge branch '3.0.x'

Author: graemerocher

grails-core/src/main/groovy/grails/boot/GrailsApp.groovy

@@ -145,7 +145,14 @@ class GrailsApp extends SpringApplication {
                 def projectPaths = binding.getVariables().get('projectPaths')
                 if(projectPaths) {
                     for(path in projectPaths) {
-                        watchBaseDirectories << new File(parentDir, path.toString())
+                        if(path) {
+
+                            def pathStr = path.toString()
+                            if(pathStr.startsWith(':')) {
+                                pathStr = pathStr.substring(1)
+                            }
+                            watchBaseDirectories << new File(parentDir, pathStr)
+                        }
                     }
                 }
             }

grails-plugin-validation/src/main/groovy/grails/validation/Validateable.groovy

@@ -71,7 +71,7 @@ trait Validateable {
     static Map<String, ConstrainedProperty> getConstraintsMap() {
         if(this.constraintsMapInternal == null) {
             ConstraintsEvaluator evaluator = findConstraintsEvaluator()
-            this.constraintsMapInternal = evaluator.evaluate this, defaultNullable()
+            def evaluatedConstraints = evaluator.evaluate(this, defaultNullable())
 
             if(!defaultNullable()) {
                 def methods = this.getDeclaredMethods()
@@ -84,14 +84,15 @@ trait Validateable {
                     if(isPropertyGetter(method)) {
                         def propertyName = NameUtils.getPropertyNameForGetterOrSetter(method.name)
                         if( !ignoredProperties.contains(propertyName) &&
-                            !this.constraintsMapInternal.containsKey(propertyName)) {
+                            !evaluatedConstraints.containsKey(propertyName)) {
                             def cp = new ConstrainedProperty(this, propertyName, method.returnType)
                             cp.applyConstraint 'nullable', false
-                            this.constraintsMapInternal.put propertyName, cp
+                            evaluatedConstraints.put propertyName, cp
                         }
                     }
                 }
             }
+            this.constraintsMapInternal = evaluatedConstraints
         }
         this.constraintsMapInternal
     }