Extract the yangtools version correctly

yang-binding no longer defines yangtools in its own dependency
management, it relies on dom-parent for that. Tighten the XPath
expression to limit the dependency to yangtools-artifacts.

Change-Id: I24a0af87b0a461ba9e5d371e753c969969213be4
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh
index 2db7b71d17149bc177c31bd7d08b5a4acf76604b..eac630698ebbee1b5c047085159e3a2489e55868 100755 (executable)
--- a/jjb/integration/multipatch-distribution.sh
+++ b/jjb/integration/multipatch-distribution.sh
@@ -181,10 +181,10 @@ if [[ -d "odlparent" ]]; then
     fi
 fi
 if [[ -d "yangtools" ]]; then
-        if [[ -d "mdsal" ]]; then
+    if [[ -d "mdsal" ]]; then
         # Extract patch and MSI used version
         patch_version="$(xpath ./yangtools/pom.xml '/project/version/text()' 2> /dev/null)"
-        msi_version="$(xpath ./mdsal/binding/yang-binding/pom.xml '/project/dependencyManagement/dependencies/dependency/version/text()' 2> /dev/null)"
+        msi_version="$(xpath ./mdsal/dom/dom-parent/pom.xml '/project/dependencyManagement/dependencies/dependency[artifactId="yangtools-artifacts"]/version/text()' 2> /dev/null)"
         # Replace version
         find ./yangtools -name "*.xml" -print0 | xargs -0 sed -i "s/${patch_version}/${msi_version}/g"
     else