From 2638dd5a05644988be193f9cbbb18b8be3b55506 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Fri, 5 Oct 2012 11:40:42 -0500 Subject: [PATCH] merge-dist.gradle disables artifactoryPublish Previously the project that was getting merged from would try to execute the artifactoryPublish on the build box. This caused issues since the mavenDescriptor did not exist. The merge-dist.gradle now disables the artifactoryPublish task if it exists (it will only exist on the build box). Issue: SPR-9859, SPR-7951 --- merge-dist.gradle | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/merge-dist.gradle b/merge-dist.gradle index cf32667de9..8bce5a27e8 100644 --- a/merge-dist.gradle +++ b/merge-dist.gradle @@ -22,11 +22,13 @@ import org.gradle.plugins.ide.eclipse.model.ProjectDependency def mergeFromProject = project // invoking a task on mergeFromProject will invoke the task with the same name on mergeIntoProject -def taskNamesToMerge = ['sourcesJar','jar','javadocJar','javadoc','install'] +def taskNamesToMerge = ['sourcesJar','jar','javadocJar','javadoc','install','artifactoryPublish'] taskNamesToMerge.each { taskName -> - def taskToRemove = tasks.getByPath(taskName) - taskToRemove.enabled = false - taskToRemove.dependsOn mergeIntoProject."$taskName" + def taskToRemove = mergeFromProject.tasks.findByPath(taskName) + if(taskToRemove) { + taskToRemove.enabled = false + taskToRemove.dependsOn mergeIntoProject."$taskName" + } } // update mergeIntoProject artifacts to contain the mergeFromProject artifact contents