From 12e0dc5bd18ff49338ef7f98839ca178abb4de58 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 7 Aug 2023 18:03:44 -0700 Subject: [PATCH] Always merge ancestor pom data #160 Signed-off-by: Jono Yang --- minecode/visitors/maven.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/minecode/visitors/maven.py b/minecode/visitors/maven.py index 6e7b768d..7fd70ac7 100644 --- a/minecode/visitors/maven.py +++ b/minecode/visitors/maven.py @@ -247,9 +247,7 @@ def merge_parent(package, parent_package): def merge_ancestors(ancestor_pom_texts, package): """ - Merge metadata from `ancestor_pom_text` into `package`. Skip merging - metadata from an ancestor if the ancestor's namespace is not contained in - the `package`'s namespace. + Merge metadata from `ancestor_pom_text` into `package`. The order of POM content in `ancestor_pom_texts` is expected to be in the order of oldest ancestor to newest. @@ -261,14 +259,6 @@ def merge_ancestors(ancestor_pom_texts, package): primary_language='Java', text=ancestor_pom_text ) - if ancestor_package.namespace not in package.namespace: - msg = f'merge_ancestors: {ancestor_package.purl} data not added to package: ancestor package namespace is not contained in {package.purl} namespace' - history = package.extra_data.get('history') - if history: - package.extra_data['history'].append(msg) - else: - package.extra_data['history'] = [msg] - continue package = merge_parent(package, ancestor_package) return package