Revise Maven-based tests/builds
- Rename jobs to match current naming scheme
- Allow jobs to be renamed so they can be used with both JDK 8 and 11
- Run tests and publish junit/cobertura if found
- Move repo jobs into the verify dir from the maven dir to match others
- Update tagcollision/versiontag to parse versions from pom.xml files
Change-Id: I5e9da20bbdcb0edc62bb35e171aa4e13f91c2ab1
diff --git a/jjb/shell/tagcollisionreject.sh b/jjb/shell/tagcollisionreject.sh
index 85015d4..49d6e21 100755
--- a/jjb/shell/tagcollisionreject.sh
+++ b/jjb/shell/tagcollisionreject.sh
@@ -41,6 +41,10 @@
then
NEW_VERSION=$(python -c 'import json,sys;obj=json.load(sys.stdin); print obj["version"]' < package.json)
VERSIONFILE="package.json"
+ elif [ -f "pom.xml" ]
+ then
+ NEW_VERSION=$(xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' pom.xml)
+ VERSIONFILE="pom.xml"
else
echo "ERROR: No versioning file found!"
exit 1