From bd53f842ad3eaed554c7f13136215809781ff646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Vav=C5=99=C3=ADk?= Date: Tue, 12 Dec 2023 21:18:46 +0100 Subject: [PATCH] Docs: remove Java 11 / JDK 11 remnants --- docs/src/main/asciidoc/_includes/prerequisites.adoc | 2 +- docs/src/main/asciidoc/ansible.adoc | 2 +- docs/src/main/asciidoc/cli-tooling.adoc | 6 +++--- docs/src/main/asciidoc/deploying-to-heroku.adoc | 4 ++-- docs/src/main/asciidoc/funqy-gcp-functions.adoc | 2 +- docs/src/main/asciidoc/gcp-functions-http.adoc | 2 +- docs/src/main/asciidoc/gcp-functions.adoc | 2 +- docs/src/main/asciidoc/native-reference.adoc | 9 +-------- 8 files changed, 11 insertions(+), 18 deletions(-) diff --git a/docs/src/main/asciidoc/_includes/prerequisites.adoc b/docs/src/main/asciidoc/_includes/prerequisites.adoc index d739de2f92348..2a2d0636e2b03 100644 --- a/docs/src/main/asciidoc/_includes/prerequisites.adoc +++ b/docs/src/main/asciidoc/_includes/prerequisites.adoc @@ -8,7 +8,7 @@ ifndef::prerequisites-time[] endif::[] * An IDE ifdef::prerequisites-ide[{prerequisites-ide}] -* JDK 11+ installed with `JAVA_HOME` configured appropriately +* JDK 17+ installed with `JAVA_HOME` configured appropriately ifndef::prerequisites-no-maven[] * Apache Maven {maven-version} endif::[] diff --git a/docs/src/main/asciidoc/ansible.adoc b/docs/src/main/asciidoc/ansible.adoc index a2708dec90c8d..05b5db94e7d8a 100644 --- a/docs/src/main/asciidoc/ansible.adoc +++ b/docs/src/main/asciidoc/ansible.adoc @@ -167,7 +167,7 @@ By default, the Ansible collection for Quarkus will install and use the OpenJDK [source,bash] ---- $ ansible-playbook -i inventory ... - -e quarkus_java_package_version: java-11-openjdk + -e quarkus_java_package_version: java-17-openjdk ---- ==== diff --git a/docs/src/main/asciidoc/cli-tooling.adoc b/docs/src/main/asciidoc/cli-tooling.adoc index 5c712dde717aa..d363697be730a 100644 --- a/docs/src/main/asciidoc/cli-tooling.adoc +++ b/docs/src/main/asciidoc/cli-tooling.adoc @@ -147,7 +147,7 @@ You can use Homebrew to install (and update) the Quarkus CLI. Make sure you have a JDK installed before installing the Quarkus CLI. We haven't added an explicit dependency as we wanted to make sure you could use your preferred JDK version. -You can install a JDK with `brew install openjdk` for the latest Java version, `brew install openjdk@17` for Java 17, or `brew install openjdk@11` for Java 11. +You can install a JDK with `brew install openjdk` for the latest Java version, `brew install openjdk@17` for Java 17, or `brew install openjdk@21` for Java 21. ==== To install the Quarkus CLI using Homebrew, run the following command: @@ -190,7 +190,7 @@ You can use Chocolatey to install (and update) the Quarkus CLI. ==== Make sure you have a JDK installed before installing the Quarkus CLI. -You can install a JDK with `choco install ojdkbuild17` for Java 17 or `choco install ojdkbuild11` for Java 11. +You can install a JDK with `choco install temurin17` for Java 17 or `choco install temurin21` for Java 21. ==== To install the Quarkus CLI using Chocolatey, run the following command: @@ -226,7 +226,7 @@ You can use Scoop to install (and update) the Quarkus CLI. [NOTE] ==== Make sure you have a JDK installed before installing the Quarkus CLI. -You can install a JDK with `scoop install openjdk17` for Java 17 or `scoop install openjdk11` for Java 11. +You can install a JDK with `scoop install openjdk17` for Java 17 or `scoop install openjdk21` for Java 21. ==== To install the Quarkus CLI using Scoop, run the following command: [source,shell] diff --git a/docs/src/main/asciidoc/deploying-to-heroku.adoc b/docs/src/main/asciidoc/deploying-to-heroku.adoc index 73637d12be8b8..97b717a81b25d 100644 --- a/docs/src/main/asciidoc/deploying-to-heroku.adoc +++ b/docs/src/main/asciidoc/deploying-to-heroku.adoc @@ -92,11 +92,11 @@ Two additional files are needed in your application's root directory: * `system.properties` to configure the Java version * `Procfile` to configure how Heroku starts your application -Quarkus needs JDK 11, so we specify that first: +Quarkus needs JDK 17, so we specify that first: [source,bash] ---- -echo "java.runtime.version=11" >> system.properties +echo "java.runtime.version=17" >> system.properties git add system.properties git commit -am "Configure the Java version for Heroku." ---- diff --git a/docs/src/main/asciidoc/funqy-gcp-functions.adoc b/docs/src/main/asciidoc/funqy-gcp-functions.adoc index 165a2a3900a15..02109969b2499 100644 --- a/docs/src/main/asciidoc/funqy-gcp-functions.adoc +++ b/docs/src/main/asciidoc/funqy-gcp-functions.adoc @@ -147,7 +147,7 @@ You will have a single JAR inside the `target/deployment` repository that contai Then you will be able to use `gcloud` to deploy your function to Google Cloud. The `gcloud` command will be different depending on which event triggers your function. -NOTE: We will use the Java 17 runtime but you can switch to the Java 11 runtime by using `--runtime=java11` instead of `--runtime=java17` on the deploy commands. +NOTE: We will use the Java 17 runtime but you can switch to the Java 21 runtime by using `--runtime=java21` instead of `--runtime=java17` on the deploy commands. [WARNING] ==== diff --git a/docs/src/main/asciidoc/gcp-functions-http.adoc b/docs/src/main/asciidoc/gcp-functions-http.adoc index 5a947083368d2..bb96971f19759 100644 --- a/docs/src/main/asciidoc/gcp-functions-http.adoc +++ b/docs/src/main/asciidoc/gcp-functions-http.adoc @@ -162,7 +162,7 @@ The result of the previous command is a single JAR file inside the `target/deplo Then you will be able to use `gcloud` to deploy your function to Google Cloud. -NOTE: We will use the Java 17 runtime but you can switch to the Java 11 runtime by using `--runtime=java11` instead of `--runtime=java17` on the deploy commands. +NOTE: We will use the Java 17 runtime but you can switch to the Java 21 runtime by using `--runtime=java21` instead of `--runtime=java17` on the deploy commands. [source,bash] ---- diff --git a/docs/src/main/asciidoc/gcp-functions.adoc b/docs/src/main/asciidoc/gcp-functions.adoc index 151d99319e314..319c73b226e9d 100644 --- a/docs/src/main/asciidoc/gcp-functions.adoc +++ b/docs/src/main/asciidoc/gcp-functions.adoc @@ -242,7 +242,7 @@ The result of the previous command is a single JAR file inside the `target/deplo Then you will be able to use `gcloud` to deploy your function to Google Cloud. The `gcloud` command will be different depending on which event triggers your function. -NOTE: We will use the Java 17 runtime but you can switch to the Java 11 runtime by using `--runtime=java11` instead of `--runtime=java17` on the deploy commands. +NOTE: We will use the Java 17 runtime but you can switch to the Java 21 runtime by using `--runtime=java21` instead of `--runtime=java17` on the deploy commands. [WARNING] ==== diff --git a/docs/src/main/asciidoc/native-reference.adoc b/docs/src/main/asciidoc/native-reference.adoc index 4880f74a2051b..fe4cc0980cbb1 100644 --- a/docs/src/main/asciidoc/native-reference.adoc +++ b/docs/src/main/asciidoc/native-reference.adoc @@ -539,7 +539,7 @@ You can find instructions on how to quickly set up this application in this guid This debugging guide has the following requirements: -* JDK 11 installed with `JAVA_HOME` configured appropriately +* JDK 17 installed with `JAVA_HOME` configured appropriately * Apache Maven {maven-version} * A working container runtime (Docker, podman) @@ -590,13 +590,6 @@ quarkus.container-image.build=true quarkus.container-image.group=test ---- -[IMPORTANT] -==== -Starting with 22.3, Mandrel does not provide a `-java11` version anymore. -Note, however, that this doesn't mean that you may no longer produce native executables with Mandrel for Java 11 projects. -You can still compile your Java 11 projects using OpenJDK 11 and produce native executables from the resulting Java 11 bytecode using the `-java17` Mandrel builder images. -==== - === First Debugging Steps As a first step, change to the project directory and build the native executable for the application: