From 10a77876adc135118c95e09a35c1949205edbd0c Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Fri, 6 Jan 2017 14:23:41 -0500
Subject: [PATCH] Remove MergePlugin and buildSrc

---
 build.gradle                                  |  37 +---
 .../build/gradle/MergePlugin.groovy           | 158 ------------------
 .../META-INF/gradle-plugins/merge.properties  |   1 -
 3 files changed, 8 insertions(+), 188 deletions(-)
 delete mode 100644 buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
 delete mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties

diff --git a/build.gradle b/build.gradle
index 7a1f933a..1bb96de3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,23 +6,19 @@ buildscript {
 		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
 		classpath("io.spring.gradle:spring-io-plugin:0.0.5.RELEASE")
 		classpath("io.spring.gradle:docbook-reference-plugin:0.3.1")
-		classpath("me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1")
 	}
 }
 
-configure(allprojects) {
+allprojects {
 
 	group = "org.springframework.webflow"
 
 	apply plugin: "propdeps"
 	apply plugin: "java"
 	apply from: "${rootProject.projectDir}/ide.gradle"
-	apply plugin: "javadocHotfix"
 }
 
-configure(subprojects.findAll {it.name != "spring-build-src"}) { subproject ->
-	apply plugin: "merge"
-	apply from: "${rootProject.projectDir}/publish-maven.gradle"
+subprojects { subproject ->
 
 	sourceCompatibility=1.8
 	targetCompatibility=1.8
@@ -47,9 +43,6 @@ configure(subprojects.findAll {it.name != "spring-build-src"}) { subproject ->
 			expand(copyright: new Date().format("yyyy"), version: project.version)
 		}
 	}
-}
-
-configure(subprojects.findAll {it.name != "spring-build-src"}) { subproject ->
 
 	if (project.hasProperty('platformVersion')) {
 		apply plugin: 'spring-io'
@@ -114,18 +107,6 @@ configure(subprojects.findAll {it.name != "spring-build-src"}) { subproject ->
 	}
 }
 
-project("spring-build-src") {
-        description = "Exposes gradle buildSrc for IDE support"
-        apply plugin: "groovy"
-
-        dependencies {
-                compile gradleApi()
-                compile localGroovy()
-        }
-
-        configurations.archives.artifacts.clear()
-}
-
 project("spring-binding") {
 	description = "Spring Binding"
 
@@ -367,14 +348,12 @@ configure(rootProject) {
 
 		subprojects.each { subproject ->
 			into ("${baseDir}/libs") {
-				if (subproject.name != "spring-build-src") {
-					from subproject.jar
-					if (subproject.tasks.findByPath("sourcesJar")) {
-						from subproject.sourcesJar
-					}
-					if (subproject.tasks.findByPath("javadocJar")) {
-						from subproject.javadocJar
-					}
+				from subproject.jar
+				if (subproject.tasks.findByPath("sourcesJar")) {
+					from subproject.sourcesJar
+				}
+				if (subproject.tasks.findByPath("javadocJar")) {
+					from subproject.javadocJar
 				}
 			}
 		}
diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
deleted file mode 100644
index 44d270ad..00000000
--- a/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright 2002-2015 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
-
-import org.gradle.api.*
-import org.gradle.api.artifacts.Configuration
-import org.gradle.api.artifacts.ProjectDependency;
-import org.gradle.api.artifacts.maven.Conf2ScopeMapping
-import org.gradle.api.plugins.MavenPlugin
-import org.gradle.plugins.ide.eclipse.EclipsePlugin
-import org.gradle.plugins.ide.idea.IdeaPlugin
-import org.gradle.api.invocation.*
-
-/**
- * Gradle plugin that allows projects to merged together. Primarily developed to
- * allow Spring to support multiple incompatible versions of third-party
- * dependencies (for example Hibernate v3 and v4).
- * <p>
- * The 'merge' extension should be used to define how projects are merged, for example:
- * <pre class="code">
- * configure(subprojects) {
- *     apply plugin: MergePlugin
- * }
- *
- * project("myproject") {
- * }
- *
- * project("myproject-extra") {
- *     merge.into = project("myproject")
- * }
- * </pre>
- * <p>
- * This plugin adds two new configurations:
- * <ul>
- * <li>merging - Contains the projects being merged into this project<li>
- * <li>runtimeMerge - Contains all dependencies that are merge projects. These are used
- * to allow an IDE to reference merge projects.</li>
- * <ul>
- *
- * @author Rob Winch
- * @author Phillip Webb
- */
-class MergePlugin implements Plugin<Project> {
-
-	private static boolean attachedProjectsEvaluated;
-
-	public void apply(Project project) {
-		project.plugins.apply(MavenPlugin)
-		project.plugins.apply(EclipsePlugin)
-		project.plugins.apply(IdeaPlugin)
-
-		MergeModel model = project.extensions.create("merge", MergeModel)
-		project.configurations.create("merging")
-		Configuration runtimeMerge = project.configurations.create("runtimeMerge")
-
-		// Ensure the IDE can reference merged projects
-		project.eclipse.classpath.plusConfigurations += [ runtimeMerge ]
-		project.idea.module.scopes.PROVIDED.plus += [ runtimeMerge ]
-
-		// Hook to perform the actual merge logic
-		project.afterEvaluate{
-			if (it.merge.into != null) {
-				setup(it)
-			}
-		}
-
-		// Hook to build runtimeMerge dependencies
-		if (!attachedProjectsEvaluated) {
-			project.gradle.projectsEvaluated{
-				postProcessProjects(it)
-			}
-			attachedProjectsEvaluated  = true;
-		}
-	}
-
-	private void setup(Project project) {
-		project.merge.into.dependencies.add("merging", project)
-		project.dependencies.add("provided", project.merge.into.sourceSets.main.output)
-		project.dependencies.add("runtimeMerge", project.merge.into)
-		setupTaskDependencies(project)
-		setupMaven(project)
-	}
-
-	private void setupTaskDependencies(Project project) {
-		// invoking a task will invoke the task with the same name on 'into' project
-		["sourcesJar", "jar", "javadocJar", "javadoc", "install", "artifactoryPublish"].each {
-			def task = project.tasks.findByPath(it)
-			if (task) {
-				task.enabled = false
-				task.dependsOn(project.merge.into.tasks.findByPath(it))
-			}
-		}
-
-		// update 'into' project artifacts to contain the source artifact contents
-		project.merge.into.sourcesJar.from(project.sourcesJar.source)
-		project.merge.into.jar.from(project.sourceSets.main.output)
-		project.merge.into.javadoc {
-			source += project.javadoc.source
-			classpath += project.javadoc.classpath
-		}
-	}
-
-	private void setupMaven(Project project) {
-		project.configurations.each { configuration ->
-			Conf2ScopeMapping mapping = project.conf2ScopeMappings.getMapping([configuration])
-			if (mapping.scope) {
-				Configuration intoConfiguration = project.merge.into.configurations.create(
-					project.name + "-" + configuration.name)
-				configuration.excludeRules.each {
-					configuration.exclude([
-						(ExcludeRule.GROUP_KEY) : it.group,
-						(ExcludeRule.MODULE_KEY) : it.module])
-				}
-				configuration.dependencies.each {
-					def intoCompile = project.merge.into.configurations.getByName("compile")
-					// Protect against changing a compile scope dependency (SPR-10218)
-					if (!intoCompile.dependencies.contains(it)) {
-						intoConfiguration.dependencies.add(it)
-					}
-				}
-				def index = project.parent.childProjects.findIndexOf {p -> p.getValue() == project}
-				project.merge.into.install.repositories.mavenInstaller.pom.scopeMappings.addMapping(
-					mapping.priority + 100 + index, intoConfiguration, mapping.scope)
-			}
-		}
-	}
-
-	private postProcessProjects(Gradle gradle) {
-		gradle.allprojects(new Action<Project>() {
-			public void execute(Project project) {
-				project.configurations.getByName("runtime").allDependencies.withType(ProjectDependency).each{
-					Configuration dependsOnMergedFrom = it.dependencyProject.configurations.getByName("merging");
-					dependsOnMergedFrom.dependencies.each{ dep ->
-						project.dependencies.add("runtimeMerge", dep.dependencyProject)
-					}
-				}
-			}
-		});
-	}
-}
-
-class MergeModel {
-	Project into;
-}
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties
deleted file mode 100644
index 9cef8041..00000000
--- a/buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class=org.springframework.build.gradle.MergePlugin