Permalink
Browse files

GRAILS-8107 - Don't abort an upgrade if dependency resolution fails

  • Loading branch information...
jeffbrown committed Oct 13, 2011
1 parent cc61e5c commit a2be4f9f61e19c95c3d5f3e793df1951269fb14b
@@ -420,7 +420,10 @@ You cannot upgrade a plugin that is configured via BuildConfig.groovy, remove th
for (dependencyConfiguration in dependencyConfigurationsToAdd) {
def resolveReport = dependencyManager.resolveDependencies(dependencyConfiguration)
if (resolveReport.hasError()) {
- errorHandler("Failed to install plugin [${pluginName}]. Plugin has missing JAR dependencies.")
+ def runningUpgrade = Boolean.getBoolean('runningGrailsUpgrade')
+ if(!runningUpgrade) {
+ errorHandler("Failed to install plugin [${pluginName}]. Plugin has missing JAR dependencies.")
+ }
}
else {
addJarsToRootLoader dependencyConfiguration, resolveReport.getArtifactsReports(null, false).localFile
View
@@ -35,6 +35,7 @@ target(upgrade: "main upgrade target") {
depends(createStructure, parseArguments)
+ System.properties.put('runningGrailsUpgrade', 'true')
boolean force = argsMap.force || !isInteractive ?: false
if (appGrailsVersion != grailsVersion) {

0 comments on commit a2be4f9

Please sign in to comment.