Fix dependency exclusion for transitives (#214)

Author: simontoens

misc/extdeps_pomgen.py

@@ -52,8 +52,8 @@ def _parse_arguments(args):
 class ThirdPartyDepsPomGen(pom.DynamicPomGen):
 
     def __init__(self, workspace, artifact_def, dependencies, pom_template):
-        super(ThirdPartyDepsPomGen, self).__init__(workspace, artifact_def,
-                                                   pom_template=pom_template)
+        super(ThirdPartyDepsPomGen, self).__init__(
+            workspace, artifact_def, pom_template=pom_template, excluded_deps=[])
         self.dependencies = dependencies
 
 

src/crawl/artifactgenctx.py

@@ -6,7 +6,7 @@ class ArtifactGenerationContext:
     Information about a single artifact that was crawled.
     """
 
-    def __init__(self, workspace, pom_template, artifact_def, label):
+    def __init__(self, workspace, pom_template, artifact_def, label, excluded_deps):
         self._artifact_def = artifact_def
         self._label = label
 
@@ -15,7 +15,7 @@ def __init__(self, workspace, pom_template, artifact_def, label):
         self._library_transitive_closure = []
 
         self._generator = crawl.pom.get_pom_generator(
-            workspace, pom_template, artifact_def)
+            workspace, pom_template, artifact_def, excluded_deps)
 
     @property
     def artifact_def(self):

src/crawl/crawler.py

@@ -548,8 +548,10 @@ def _crawl(self, label, parent_node, follow_references):
             self.package_to_artifact[label.package_path] = artifact_def
             self.library_to_artifact[artifact_def.library_path].append(artifact_def)
 
+            _, excluded_deps = self._load_custom_output_dependencies(artifact_def)
             artifactctx = artifactgenctx.ArtifactGenerationContext(
-                self.workspace, self.pom_template, artifact_def, label)
+                self.workspace, self.pom_template, artifact_def, label,
+                excluded_deps)
             self.genctxs.append(artifactctx)
             labels = self._discover_dependencies(artifact_def, label)
             # TODO abstract this, as it assumes maven_install

src/crawl/pom.py

@@ -34,7 +34,7 @@ class PomContentType:
     MASKED_VERSION = "***"
 
 
-def get_pom_generator(workspace, pom_template, artifact_def):
+def get_pom_generator(workspace, pom_template, artifact_def, excluded_deps):
     """
     Returns a pom.xml generator (AbstractPomGen implementation) for the
     specified artifact_def.
@@ -52,9 +52,9 @@ def get_pom_generator(workspace, pom_template, artifact_def):
         also_generate_dep_man_pom = artifact_def.gen_dependency_management_pom
         if also_generate_dep_man_pom:
             return PomWithCompanionDependencyManagementPomGen(
-                workspace, artifact_def, pom_template)
+                workspace, artifact_def, pom_template, excluded_deps)
         else:
-            return DynamicPomGen(workspace, artifact_def, pom_template)
+            return DynamicPomGen(workspace, artifact_def, pom_template, excluded_deps)
     elif mode is pomgenmode.TEMPLATE:
         return TemplatePomGen(workspace, artifact_def)
     elif mode is pomgenmode.SKIP:
@@ -471,10 +471,11 @@ class DynamicPomGen(AbstractPomGen):
        #{group_id}
        #{version}
     """
-    def __init__(self, workspace, artifact_def, pom_template):
+    def __init__(self, workspace, artifact_def, pom_template, excluded_deps):
         super(DynamicPomGen, self).__init__(workspace, artifact_def)
         self.pom_content = workspace.pom_content
         self.pom_template = pom_template
+        self.excluded_deps = excluded_deps
 
     def gen(self, pomcontenttype):
         content = self.pom_template.replace("#{group_id}", self._artifact_def.group_id)
@@ -538,8 +539,14 @@ def _get_transitive_deps(self, dependencies):
                     # <dependencies> section, we don't need to include it again
                     pass
                 else:
-                    transitives.append(transitive)
-                    transitives_set.add(transitive)
+                    if transitive not in self.excluded_deps:
+                        # TODO stoens: this loop should really use
+                        # self.dependencies_library_transitive_closure instead
+                        # of dependencies (the directs)
+                        # the exclusions have been applied to that former list
+                        # already - review if that is possible
+                        transitives.append(transitive)
+                        transitives_set.add(transitive)
 
         return transitives
 
@@ -606,9 +613,9 @@ class PomWithCompanionDependencyManagementPomGen(AbstractPomGen):
     Composite PomGen implementation with a companion PomGen the generates a
     DependencyManagement pom.
     """
-    def __init__(self, workspace, artifact_def, pom_template):
+    def __init__(self, workspace, artifact_def, pom_template, excluded_deps):
         super(PomWithCompanionDependencyManagementPomGen, self).__init__(workspace, artifact_def)
-        self.pomgen = DynamicPomGen(workspace, artifact_def, pom_template)
+        self.pomgen = DynamicPomGen(workspace, artifact_def, pom_template, excluded_deps)
         self.depmanpomgen = DependencyManagementPomGen(workspace, artifact_def, pom_template)
 
     def register_dependencies(self, dependencies):

tests/crawlerunittest.py

@@ -576,7 +576,7 @@ def test_register_dependencies(self):
                                  library_path=library_path)
         ws = self._get_workspace()
         ctx = artifactgenctx.ArtifactGenerationContext(
-            ws, pom_template, node1.artifact_def, node1.label)
+            ws, pom_template, node1.artifact_def, node1.label, excluded_deps=[])
         strategy = pomgenerationstrategy.PomGenerationStrategy(ws, pom_template)
         crawler = crawlerm.Crawler(ws, strategy, pom_template)
         crawler.library_to_nodes[library_path].append(node1)
@@ -608,7 +608,7 @@ def test_register_dependencies_with_exclusions(self):
                                  library_path=library_path)
         ws = self._get_workspace()
         ctx = artifactgenctx.ArtifactGenerationContext(
-            ws, pom_template, node1.artifact_def, node1.label)
+            ws, pom_template, node1.artifact_def, node1.label, excluded_deps=[])
         strategy = pomgenerationstrategy.PomGenerationStrategy(ws, pom_template)
         crawler = crawlerm.Crawler(ws, strategy, pom_template)
         crawler.library_to_nodes[library_path].append(node1)

tests/pomtest.py

@@ -70,7 +70,7 @@ def test_dynamic_pom__sanity(self):
                                  label_to_overridden_fq_label={})
         artifact_def = buildpom.MavenArtifactDef("g1", "a2", "1.2.3")
         artifact_def = buildpom._augment_art_def_values(artifact_def, None, "pack1", None, None, pomgenmode.DYNAMIC)
-        pomgen = pom.DynamicPomGen(ws, artifact_def, TEST_POM_TEMPLATE)
+        pomgen = pom.DynamicPomGen(ws, artifact_def, TEST_POM_TEMPLATE, [])
 
         deps = [self.guava_dep,
                 self.logback_dep,
@@ -201,7 +201,7 @@ def test_dynamic_pom__gen_description(self):
 </project>
 """
         artifact_def = buildpom.MavenArtifactDef("g1", "a2", "1.2.3", bazel_target="t1")
-        pomgen = pom.DynamicPomGen(ws, artifact_def, pom_template)
+        pomgen = pom.DynamicPomGen(ws, artifact_def, pom_template, [])
         generated_pom = pomgen.gen(pom.PomContentType.RELEASE)
         self.assertEqual(exepcted_pom, generated_pom)
 
@@ -227,7 +227,7 @@ def test_dynamic_pom__remove_description_token_if_no_value(self):
 </project>
 """
         artifact_def = buildpom.MavenArtifactDef("g1", "a2", "1.2.3", bazel_target="t1")
-        pomgen = pom.DynamicPomGen(ws, artifact_def, pom_template)
+        pomgen = pom.DynamicPomGen(ws, artifact_def, pom_template, [])
 
         generated_pom = pomgen.gen(pom.PomContentType.RELEASE)
 
@@ -253,7 +253,7 @@ def test_dyamic_pom__no_explicit_transitives(self):
                                  pomcontent.NOOP,
                                  depmd,
                                  label_to_overridden_fq_label={})
-        pomgen = pom.DynamicPomGen(ws, artifact_def, TEST_POM_TEMPLATE)
+        pomgen = pom.DynamicPomGen(ws, artifact_def, TEST_POM_TEMPLATE, [])
         pomgen.register_dependencies([self.guava_dep])
 
         generated_pom = pomgen.gen(pom.PomContentType.RELEASE)
@@ -279,7 +279,7 @@ def test_dynamic_pom__classifier(self):
                                  label_to_overridden_fq_label={})
         root_artifact_def = buildpom.MavenArtifactDef("g1", "a2", "1.2.3")
         root_artifact_def = buildpom._augment_art_def_values(root_artifact_def, None, "pack1", None, None, pomgenmode.DYNAMIC)
-        pomgen = pom.DynamicPomGen(ws, root_artifact_def, TEST_POM_TEMPLATE)
+        pomgen = pom.DynamicPomGen(ws, root_artifact_def, TEST_POM_TEMPLATE, [])
         dep_art_def = buildpom.MavenArtifactDef("class-group", "class-art", "1", bazel_target="g1")
         dep = dependency.new_dep_from_maven_artifact_def(dep_art_def)
 
@@ -306,7 +306,7 @@ def test_dynamic_pom__do_not_include_deps(self):
                                  label_to_overridden_fq_label={})
         artifact_def = buildpom.MavenArtifactDef(
             "g1", "a2", "1.2.3", bazel_target="t1", include_deps=False)
-        pomgen = pom.DynamicPomGen(ws, artifact_def, "")
+        pomgen = pom.DynamicPomGen(ws, artifact_def, "", [])
 
         generated_pom = pomgen.gen(pom.PomContentType.RELEASE)
 
@@ -325,7 +325,7 @@ def test_dynamic_pom_genmode__goldfile(self):
                                  label_to_overridden_fq_label={})
         artifact_def = buildpom.MavenArtifactDef("g1", "a2", "1.2.3", bazel_target="t1")
         artifact_def = buildpom._augment_art_def_values(artifact_def, None, "pack1", None, None, pomgenmode.DYNAMIC)
-        pomgen = pom.DynamicPomGen(ws, artifact_def, TEST_POM_TEMPLATE)
+        pomgen = pom.DynamicPomGen(ws, artifact_def, TEST_POM_TEMPLATE, [])
         deps = [self.guava_dep, self.aop_dep]
         pomgen.register_dependencies(deps)