root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

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
This commit is contained in:
Rob Winch 2013-05-22 14:57:10 -05:00
parent bf205bfe79
commit 07b7553355
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
View File

@ -121,7 +121,7 @@ class MergePlugin implements Plugin<Project> {
project.configurations.each { configuration -> project.configurations.each { configuration ->
Conf2ScopeMapping mapping = project.conf2ScopeMappings.getMapping([configuration]) Conf2ScopeMapping mapping = project.conf2ScopeMappings.getMapping([configuration])
if(mapping.scope) { if(mapping.scope) {
Configuration intoConfiguration = project.merge.into.create( Configuration intoConfiguration = project.merge.into.configurations.create(
project.name + "-" + configuration.name) project.name + "-" + configuration.name)
configuration.excludeRules.each { configuration.excludeRules.each {
configuration.exclude([ 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 { class MergeModel {