Make evaluation of dependencies for BOM genration lazy, and occur onl…

…y when withXml is called
nebula-plugins · Jul 13, 2016 · 11b9cbe · 11b9cbe
1 parent 0ac87bc
commit 11b9cbe
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/src/main/groovy/netflix/nebula/dependency/recommender/publisher/MavenBomXmlGenerator.groovy b/src/main/groovy/netflix/nebula/dependency/recommender/publisher/MavenBomXmlGenerator.groovy
@@ -24,7 +24,7 @@ class MavenBomXmlGenerator {
         else if(Iterable.class.isAssignableFrom(configurationsRet.class))
             configurations = configurationsRet
 
-        generateDependencyManagementXml(pub, configurations.collect { getManagedDependencies(it) }.flatten())
+        generateDependencyManagementXml(pub, { configurations.collect { getManagedDependencies(it) }.flatten() })
     }
 
     void withDependencies(Closure dependenciesClosure) {
@@ -38,10 +38,10 @@ class MavenBomXmlGenerator {
         else if(Iterable.class.isAssignableFrom(dependenciesRet.class))
             dependencies = dependenciesRet
 
-        generateDependencyManagementXml(pub, dependencies.collect { ModuleNotationParser.parse(it) })
+        generateDependencyManagementXml(pub, { dependencies.collect { ModuleNotationParser.parse(it) } })
     }
 
-    protected static generateDependencyManagementXml(MavenPublication pub, Iterable<ModuleVersionIdentifier> deps) {
+    protected static generateDependencyManagementXml(MavenPublication pub, Closure<Iterable<ModuleVersionIdentifier>> deps) {
         pub.pom.withXml {
             Node root = it.asNode()
             def dependencyManagement = root.getByName("dependencyManagement")
@@ -53,7 +53,7 @@ class MavenBomXmlGenerator {
             else
                 dependencies = dependencyManagement[0].getByName("dependencies")[0]
 
-            deps.each { mvid ->
+            deps.call().each { mvid ->
                 Node dep = dependencies.appendNode("dependency")
                 dep.appendNode("groupId").value = mvid.group
                 dep.appendNode("artifactId").value = mvid.name

diff --git a/...st/groovy/netflix/nebula/dependency/recommender/publisher/MavenBomXmlGeneratorSpec.groovy b/...st/groovy/netflix/nebula/dependency/recommender/publisher/MavenBomXmlGeneratorSpec.groovy
@@ -0,0 +1,31 @@
+package netflix.nebula.dependency.recommender.publisher
+
+import nebula.test.ProjectSpec
+import netflix.nebula.dependency.recommender.DependencyRecommendationsPlugin
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
+
+class MavenBomXmlGeneratorSpec extends ProjectSpec {
+    def 'configure a publication with BOM generation'() {
+        given:
+        project.plugins.apply(MavenPublishPlugin)
+        project.plugins.apply(DependencyRecommendationsPlugin)
+        project.configurations.create('recommendation')
+
+        project.publishing {
+            publications {
+                recommender(MavenPublication) {
+                    project.nebulaDependencyManagement.fromConfigurations {
+                        project.configurations.recommendation
+                    }
+                }
+            }
+        }
+
+        when:
+        project.publishing
+
+        then:
+        noExceptionThrown()
+    }
+}