fix for GRAILS-9455 "Add -Dspringloaded.synchronize=true to Grails JV…

…M parameters in development mode"
mecca831 · Oct 26, 2012 · 8911077 · 8911077
1 parent e327b0c
commit 8911077
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
@@ -7,7 +7,7 @@ subprojects { subproject ->
     configurations {
         libsConfigurations << libs {
             extendsFrom compile, runtime
-            ["jsp21", "uaa"].collect { configurations.findByName(it) }.findAll { it != null }.each { extendsFrom it }
+            ["jsp21"].collect { configurations.findByName(it) }.findAll { it != null }.each { extendsFrom it }
         }
     }
 }
@@ -23,7 +23,7 @@ task checkDuplicateDependencies(description: 'Checks the dependency graph for mu
             def value = dependency.moduleVersion
 
             def versions = moduleToVersionsMap[key]
-            if (!versions) {
+            if(!versions) {
                 versions = [] as Set
                 moduleToVersionsMap[key] = versions
             }
@@ -33,7 +33,7 @@ task checkDuplicateDependencies(description: 'Checks the dependency graph for mu
     def dups = moduleToVersionsMap.findAll { k, v ->
         v.size() > 1
     }
-    if (dups) {
+    if(dups) {
         def msg = 'Multiple versions of some dependencies have been identified in the dependency graph'
         println msg
         dups.each { k, v ->
@@ -105,8 +105,7 @@ task pluginsFromRepo {
         ant {
             mkdir(dir: dir)
             plugins.each { name, version ->
-                def versionTag = version.replaceAll(/\./, '_').toUpperCase()
-                get(src: "http://grails.org/plugins/grails-${name}/tags/RELEASE_${versionTag}/grails-${name}-${version}.zip",
+                get(src: "http://repo.grails.org/grails/plugins/org/grails/plugins/${name}/$version/${name}-${version}.zip",
                     dest: dir, verbose: true, usetimestamp: true)
             }
         }
@@ -127,8 +126,8 @@ task installResources(type: Copy) {
         filter(ReplaceTokens, tokens: ['starter.main.class': 'org.codehaus.groovy.grails.cli.support.GrailsStarter'])
         filter(ReplaceTokens, tokens: ['windows.starter.classpath': "%GRAILS_HOME%\\lib\\org.codehaus.groovy\\groovy-all\\jars\\groovy-all-${groovyVersion}.jar;%GRAILS_HOME%\\dist\\grails-bootstrap-${grailsVersion}.jar".toString()])
         filter(ReplaceTokens, tokens: ['starter.classpath': "\$GRAILS_HOME/lib/org.codehaus.groovy/groovy-all/jars/groovy-all-${groovyVersion}.jar:\$GRAILS_HOME/dist/grails-bootstrap-${grailsVersion}.jar".toString()])
-        filter(ReplaceTokens, tokens: ['agent.string': "-javaagent:\$AGENT_GRAILS_HOME/lib/com.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar -noverify -Dspringloaded=\$SPRINGLOADED_PARAMS".toString()])
-        filter(ReplaceTokens, tokens: ['windows.agent.string': "-javaagent:%GRAILS_HOME:\\=/%/lib/com.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar -noverify -Dspringloaded=%SPRINGLOADED_PARAMS%".toString()])
+        filter(ReplaceTokens, tokens: ['agent.string': "-javaagent:\$AGENT_GRAILS_HOME/lib/com.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar -noverify  -Dspringloaded.synchronize=true -Dspringloaded=\$SPRINGLOADED_PARAMS".toString()])
+        filter(ReplaceTokens, tokens: ['windows.agent.string': "-javaagent:%GRAILS_HOME:\\=/%/lib/com.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar -noverify  -Dspringloaded.synchronize=true -Dspringloaded=%SPRINGLOADED_PARAMS%".toString()])
         filter(ReplaceTokens, tokens: ['startup.command': ''])
         fileMode = 0755
     }
@@ -187,7 +186,7 @@ task zipDist(type: Zip, dependsOn: [sourcesJars, install]) {
 
     into("grails-$grailsVersion") {
         from(projectDir) {
-            include 'lib/', 'gradle/', 'media/', 'samples/', 'scripts/', 'build.gradle', 'build.properties',
+            include 'lib/', 'gradle/', 'media/', 'samples/', 'scripts/', 'build.gradle', 'build.properties', 'dependencies.txt',
                     'LICENSE', 'INSTALL', "src/", "gradlew.bat","gradle.properties"
             exclude 'ant/bin', 'src/grails', 'src/war'
         }