Merge pull request #15 from rspieldenner/circulartestfailure

Circulartestfailure

Author: rspieldenner

CHANGELOG.md

@@ -1,3 +1,7 @@
+1.2.2 / 2016/04/25
+==================
+- BUGFIX: Handle circularish dependencies B depends on A for compile, A depends on B for testCompile
+
 1.2.1 / 2016/04/19
 ==================
 - BUGFIX: Make sure resolutionRules configuration can be locked by nebula.dependency-lock

README.md

@@ -21,7 +21,7 @@ The [Blacklist Plugin](https://github.com/nebula-plugins/gradle-blacklist-plugin
         }
 
         dependencies {
-            classpath 'com.netflix.nebula:gradle-resolution-rules-plugin:1.2.1'
+            classpath 'com.netflix.nebula:gradle-resolution-rules-plugin:1.2.2'
         }
     }
 
@@ -32,7 +32,7 @@ Or using the Gradle plugin portal:
 
 ```groovy
     plugins {
-        id 'nebula.resolution-rules' version '1.2.1'
+        id 'nebula.resolution-rules' version '1.2.2'
     }
 ```
 
@@ -149,7 +149,7 @@ The `nebula.resolution-rules-producer` plugin is provided to facilitate creation
         }
 
         dependencies {
-            classpath 'com.netflix.nebula:gradle-resolution-rules-plugin:1.2.0'
+            classpath 'com.netflix.nebula:gradle-resolution-rules-plugin:1.2.2'
         }
     }
 
@@ -160,7 +160,7 @@ Or using the Gradle plugin portal:
 
 ```groovy
     plugins {
-        id 'nebula.resolution-rules-producer' version '1.2.0'
+        id 'nebula.resolution-rules-producer' version '1.2.2'
     }
 ```
 

src/functionalTest/groovy/nebula/plugin/resolutionrules/AlignRulesMultiprojectSpec.groovy

@@ -102,6 +102,13 @@ class AlignRulesMultiprojectSpec extends IntegrationSpec {
             {
                 "deny": [], "reject": [], "substitute": [], "replace": [],
                 "align": [
+                    {
+                        "name": "testNebula",
+                        "group": "test",
+                        "reason": "Align test.nebula dependencies",
+                        "author": "Example Person <person@example.org>",
+                        "date": "2016-03-17T20:21:20.368Z"
+                    }
                 ]
             }
         '''.stripIndent()

src/main/groovy/nebula/plugin/resolutionrules/ResolutionRulesPlugin.groovy

@@ -39,7 +39,7 @@ class ResolutionRulesPlugin implements Plugin<Project> {
         def extension = project.extensions.create('nebulaResolutionRules', NebulaResolutionRulesExtension)
 
         project.gradle.projectsEvaluated {
-            project.configurations.all{ Configuration config ->
+            project.configurations.all { Configuration config ->
                 if (config.name == configurationName) {
                     return
                 }

src/main/groovy/nebula/plugin/resolutionrules/Rules.groovy

@@ -210,6 +210,7 @@ class AlignRules implements ProjectConfigurationRule {
         }
 
         def detached = configuration.copyRecursive()
+        detached.exclude group: project.group, module: project.name
         def artifacts
         if (detached.resolvedConfiguration.hasError()) {
             project.logger.info('Cannot resolve all dependencies to align')