Author: nickboldt Date: 2011-03-24 21:15:52 -0400 (Thu, 24 Mar 2011) New Revision: 30007 Modified: trunk/build/util/checkPOMvsManifest.sh Log: fix warnings text and suppress parent pom from check; grab first version in file instead of last one (to avoid hitting dependencies) Modified: trunk/build/util/checkPOMvsManifest.sh =================================================================== --- trunk/build/util/checkPOMvsManifest.sh 2011-03-25 01:01:49 UTC (rev 30006) +++ trunk/build/util/checkPOMvsManifest.sh 2011-03-25 01:15:52 UTC (rev 30007) @@ -17,37 +17,48 @@ d=${f/META-INF\/MANIFEST.MF/}; #assume plugin if [[ $d == $f ]]; then #else feature d=${f/feature.xml/} - artVersionLine=$(cat $f | egrep "version=\"[0-9]\.[0-9]\.[0-9]\.qualifier" | egrep "[0-9]\.[0-9]\.[0-9]") - if [[ ! $artVersionLine ]]; then # not a snapshot version - artVersionLine=$(cat $f | head -7 | egrep "version=\"[0-9]\.[0-9]\.[0-9].*\".*" | egrep "[0-9]\.[0-9]\.[0-9]" | tail -1) - artVersion=${artVersionLine##*version=\"} - artVersion=${artVersion%%\"*} - #echo "[WARNING] [$altVersion] ${d}feature.xml not .qualifier version." + artVersionLine=$(cat $f | head -7 | egrep "version=\"[0-9]\.[0-9]\.[0-9].*\".*" | egrep "[0-9]\.[0-9]\.[0-9]" | tail -1) + artVersion=${artVersionLine##*version=\"} + #z=${artVersion##.qualifier*}; echo "[$z]" + if [[ ${artVersion##*.qualifier*} == "" ]]; then # has a qualifier + true else - artVersion=${artVersionLine##*version=\"} - artVersion=${artVersion%%.qualifier*} + av=${artVersion%%\"*} + echo "[WARNING] No .qualifer in [$av] ${d}feature.xml" + av="" + #echo "artVersion[2] = $artVersion" fi - artVersionLine=" "$altVersionLine + artVersion=${artVersion%%.qualifier*} + artVersion=${artVersion%%\"*} + artVersionLine=" "$artVersionLine else artVersionLine=$(cat $f | egrep "Bundle-Version: " | egrep "[0-9]\.[0-9]\.[0-9]" | tr "\r\t\n" "\n" ) artVersion=${artVersionLine##*: } - artVersion=${artVersion%%.qualifier} + #z=${artVersion##.qualifier*}; echo "[$z]" + if [[ ${artVersion##*.qualifier*} == "" ]]; then # has a qualifier + true + else + av=${artVersion%%\"*} + echo "[WARNING] No .qualifier in [$av] ${d}" + av="" + #echo "artVersion[2] = $artVersion" + fi + artVersion=${artVersion%%.qualifier*} artVersionLine=" "$artVersionLine fi if [[ -f $d/pom.xml ]]; then - pomVersionLine=$(cat $d/pom.xml | sed "s/\t//" | egrep "\.[0-9]-SNAPSHOT" | egrep "[0-9]\.[0-9]\.[0-9]" | tail -1) - if [[ ! $pomVersionLine ]]; then # not a snapshot version - #echo "pomVersionLine[1] = $pomVersionLine" - pomVersionLine=$(cat $d/pom.xml | sed "s/\t//" | egrep "<version>" | egrep "[0-9]\.[0-9]\.[0-9]" | tail -1) - pomVersion=${pomVersionLine%%</version>*} - pomVersion=${pomVersion#*<version>} - #echo "[WARNING] [$pomVersion] ${d}pom.xml not SNAPSHOT version." + pomVersionLine=$(cat $d/pom.xml | 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 else - #echo "pomVersionLine[2] = $pomVersionLine" - pomVersion=${pomVersionLine%%-SNAPSHOT*} - pomVersion=${pomVersion#*<version>} + pv=${pomVersion#*<version>} + echo "[WARNING] No -SNAPSHOT in [$pv] ${d}pom.xml" + pv="" fi + pomVersion=${pomVersion%%-SNAPSHOT*} + pomVersion=${pomVersion#*<version>} pomVersionLine=" "$pomVersionLine if [[ $artVersion != $pomVersion ]]; then @@ -68,7 +79,7 @@ true fi else - echo "[WARNING] $d contains no pom.xml" + echo "[WARNING] No pom.xml in $d" fi done