diff options
author | Michael Weghorn <m.weghorn@posteo.de> | 2023-08-18 10:22:44 +0200 |
---|---|---|
committer | Michael Weghorn <m.weghorn@posteo.de> | 2023-09-01 17:21:51 +0200 |
commit | 63b44ef7685c9a8e4a55584790521c75f7cc2628 (patch) | |
tree | 54a00f5a18f1df1303859a10dec0fcbb349e71c3 /distro-configs | |
parent | 8e246331f6f71320cfcc8defdd04e756a75f71cf (diff) |
distro-configs: Switch from JDK 11 to 17
... to prepare for the upcoming
Change-Id I18251151392ca5edec8ca3d5cffd192d5f9f38b1
("Bump Java build baseline from JDK 11 to 17").
Change-Id: I3bedc42fd8e05c1e5c61e0b2c9e8eefce31d0fae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155377
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'distro-configs')
-rw-r--r-- | distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf | 2 | ||||
-rw-r--r-- | distro-configs/Jenkins/Linux_bisect | 2 | ||||
-rw-r--r-- | distro-configs/Jenkins/Linux_dev_master.conf | 2 | ||||
-rw-r--r-- | distro-configs/Jenkins/Linux_rel_master.conf | 2 | ||||
-rw-r--r-- | distro-configs/Jenkins/Linux_ubsan_master.conf | 2 | ||||
-rw-r--r-- | distro-configs/Jenkins/PerfSuite_Linux.conf | 2 | ||||
-rw-r--r-- | distro-configs/Jenkins/android_common.conf | 2 | ||||
-rw-r--r-- | distro-configs/Jenkins/linux_clang_dbgutil_64 | 2 | ||||
-rw-r--r-- | distro-configs/Jenkins/linux_gcc_release_64 | 2 | ||||
-rw-r--r-- | distro-configs/Jenkins/linux_random.conf | 2 | ||||
-rw-r--r-- | distro-configs/Jenkins/screenshot_linux.conf | 2 | ||||
-rw-r--r-- | distro-configs/LibreOfficeFlatpak.conf | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf index 03f39c46cde8..29c6303a1448 100644 --- a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf +++ b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf @@ -33,5 +33,5 @@ --with-lang=de es fr ar zh-CN --with-package-format=archive --with-update-config=~/updater.ini ---with-jdk-home=/etc/alternatives/java_sdk_11 +--with-jdk-home=/etc/alternatives/java_sdk_17 --enable-odk diff --git a/distro-configs/Jenkins/Linux_bisect b/distro-configs/Jenkins/Linux_bisect index 92678cfdea8f..106704cb6712 100644 --- a/distro-configs/Jenkins/Linux_bisect +++ b/distro-configs/Jenkins/Linux_bisect @@ -1,4 +1,4 @@ --disable-werror --disable-odk ---with-jdk-home=/etc/alternatives/java_sdk_11 +--with-jdk-home=/etc/alternatives/java_sdk_17 --enable-kf5 diff --git a/distro-configs/Jenkins/Linux_dev_master.conf b/distro-configs/Jenkins/Linux_dev_master.conf index d4b221fe0c06..0cc2c8381270 100644 --- a/distro-configs/Jenkins/Linux_dev_master.conf +++ b/distro-configs/Jenkins/Linux_dev_master.conf @@ -1,4 +1,4 @@ --enable-dbgutil --enable-kf5 ---with-jdk-home=/etc/alternatives/java_sdk_11 +--with-jdk-home=/etc/alternatives/java_sdk_17 --enable-odk diff --git a/distro-configs/Jenkins/Linux_rel_master.conf b/distro-configs/Jenkins/Linux_rel_master.conf index 5e280bbf4aa8..fddc95b0ec67 100644 --- a/distro-configs/Jenkins/Linux_rel_master.conf +++ b/distro-configs/Jenkins/Linux_rel_master.conf @@ -1,3 +1,3 @@ --enable-kf5 ---with-jdk-home=/etc/alternatives/java_sdk_11 +--with-jdk-home=/etc/alternatives/java_sdk_17 --enable-odk diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf b/distro-configs/Jenkins/Linux_ubsan_master.conf index 8acd56a29302..b1b928e7e41e 100644 --- a/distro-configs/Jenkins/Linux_ubsan_master.conf +++ b/distro-configs/Jenkins/Linux_ubsan_master.conf @@ -22,5 +22,5 @@ --with-system-cairo --disable-compiler-plugins --disable-gtk3 ---with-jdk-home=/etc/alternatives/java_sdk_11 +--with-jdk-home=/etc/alternatives/java_sdk_17 --enable-odk diff --git a/distro-configs/Jenkins/PerfSuite_Linux.conf b/distro-configs/Jenkins/PerfSuite_Linux.conf index e75a8fcc4653..f4c1f462f71d 100644 --- a/distro-configs/Jenkins/PerfSuite_Linux.conf +++ b/distro-configs/Jenkins/PerfSuite_Linux.conf @@ -6,7 +6,7 @@ --disable-ccache --enable-symbols --enable-mergelibs ---with-jdk-home=/etc/alternatives/java_sdk_11 +--with-jdk-home=/etc/alternatives/java_sdk_17 --enable-python=fully-internal --enable-odk --with-privacy-policy-url=dummyvalue-only-used-for-ci diff --git a/distro-configs/Jenkins/android_common.conf b/distro-configs/Jenkins/android_common.conf index 51ae8e255ee5..5d3e57ede557 100644 --- a/distro-configs/Jenkins/android_common.conf +++ b/distro-configs/Jenkins/android_common.conf @@ -1,5 +1,5 @@ --with-android-sdk=$HOME/Android/Sdk --with-android-ndk=$HOME/Android/Sdk/ndk/25.1.8937393 ---with-jdk-home=/etc/alternatives/java_sdk_11 +--with-jdk-home=/etc/alternatives/java_sdk_17 --enable-android-editing --enable-odk diff --git a/distro-configs/Jenkins/linux_clang_dbgutil_64 b/distro-configs/Jenkins/linux_clang_dbgutil_64 index 3409189e151c..5fa90d44c223 100644 --- a/distro-configs/Jenkins/linux_clang_dbgutil_64 +++ b/distro-configs/Jenkins/linux_clang_dbgutil_64 @@ -4,7 +4,7 @@ --disable-compiler-plugins-analyzer-pch --disable-dependency-tracking --disable-split-debug ---with-jdk-home=/etc/alternatives/java_sdk_11 +--with-jdk-home=/etc/alternatives/java_sdk_17 --enable-odk --disable-dconf --enable-python=internal diff --git a/distro-configs/Jenkins/linux_gcc_release_64 b/distro-configs/Jenkins/linux_gcc_release_64 index 3057f58227af..c5f02e61e0bc 100644 --- a/distro-configs/Jenkins/linux_gcc_release_64 +++ b/distro-configs/Jenkins/linux_gcc_release_64 @@ -1,6 +1,6 @@ --enable-kf5 --disable-dependency-tracking ---with-jdk-home=/etc/alternatives/java_sdk_11 +--with-jdk-home=/etc/alternatives/java_sdk_17 --enable-odk --enable-mergelibs --disable-dconf diff --git a/distro-configs/Jenkins/linux_random.conf b/distro-configs/Jenkins/linux_random.conf index dbfb76bf1e7b..3ce65338ded4 100644 --- a/distro-configs/Jenkins/linux_random.conf +++ b/distro-configs/Jenkins/linux_random.conf @@ -1,3 +1,3 @@ --enable-fuzz-options ---with-jdk-home=/etc/alternatives/java_sdk_11 +--with-jdk-home=/etc/alternatives/java_sdk_17 --enable-odk diff --git a/distro-configs/Jenkins/screenshot_linux.conf b/distro-configs/Jenkins/screenshot_linux.conf index d6dd3d620700..6cd0d18a7efa 100644 --- a/distro-configs/Jenkins/screenshot_linux.conf +++ b/distro-configs/Jenkins/screenshot_linux.conf @@ -1,3 +1,3 @@ --with-lang=ALL ---with-jdk-home=/etc/alternatives/java_sdk_11 +--with-jdk-home=/etc/alternatives/java_sdk_17 --enable-odk diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf index 13d0edeece3c..dae435621e89 100644 --- a/distro-configs/LibreOfficeFlatpak.conf +++ b/distro-configs/LibreOfficeFlatpak.conf @@ -3,7 +3,7 @@ --with-ant-home=/run/build/libreoffice/ant --with-extra-buildid=Flatpak --with-help=html ---with-jdk-home=/usr/lib/sdk/openjdk11/jvm/openjdk-11 +--with-jdk-home=/usr/lib/sdk/openjdk17/jvm/openjdk-17 --with-lang=ALL --with-system-libs --with-vendor=The Document Foundation |