Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix distribution patch differences script
[releng/builder.git]
/
jjb
/
integration
/
multipatch-distribution.sh
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
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)"
# 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
# Replace version
find ./yangtools -name "*.xml" -print0 | xargs -0 sed -i "s/${patch_version}/${msi_version}/g"
else