diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-08-17 18:16:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-17 18:16:10 +0200 |
| commit | b878a69e22ef476e348933f5106094e3d2e4198d (patch) | |
| tree | 9bf82b93dc4074e31dcdde0a2a69e8717466b5d9 /default_build_settings.cmake | |
| parent | ef929551975d5422ff60c5251c5d7a1fa6fc789d (diff) | |
| parent | fde5c5eaea9aacdcaf9a618d8fc29cc6e6b00ce2 (diff) | |
Merge pull request #23689 from vespa-engine/toregge/update-java-version-for-default-java-home
Update java version for DEFAULT_JAVA_HOME.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 6ff9f6537cb..979b71f96b3 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -403,12 +403,12 @@ function(vespa_use_default_java_home) if (DEFINED JAVA_HOME) return() endif() - set(DEFAULT_JAVA_HOME "/usr/lib/jvm/java-11-openjdk") + set(DEFAULT_JAVA_HOME "/usr/lib/jvm/java-17-openjdk") if(APPLE) execute_process(COMMAND "/usr/libexec/java_home" OUTPUT_VARIABLE DEFAULT_JAVA_HOME) string(STRIP "${DEFAULT_JAVA_HOME}" DEFAULT_JAVA_HOME) - elseif(VESPA_OS_DISTRO STREQUAL "ubuntu") - set(DEFAULT_JAVA_HOME "/usr/lib/jvm/java-11-openjdk-amd64" PARENT_SCOPE) + elseif(VESPA_OS_DISTRO STREQUAL "ubuntu" OR VESPA_OS_DISTRO STREQUAL "debian") + set(DEFAULT_JAVA_HOME "/usr/lib/jvm/java-17-openjdk-amd64" PARENT_SCOPE) endif() if(COMMAND vespa_use_specific_java_home) vespa_use_specific_java_home() |