From 07b7553355d98aa700cef0975893d0a308a9b342 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@vmware.com>
Date: Wed, 22 May 2013 14:57:10 -0500
Subject: [PATCH] Fix MergePlugin

The submitted pull requests for SPR-10572 did not build.

This commit fixes the MergePlugin to create from configurations rather
than the project. It also removes unnecessarily added code that was
commented out.

Issue: SPR-10572
---
 .../org/springframework/build/gradle/MergePlugin.groovy  | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
index c7e46af1fd..c88739c94a 100644
--- a/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
@@ -121,7 +121,7 @@ class MergePlugin implements Plugin<Project> {
 		project.configurations.each { configuration ->
 			Conf2ScopeMapping mapping = project.conf2ScopeMappings.getMapping([configuration])
 			if(mapping.scope) {
-				Configuration intoConfiguration = project.merge.into.create(
+				Configuration intoConfiguration = project.merge.into.configurations.create(
 					project.name + "-" + configuration.name)
 				configuration.excludeRules.each {
 					configuration.exclude([
@@ -153,13 +153,6 @@ class MergePlugin implements Plugin<Project> {
 			}
 		});
 	}
-
-//	private Configuration createConfiguration(Project project, String name) {
-//		if (project.configurations.respondsTo('create', String)) {
-//			return project.configurations.create(name)
-//		}
-//		project.configurations.add(name)
-//	}
 }
 
 class MergeModel {
-- 
GitLab