Merge branch '2.1.x' into 2.2.x

jeffscottbrown · jeffscottbrown · commit 4835add6d9e2 · 2012-12-15T09:42:41.000-06:00
Conflicts:
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy
	grails-resources/src/grails/plugin/grails-app/conf/BuildConfig.groovy
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
@@ -120,6 +120,8 @@ task pluginsFromRepo {
                     dest: dir, verbose: true, usetimestamp: true)
                 get(src: "http://grails.org/plugins/grails-${name}/tags/RELEASE_${versionTag}/grails-${name}-${version}.pom",
                     dest: dir, verbose: true, usetimestamp: true)
+                get(src: "http://grails.org/plugins/grails-${name}/tags/RELEASE_${versionTag}/grails-${name}-${version}.pom",
+                    dest: dir, verbose: true, usetimestamp: true)
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,8 @@ task pluginsFromRepo {`
`120`	`120`	`dest: dir, verbose: true, usetimestamp: true)`
`121`	`121`	`get(src: "http://grails.org/plugins/grails-${name}/tags/RELEASE_${versionTag}/grails-${name}-${version}.pom",`
`122`	`122`	`dest: dir, verbose: true, usetimestamp: true)`
	`123`	`+ get(src: "http://grails.org/plugins/grails-${name}/tags/RELEASE_${versionTag}/grails-${name}-${version}.pom",`
	`124`	`+ dest: dir, verbose: true, usetimestamp: true)`
`123`	`125`	`}`
`124`	`126`	`}`
`125`	`127`	`}`