From 485207f322c2e919ba378f1e99847329e6fc2d37 Mon Sep 17 00:00:00 2001
From: sstone <fabrice@acinq.fr>
Date: Mon, 14 Oct 2024 17:09:22 +0200
Subject: [PATCH] Update doc to recommend Adoptium OpenJDK21

---
 BUILD.md                                        | 4 ++--
 README.md                                       | 2 +-
 docs/release-notes/eclair-vnext.md              | 4 ++--
 eclair-front/src/main/resources/eclair-front.sh | 4 ++--
 eclair-node/src/main/resources/eclair-node.bat  | 2 +-
 eclair-node/src/main/resources/eclair-node.sh   | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/BUILD.md b/BUILD.md
index fb3b43caeb..d7d914a4ae 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -2,8 +2,8 @@
 
 ## Requirements
 
-- [OpenJDK 11](https://adoptopenjdk.net/?variant=openjdk11&jvmVariant=hotspot).
-- [Maven](https://maven.apache.org/download.cgi) 3.6.0 or newer
+- [OpenJDK 21](https://adoptium.net/temurin/releases/?package=jdk&version=21).
+- [Maven](https://maven.apache.org/download.cgi) 3.9.2 or newer
 
 ## Build
 
diff --git a/README.md b/README.md
index 9edebaa1a9..b9d531fb60 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ rpcclienttimeout=30
 
 Eclair is developed in [Scala](https://www.scala-lang.org/), a powerful functional language that runs on the JVM, and is packaged as a ZIP archive.
 
-To run Eclair, you first need to install Java, we recommend that you use [OpenJDK 11](https://adoptopenjdk.net/?variant=openjdk11&jvmVariant=hotspot). Other runtimes also work, but we don't recommend using them.
+To run Eclair, you first need to install Java. Eclair targets Java 11 and will run on any compatible Java runtime (including 11, 17 and 21), we recommend that you use [OpenJDK 21](https://adoptium.net/temurin/releases/?package=jdk&version=21).
 
 Then download our latest [release](https://github.com/ACINQ/eclair/releases), unzip the archive and run the following command:
 
diff --git a/docs/release-notes/eclair-vnext.md b/docs/release-notes/eclair-vnext.md
index 4a839f7edb..cc7ba22d9f 100644
--- a/docs/release-notes/eclair-vnext.md
+++ b/docs/release-notes/eclair-vnext.md
@@ -38,8 +38,8 @@ $ sha256sum -c SHA256SUMS.stripped
 
 Eclair builds are deterministic. To reproduce our builds, please use the following environment (*):
 
-- Ubuntu 22.04
-- AdoptOpenJDK 11.0.22
+- Ubuntu 24.04.1
+- Adoptium OpenJDK 21.0.4
 - Maven 3.9.2
 
 Use the following command to generate the eclair-node package:
diff --git a/eclair-front/src/main/resources/eclair-front.sh b/eclair-front/src/main/resources/eclair-front.sh
index 43cec6ab32..df7c486dcd 100644
--- a/eclair-front/src/main/resources/eclair-front.sh
+++ b/eclair-front/src/main/resources/eclair-front.sh
@@ -283,7 +283,7 @@ java_version_check() {
   if [[ "$java_version" == "" ]]; then
     echo
     echo No java installations was detected.
-    echo Please go to 'https://adoptopenjdk.net/?variant=openjdk11&jvmVariant=hotspot' and download
+    echo Please go to 'https://adoptium.net/temurin/releases/?package=jre&version=21' and download
     echo
     exit 1
   else
@@ -296,7 +296,7 @@ java_version_check() {
       echo The java installation you have is not up to date, eclair-front requires
       echo at least version 1.8+ \(version 11 recommended\) but you have version $java_version
       echo
-      echo Please go to 'https://adoptopenjdk.net/?variant=openjdk11&jvmVariant=hotspot' and download
+      echo Please go to 'https://adoptium.net/temurin/releases/?package=jre&version=21' and download
       echo a valid Java Runtime and install before running eclair-front.
       echo
       exit 1
diff --git a/eclair-node/src/main/resources/eclair-node.bat b/eclair-node/src/main/resources/eclair-node.bat
index 7daba73b91..4415b034d9 100644
--- a/eclair-node/src/main/resources/eclair-node.bat
+++ b/eclair-node/src/main/resources/eclair-node.bat
@@ -85,7 +85,7 @@ if "%JAVAOK%"=="false" (
   )
   echo.
   echo Please go to
-  echo https://adoptopenjdk.net/?variant=openjdk11&jvmVariant=hotspot
+  echo https://adoptium.net/temurin/releases/?package=jdk&version=21
   echo and download a valid Java JDK and install before running @@APP_NAME@@.
   echo.
   echo If you think this message is in error, please check
diff --git a/eclair-node/src/main/resources/eclair-node.sh b/eclair-node/src/main/resources/eclair-node.sh
index 87faaeb7c5..1252c32927 100755
--- a/eclair-node/src/main/resources/eclair-node.sh
+++ b/eclair-node/src/main/resources/eclair-node.sh
@@ -283,7 +283,7 @@ java_version_check() {
   if [[ "$java_version" == "" ]]; then
     echo
     echo No java installations was detected.
-    echo Please go to 'https://adoptopenjdk.net/?variant=openjdk11&jvmVariant=hotspot' and download
+    echo Please go to 'https://adoptium.net/temurin/releases/?package=jdk&version=21' and download
     echo
     exit 1
   else
@@ -296,7 +296,7 @@ java_version_check() {
       echo The java installation you have is not up to date, eclair-node requires
       echo at least version 1.8+ \(version 11 recommended\) but you have version $java_version
       echo
-      echo Please go to 'https://adoptopenjdk.net/?variant=openjdk11&jvmVariant=hotspot' and download
+      echo Please go to 'https://adoptium.net/temurin/releases/?package=jdk&version=21' and download
       echo a valid Java Runtime and install before running eclair-node.
       echo
       exit 1