Apache Solr open-source search software
SOLR-16721 Java version detection fails when `_JAVA_OPTIONS` is set (#1502)
Jan Høydahlf7fe594cdade
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex aa4b60355db..c351f1c9a31 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -85,6 +85,8 @@ Bug Fixes* SOLR-16638: Fix Http2SolrClient's exception message when serverBaseUrl is null (Alex Deparvu via Kevin Risden)+* SOLR-16721: Java version detection fails when `_JAVA_OPTIONS` is set (janhoy, Ruoyu Zhong, Andy Webb)+* SOLR-16723: Http2SolrClient should not use Apache Http client classes (Kevin Risden)Dependency Upgradesdiff --git a/solr/bin/solr b/solr/bin/solrindex d4d6905bc25..d49ed9fdab2 100644--- a/solr/bin/solr+++ b/solr/bin/solr@@ -163,7 +163,7 @@ if [[ $? -ne 0 ]] ; thenecho >&2 "${PATH}"exit 1else- JAVA_VER_NUM=$(echo "$JAVA_VER" | head -1 | awk -F '"' '/version/ {print $2}' | sed -e's/^1\.//' | sed -e's/[._-].*$//')+ JAVA_VER_NUM=$(echo "$JAVA_VER" | grep -v '_OPTIONS' | head -1 | awk -F '"' '/version/ {print $2}' | sed -e's/^1\.//' | sed -e's/[._-].*$//')if [[ "$JAVA_VER_NUM" -lt "$JAVA_VER_REQ" ]] ; thenecho >&2 "Your current version of Java is too old to run this version of Solr."echo >&2 "We found major version $JAVA_VER_NUM, using command '${JAVA} -version', with response:"