File tree Expand file tree Collapse file tree 1 file changed +20
-7
lines changed Expand file tree Collapse file tree 1 file changed +20
-7
lines changed Original file line number Diff line number Diff line change @@ -15,16 +15,29 @@ props() {
1515 if [ -e " $1 " ]
1616 then
1717 # extract version properties from the given file path
18- versions =$( cat " $1 " )
18+ pomContent =$( cat " $1 " )
1919 else
20- url=" $repo /org/scijava/pom-scijava/$1 /pom-scijava-$1 .pom"
21- versions=$( curl -s " $url " )
2220 # assume argument is a version number of pom-scijava
21+ pomURL=" $repo /org/scijava/pom-scijava/$1 /pom-scijava-$1 .pom"
22+ pomContent=$( curl -s " $pomURL " )
2323 fi
24- echo " $versions " | \
25- grep ' \.version>' | \
26- sed -E -e ' s/^ (.*)/\1 [DEV]/' | \
27- sed -E -e ' s/^ *<(.*)\.version>(.*)<\/.*\.version>/\1 = \2/' | \
24+
25+ # grep the pom-scijava-base parent version of out of the POM,
26+ # then rip out the version properties from that one as well!
27+ psbVersion=$( echo " $pomContent " |
28+ grep -A1 ' <artifactId>pom-scijava-base' |
29+ grep ' <version>' | sed ' s;.*>\([^<]*\)<.*;\1;' )
30+ psbContent=
31+ if [ " $psbVersion " ]
32+ then
33+ psbURL=" $repo /org/scijava/pom-scijava-base/$psbVersion /pom-scijava-base-$psbVersion .pom"
34+ psbContent=$( curl -s " $psbURL " )
35+ fi
36+
37+ { echo " $pomContent " ; echo " $psbContent " ; } |
38+ grep ' \.version>' |
39+ sed -E -e ' s/^ (.*)/\1 [DEV]/' |
40+ sed -E -e ' s/^ *<(.*)\.version>(.*)<\/.*\.version>/\1 = \2/' |
2841 sort
2942}
3043
You can’t perform that action at this time.
0 commit comments