Permalink
Browse files

Merge from 2.1.x branch

  • Loading branch information...
1 parent 68ad795 commit 8b3fc594fcc3aef88bebc2c38d25b2a098faf738 @jeffbrown jeffbrown committed Jul 9, 2012
View
@@ -63,7 +63,7 @@ task configurePopulateDependencies << {
populateDependencies.into("$dependency.group/$dependency.name/jars") {
from artifact.file // this will trigger the actual download if necessary
}
-
+
populateDependencies.from ("${metadata}/${dependency.group}/${dependency.name}/${dependency.version}") {
include "*.ivy.xml"
eachFile { it.path = "$dependency.group/$dependency.name/ivy-${dependency.version}.xml" }
@@ -94,7 +94,9 @@ task pluginsFromRepo {
tomcat: grailsVersion,
resources: "1.1.6",
webxml: "1.4.1",
- jquery: "1.7.2"
+ jquery: "1.7.2",
+ 'database-migration': "1.1",
+ cache: "1.0.0"
]
ext.dir = file("$buildDir/pluginsFromRepo")
@@ -137,7 +139,7 @@ task installResources(type: Copy) {
ant.copy(todir:projectDir) {
fileset(dir:"$buildDir/home-dir")
}
-
+
ant.chmod(dir: homeBinDir, perm: '755', includes: '*')
}
@@ -208,7 +208,7 @@ class InteractiveMode {
arg = unescape(arg)
// Is this arg one of the fixed options for 'open'?
- String fixedOption = openOptions.find { option, value ->
+ def fixedOption = openOptions.find { option, value ->
// No match if a file matching the name of the
// option exists.
arg == option && !new File(option).exists()
@@ -50,7 +50,7 @@ grails.project.dependency.resolution = {
build ":tomcat:$grailsVersion"
runtime ":database-migration:1.1"
-
- compile ':cache:1.0.0.RC1'
+
+ compile ':cache:1.0.0'
}
}
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.grails.plugins</groupId>
<artifactId>jquery</artifactId>
- <version>1.7.1</version>
+ <version>1.7.2</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.grails.plugins</groupId>
<artifactId>cache</artifactId>
- <version>1.0.0.RC1</version>
+ <version>1.0.0</version>
<type>zip</type>
<scope>compile</scope>
</dependency>
View
@@ -35,7 +35,8 @@ target(default:"Adds a proxy configuration") {
config[argsMap.params[0]] = ['http.proxyHost':argsMap.host,
'http.proxyPort':argsMap.port,
"http.proxyUser": argsMap.username?: '',
- "http.proxyPassword": argsMap.password?: '']
+ "http.proxyPassword": argsMap.password?: '',
+ 'http.nonProxyHosts': argsMap.noproxy?: '']
settingsFile.withWriter { w -> config.writeTo(w) }
@@ -49,8 +50,8 @@ target(default:"Adds a proxy configuration") {
String msg() {
return '''\
-Usage: grails add-proxy [name] --host=[server] --port=[port] --username=[username]* --password=[password]*
-Example: grails add-proxy client --host=proxy-server --port=4300 --username=guest --password=guest
+Usage: grails add-proxy [name] --host=[server] --port=[port] --username=[username]* --password=[password]* --noproxy=[no|proxy|hosts]*
+Example: grails add-proxy client --host=proxy-server --port=4300 --username=guest --password=guest --noproxy=somehost|*.intra.net
* Optional
'''

0 comments on commit 8b3fc59

Please sign in to comment.