Relocate MergePlugin package

philwebb · philwebb · commit db2b00a2a5c0 · 2013-01-01T17:38:06.000-08:00
Relocate the MergePlugin from org.springframework.build.gradle.merge
to org.springframework.build.gradle.
diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.build.gradle.merge
+package org.springframework.build.gradle
 
 import org.gradle.api.*
 import org.gradle.api.artifacts.Configuration
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties
@@ -1 +1 @@
-implementation-class=org.springframework.build.gradle.merge.MergePlugin
+implementation-class=org.springframework.build.gradle.MergePlugin

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-implementation-class=org.springframework.build.gradle.merge.MergePlugin`
	`1`	`+implementation-class=org.springframework.build.gradle.MergePlugin`