From 46049cb98349e7f382a0cdcc73cfa1317c3012b1 Mon Sep 17 00:00:00 2001 From: Scott Mitchell Date: Fri, 15 Apr 2022 16:38:53 -0700 Subject: [PATCH 1/2] Update JVM version for javadoc generation Motivation: JDK11 was used for javadoc generation because of new features (search, ..). JDK17 is now the latest LTS and we can take advantage of latest javadoc features. --- scripts/publish-docs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/publish-docs.sh b/scripts/publish-docs.sh index e95f475821..63365c39c2 100755 --- a/scripts/publish-docs.sh +++ b/scripts/publish-docs.sh @@ -52,9 +52,9 @@ function clean_up_gh_pages() { rm -rf gh-pages } -# Enforce JDK11 to keep javadoc format consistent for all versions: +# Enforce JDK17 to get latest LTS javadoc format/features (search, etc.): java_version=$(./gradlew --no-daemon -version | grep ^JVM: | awk -F\. '{gsub(/^JVM:[ \t]*/,"",$1); print $1"."$2}') -if [ "$java_version" != "11.0" ]; then +if [ "$java_version" != "17.0" ]; then echo "Docs can be published only using Java 11, current version: $java_version" exit 1 fi From a114d6a817ef82ad2c1e734fb2a3b998ee175b59 Mon Sep 17 00:00:00 2001 From: Mike Duigou Date: Fri, 15 Apr 2022 16:50:46 -0700 Subject: [PATCH 2/2] correct required javadoc version --- scripts/publish-docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/publish-docs.sh b/scripts/publish-docs.sh index 63365c39c2..34ef20b0ac 100755 --- a/scripts/publish-docs.sh +++ b/scripts/publish-docs.sh @@ -55,7 +55,7 @@ function clean_up_gh_pages() { # Enforce JDK17 to get latest LTS javadoc format/features (search, etc.): java_version=$(./gradlew --no-daemon -version | grep ^JVM: | awk -F\. '{gsub(/^JVM:[ \t]*/,"",$1); print $1"."$2}') if [ "$java_version" != "17.0" ]; then - echo "Docs can be published only using Java 11, current version: $java_version" + echo "Docs can be published only using Java 17, current version: $java_version" exit 1 fi