IGNITE-15303 Maven Sanity Check is broken in main branch (#277)
diff --git a/check-rules/maven-check-scripts/CheckModulesInRootPomAreSorted.sh b/check-rules/maven-check-scripts/CheckModulesInRootPomAreSorted.sh
index 611c3ac..a62c16c 100644
--- a/check-rules/maven-check-scripts/CheckModulesInRootPomAreSorted.sh
+++ b/check-rules/maven-check-scripts/CheckModulesInRootPomAreSorted.sh
@@ -16,7 +16,7 @@
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/../.."
-xpath -e "project/modules/module/text()" ${ROOT}/pom.xml 2>/dev/null > current-list
+xpath -q -e "project/modules/module/text()" ${ROOT}/pom.xml > current-list
cat current-list | sort -h > sorted-list
DIFF="$(diff current-list sorted-list || true)"
if [ "${DIFF}" != "" ]; then
diff --git a/check-rules/maven-check-scripts/CheckUnusedDependenciesAndPluginsInParent.sh b/check-rules/maven-check-scripts/CheckUnusedDependenciesAndPluginsInParent.sh
index f0a390f..97f2b69 100644
--- a/check-rules/maven-check-scripts/CheckUnusedDependenciesAndPluginsInParent.sh
+++ b/check-rules/maven-check-scripts/CheckUnusedDependenciesAndPluginsInParent.sh
@@ -19,8 +19,7 @@
POMS=$(find ${ROOT} -name pom.xml | grep -v parent)
for xpath in "project/dependencyManagement/dependencies/dependency/artifactId/text()" \
"project/build/pluginManagement/plugins/plugin/artifactId/text()"; do
- xpath -e "${xpath}" ${ROOT}/parent/pom.xml 2>&1 | \
- grep -vE '(NODE|Found)' | \
+ xpath -q -e "${xpath}" ${ROOT}/parent/pom.xml | \
while read -r declaration; do
FOUND=false
for pom in ${POMS}; do
@@ -31,8 +30,7 @@
done
for parent_xpath in "project/build/plugins" \
"project/dependencies"; do
- if xpath -e "${parent_xpath}" ${ROOT}/parent/pom.xml 2>&1 | \
- grep -E "<" | \
+ if xpath -q -e "${parent_xpath}" ${ROOT}/parent/pom.xml 2>&1 | \
grep -E "<artifactId>${declaration}</artifactId>" 2>&1 1>/dev/null; then
FOUND=true
continue 2
diff --git a/check-rules/maven-check-scripts/CheckUnusedProperties.sh b/check-rules/maven-check-scripts/CheckUnusedProperties.sh
index 6ca2107..06411c5 100644
--- a/check-rules/maven-check-scripts/CheckUnusedProperties.sh
+++ b/check-rules/maven-check-scripts/CheckUnusedProperties.sh
@@ -17,8 +17,8 @@
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/../.."
POMS=$(find ${ROOT} -name pom.xml)
-xpath -e "project/properties/*" ${ROOT}/parent/pom.xml 2>&1 | \
- grep -E "^<.*\.version>" | \
+xpath -q -e "project/properties/*" ${ROOT}/parent/pom.xml 2>&1 | \
+ grep -E "<.*\.version>" | \
sed -r 's|<(.*)>.*<\/.*>|\1|' | \
while read -r property; do
FOUND=false
diff --git a/check-rules/maven-check-scripts/run.sh b/check-rules/maven-check-scripts/run.sh
index 359b0ce..25fb506 100644
--- a/check-rules/maven-check-scripts/run.sh
+++ b/check-rules/maven-check-scripts/run.sh
@@ -33,7 +33,7 @@
CheckUnusedProperties.sh; do
echo -n " * Executing ${script}... "
bash ${DIR__MAVEN_CHECK_SCRIPTS}/${script} && \
- echo "[OK]" || {
+ echo "Done" || {
echo "[ERROR]"
exit 1
}
