From 42bbcc322021e9d1a57cc34053f6f659fc90839e Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Mon, 10 Dec 2012 00:32:00 -0800
Subject: [PATCH] Move Merge plugin into a build package structure

---
 build.gradle                                   |  2 +-
 .../build/gradle/merge}/MergePlugin.groovy     | 18 ++++++++++++++++++
 .../META-INF/gradle-plugins/merge.properties   |  1 +
 3 files changed, 20 insertions(+), 1 deletion(-)
 rename buildSrc/src/main/groovy/{ => org/springframework/build/gradle/merge}/MergePlugin.groovy (86%)
 create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties

diff --git a/build.gradle b/build.gradle
index 931874af12..04a16f603f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ configure(allprojects) {
 }
 
 configure(subprojects) { subproject ->
-	apply plugin: MergePlugin
+	apply plugin: "merge"
 	apply from: "${gradleScriptDir}/publish-maven.gradle"
 
 	jar {
diff --git a/buildSrc/src/main/groovy/MergePlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/merge/MergePlugin.groovy
similarity index 86%
rename from buildSrc/src/main/groovy/MergePlugin.groovy
rename to buildSrc/src/main/groovy/org/springframework/build/gradle/merge/MergePlugin.groovy
index 2f49938c05..961717503a 100644
--- a/buildSrc/src/main/groovy/MergePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/merge/MergePlugin.groovy
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2002-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.build.gradle.merge
+
 import org.gradle.api.*
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.ProjectDependency;
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties
new file mode 100644
index 0000000000..5bfccb3d9b
--- /dev/null
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties
@@ -0,0 +1 @@
+implementation-class=org.springframework.build.gradle.merge.MergePlugin