Skip to content

KNOX-3246 - Make Java discovery deterministic and support JDK 11/17 #1141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smolnar82 merged 1 commit into from
Jan 29, 2026
+13 −3
Merged

KNOX-3246 - Make Java discovery deterministic and support JDK 11/17 #1141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions gateway-release-common/home/bin/knox-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,18 @@ function setVerbose() {
done
}

JAVA_VERSION_PATTERNS=( "1.6.0_31/bin/java$" "1.6.0_.*/bin/java$" "1.6.0.*/bin/java$" "1.6\..*/bin/java$" "/bin/java$" )
JAVA_VERSION_PATTERNS=(
"/default/bin/java$"
"1.6.0_31/bin/java$"
"1.6.0_.*/bin/java$"
"1.6.0.*/bin/java$"
"1.6\..*/bin/java$"
"jdk1\.11.*?/bin/java$"
"jdk-11.*?/bin/java$"
"jdk1\.17.*?/bin/java$"
"jdk-17.*?/bin/java$"
"/bin/java$"
)

function findJava() {
# Check to make sure any existing JAVA var is valid.
Expand Down Expand Up @@ -92,8 +103,7 @@ function findJava() {
# Use the search patterns to find java.
if [ "$JAVA" == "" ]; then
for pattern in "${JAVA_VERSION_PATTERNS[@]}"; do
# shellcheck disable=SC2207
JAVA=$(find /usr -executable -name java -print 2> /dev/null | grep "$pattern" | head -n 1 )
JAVA=$(find -L /usr -executable -name java -print 2> /dev/null | grep "$pattern" | sort | head -n 1 )
if [ -x "$JAVA" ]; then
break
else
Expand Down
Loading