From 1dacb62a8ded196f3056b5bc2a0f38cfc1658dd7 Mon Sep 17 00:00:00 2001 From: Leo Zhang Date: Tue, 10 Aug 2021 15:59:51 -0700 Subject: [PATCH] fix(maven): Pass settings file path as separate exec arg (#327) --- Changelog.md | 6 +++++- src/Strategy/Maven/DepTree.hs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 10d4545ea..3fac3dd4d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,8 +1,12 @@ # Spectrometer Changelog +## v2.14.5 + +- Maven: Fixes an issue where projects with `settings.xml` files would not be analyzed correctly using the `dependency:tree` tactic. ([#327](https://github.com/fossas/spectrometer/pull/327)) + ## v2.14.4 -- Gradle: Fixes an issue where all dependencies would appear as direct ([#319](https://github.com/fossas/spectrometer/pull/319)) +- Gradle: Fixes an issue where all dependencies would appear as direct. ([#319](https://github.com/fossas/spectrometer/pull/319)) ## v2.14.3 diff --git a/src/Strategy/Maven/DepTree.hs b/src/Strategy/Maven/DepTree.hs index 29220aa33..0224233f8 100644 --- a/src/Strategy/Maven/DepTree.hs +++ b/src/Strategy/Maven/DepTree.hs @@ -80,7 +80,7 @@ deptreeCmd settingsFile outputFile = -- the failing module.) "--fail-at-end" ] - <> maybe [] (\p -> ["--settings " <> toText (fromAbsFile p)]) settingsFile + <> maybe [] (\file -> ["--settings", toText file]) settingsFile , -- `mvn dependency:tree` will exit non-zero when the build of any module -- in a multi-module build fails. However, this should not cause an Exec -- failure, since we can still get partial results.