Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions scanpipe/pipelines/inspect_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

from aboutcode.pipeline import optional_step
from scanpipe.pipelines.scan_codebase import ScanCodebase
from scanpipe.pipes import maven
from scanpipe.pipes import scancode


Expand Down Expand Up @@ -50,6 +51,7 @@ def steps(cls):
cls.flag_empty_files,
cls.flag_ignored_resources,
cls.scan_for_application_packages,
cls.fix_maven_jar_packages,
cls.resolve_dependencies,
)

Expand All @@ -65,6 +67,10 @@ def scan_for_application_packages(self):
progress_logger=self.log,
)

def fix_maven_jar_packages(self):
"""Fix JAR packages that should be Maven packages based on pom.properties."""
maven.detect_maven_jars_from_pom_properties(self.project, logger_func=self.log)

@optional_step("StaticResolver")
def resolve_dependencies(self):
"""
Expand Down
6 changes: 6 additions & 0 deletions scanpipe/pipelines/scan_codebase.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

from scanpipe import pipes
from scanpipe.pipelines import Pipeline
from scanpipe.pipes import maven
from scanpipe.pipes import scancode
from scanpipe.pipes.input import copy_inputs

Expand All @@ -44,6 +45,7 @@ def steps(cls):
cls.flag_empty_files,
cls.flag_ignored_resources,
cls.scan_for_application_packages,
cls.fix_maven_jar_packages,
cls.scan_for_files,
cls.collect_and_create_license_detections,
)
Expand All @@ -63,6 +65,10 @@ def scan_for_application_packages(self):
"""Scan unknown resources for packages information."""
scancode.scan_for_application_packages(self.project, progress_logger=self.log)

def fix_maven_jar_packages(self):
"""Fix JAR packages that should be Maven packages based on pom.properties."""
maven.detect_maven_jars_from_pom_properties(self.project, logger_func=self.log)

def scan_for_files(self):
"""Scan unknown resources for copyrights, licenses, emails, and urls."""
scancode.scan_for_files(self.project, progress_logger=self.log)
Expand Down
Loading