using latest bdio and not using the builder anymore

blackducksoftware · Jun 18, 2017 · 1a497b4 · 1a497b4
1 parent 6fdc2d9
commit 1a497b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -94,7 +94,7 @@ signing {
 }
 
 dependencies {
-    compile 'com.blackducksoftware.integration:integration-bdio:4.0.0'
+    compile 'com.blackducksoftware.integration:integration-bdio:4.0.1'
 
     compile gradleApi()
 }
diff --git a/src/main/groovy/com/blackducksoftware/integration/gradle/DependencyGatherer.groovy b/src/main/groovy/com/blackducksoftware/integration/gradle/DependencyGatherer.groovy
@@ -9,7 +9,6 @@ import org.gradle.api.artifacts.ResolvedDependency
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-import com.blackducksoftware.integration.hub.bdio.simple.DependencyNodeBuilder
 import com.blackducksoftware.integration.hub.bdio.simple.model.DependencyNode
 import com.blackducksoftware.integration.hub.bdio.simple.model.externalid.MavenExternalId
 import com.blackducksoftware.integration.util.ExcludedIncludedFilter
@@ -18,7 +17,6 @@ class DependencyGatherer {
     private final Logger logger = LoggerFactory.getLogger(DependencyGatherer.class)
 
     private Set<String> alreadyAddedIds
-    private DependencyNodeBuilder dependencyNodeBuilder
 
     DependencyNode getFullyPopulatedRootNode(final Project rootProject, String excludedProjectNames, String includedProjectNames, String excludedConfigurationNames, String includedConfigurationNames) {
         /**
@@ -34,7 +32,6 @@ class DependencyGatherer {
         ExcludedIncludedFilter projectFilter = new ExcludedIncludedFilter(excludedProjectNames, includedProjectNames)
         ExcludedIncludedFilter configurationFilter = new ExcludedIncludedFilter(excludedConfigurationNames, includedConfigurationNames)
         alreadyAddedIds = new HashSet<>()
-        dependencyNodeBuilder = new DependencyNodeBuilder(rootProjectNode)
 
         rootProject.allprojects.each { project ->
             if (projectFilter.shouldInclude(project.name)) {
@@ -85,7 +82,7 @@ class DependencyGatherer {
 
         def mavenExternalId = new MavenExternalId(group, name, version)
         def dependencyNode = new DependencyNode(name, version, mavenExternalId)
-        dependencyNodeBuilder.addChildNodeWithParents(dependencyNode, [parentDependencyNode])
+        parentDependencyNode.children.add(dependencyNode)
         if (alreadyAddedIds.add(mavenExternalId.createDataId())) {
             for (ResolvedDependency child : resolvedDependency.getChildren()) {
                 addDependencyNodeToParent(dependencyNode, child)