Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '2.1.x'

  • Loading branch information...
commit c1ee3efae6ea4245cc242a17f203a626562a3b1b 2 parents d6a7d3c + 4fdbb6b
@graemerocher graemerocher authored
View
7 grails-bootstrap/src/main/groovy/grails/util/PluginBuildSettings.groovy
@@ -124,6 +124,9 @@ class PluginBuildSettings {
void registerNewPluginInstall(File zip) {
switch(zip) {
+ case buildSettings.pluginBuildDependencies:
+ registerPluginZipWithScope(zip, buildScopePluginInfo)
+ break
case buildSettings.pluginCompileDependencies:
registerPluginZipWithScope(zip, compileScopePluginInfo)
break
@@ -136,9 +139,7 @@ class PluginBuildSettings {
case buildSettings.pluginProvidedDependencies:
registerPluginZipWithScope(zip, providedScopePluginInfo)
break
- case buildSettings.pluginBuildDependencies:
- registerPluginZipWithScope(zip, buildScopePluginInfo)
- break
+
}
}
View
4 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/PluginInstallEngine.groovy
@@ -333,7 +333,9 @@ class PluginInstallEngine {
def installScript = new File("${pluginInstallPath}/scripts/_Install.groovy")
runPluginScript(installScript, fullPluginName, "post-install script")
- registerPluginWithMetadata(pluginName, pluginVersion)
+ if(!isResolve) {
+ registerPluginWithMetadata(pluginName, pluginVersion)
+ }
pluginSettings.clearCache()
pluginSettings.registerNewPluginInstall(pluginZip)
Please sign in to comment.
Something went wrong with that request. Please try again.