Author: nickboldt Date: 2011-03-24 21:34:14 -0400 (Thu, 24 Mar 2011) New Revision: 30011 Modified: trunk/build/util/checkPOMvsManifest.sh Log: suck out ranges of text instead of start + 4 lines; remove both parent and dependencies Modified: trunk/build/util/checkPOMvsManifest.sh =================================================================== --- trunk/build/util/checkPOMvsManifest.sh 2011-03-25 01:16:53 UTC (rev 30010) +++ trunk/build/util/checkPOMvsManifest.sh 2011-03-25 01:34:14 UTC (rev 30011) @@ -48,7 +48,7 @@ fi if [[ -f $d/pom.xml ]]; then - pomVersionLine=$(cat $d/pom.xml | sed '/<parent>/,+4 d' | sed "s/\t//" | egrep "<version>" | egrep "[0-9]\.[0-9]\.[0-9]" | head -1) + pomVersionLine=$(cat $d/pom.xml | sed '/<parent>/,/<\/parent>/ d' | sed '/<dependency>/,/<\/dependency>/ d' | sed '/<parent>/,+4 d' | sed "s/\t//" | egrep "<version>" | egrep "[0-9]\.[0-9]\.[0-9]" | head -1) pomVersion=${pomVersionLine%%</version>*} if [[ ${pomVersion##*-SNAPSHOT*} == "" ]]; then # has a -SNAPSHOT suffix true