File tree Expand file tree Collapse file tree 1 file changed +10
-3
lines changed Expand file tree Collapse file tree 1 file changed +10
-3
lines changed Original file line number Diff line number Diff line change 678
678
a=${apv%%:* }
679
679
v=${apv##*: }
680
680
bomV=$( grep -o " -D$g \.$a \.version=[^ ]*" " $dir /build.sh" | sed ' s;.*=;;' )
681
- if [ "$bomV " != "$v " ]
681
+ if [ "$bomV " != "${bomV#* -SNAPSHOT* } " ]
682
+ then
683
+ warn "$1 : Snapshot dependency pin detected: $g :$a :$bomV -- forcing a rebuild"
684
+ exit 0
685
+ elif [ "$bomV " != "$v " ]
682
686
then
683
687
# G:A property is not set to this V.
684
688
# Now check if the property is even declared.
@@ -744,7 +748,7 @@ mkdir -p "$(dirname "$successLog")"
744
748
deps=$( grep ' ^\[[^ ]*INFO[^ ]*\] \w' " $buildLog " |
745
749
sed -e ' s/^[^ ]* *//' -e ' s/ -- .*//' -e ' s/ (\([^)]*\))/-\1/' |
746
750
sort | tr ' \n' ' ,' )
747
- if [ -z "$( containsLine " $deps " " $successLog " ) " ]
751
+ if [ " $deps " = " ${deps %* -SNAPSHOT * } " -a -z "$( containsLine " $deps " " $successLog " ) " ]
748
752
then
749
753
# NB: *Prepend*, rather than append, the new successful configuration.
750
754
# We do this because it is more likely this new configuration will be
@@ -891,7 +895,10 @@ meltDown() {
891
895
local gav=" $g :$a :$v "
892
896
if [ " $( isIncluded " $gav " ) " ]
893
897
then
894
- if [ " $( ./prior-success.sh " $g /$a " ) " ]
898
+ if [ " $v " != " ${v% -SNAPSHOT} " ]
899
+ then
900
+ info " $g :$a : forcing inclusion due to SNAPSHOT version"
901
+ elif [ " $( ./prior-success.sh " $g /$a " ) " ]
895
902
then
896
903
info " $g :$a : skipping version $v due to prior successful build"
897
904
continue
You can’t perform that action at this time.
0 commit comments