Skip to content

Commit 7abb010

Browse files
committed
melting-pot: also log dependency:tree
It's nice to see where dependencies are coming from, even if the view is not complete due to pruning.
1 parent 89c9b82 commit 7abb010

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

melting-pot.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ deps() {
484484
debug "mvn -B -DincludeScope=runtime dependency:list"
485485
local depList="$(mvn -B -DincludeScope=runtime dependency:list)" ||
486486
die "Problem fetching dependencies!" 5
487-
echo "$depList" | grep '^\[INFO\] [^ ]' |
487+
echo "$depList" | grep '^\[INFO\] \w' |
488488
sed 's/\[INFO\] //' | sed 's/ .*//' | sort
489489
cd - > /dev/null
490490
}
@@ -722,7 +722,7 @@ successLog="$HOME/.cache/scijava/melting-pot/$1.success.log"
722722
mkdir -p "$(dirname "$successLog")"
723723
724724
# Record dependency configuration of successful build.
725-
deps=$(grep '^\[[^ ]*INFO[^ ]*\] ' "$buildLog" |
725+
deps=$(grep '^\[[^ ]*INFO[^ ]*\] \w' "$buildLog" |
726726
sed -e 's/^[^ ]* *//' -e 's/ -- .*//' -e 's/ (\([^)]*\))/-\1/' |
727727
sort | tr '\n' ',')
728728
if [ -z "$(containsLine "$deps" "$successLog")" ]
@@ -838,7 +838,7 @@ meltDown() {
838838
echo ' cd - >/dev/null' >> build.sh
839839
echo '}' >> build.sh
840840
echo >> build.sh
841-
echo 'mvnPin dependency:list &&' >> build.sh
841+
echo 'mvnPin dependency:list dependency:tree &&' >> build.sh
842842
echo >> build.sh
843843
echo 'if [ -f gav ]' >> build.sh
844844
echo 'then' >> build.sh

0 commit comments

Comments
 (0)