From f509bc32640b3aca16e00fd3d5ebe619cc795c3e Mon Sep 17 00:00:00 2001
From: napoly <napolytan@protonmail.com>
Date: Sat, 9 Mar 2024 18:15:55 +0100
Subject: [PATCH] fix jdk 21

---
 .github/workflows/build.yml              | 6 +++---
 build.gradle                             | 3 ++-
 gradle/libs.versions.toml                | 8 +++++---
 gradle/wrapper/gradle-wrapper.properties | 3 +--
 scripts/install_pricenode_debian.sh      | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bc8413f..137f25c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,11 +15,11 @@ jobs:
       with:
         submodules: recursive
 
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
-        java-version: '11'
+        java-version: '21'
 
     - name: Build with Gradle
       run: ./gradlew clean build --stacktrace --scan
diff --git a/build.gradle b/build.gradle
index 4c10dc1..c60423b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ application {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
@@ -67,6 +67,7 @@ dependencies {
     testCompileOnly libs.lombok
     testImplementation libs.junit.jupiter
     testImplementation libs.mockito.core
+    testImplementation libs.byte.buddy
 }
 
 clean.doFirst {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index def01f5..bed9555 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,11 +4,12 @@
 # Convention: mark all versions using 'strictly'. This ensures only one version is allowed in the dependency tree, even
 # when multiple versions are attempted to be brought in as transitive dependencies of other requirements.
 [versions]
-junit-jupiter-lib = { strictly = '5.8.2' }
+junit-jupiter-lib = { strictly = '5.9.2' }
 knowm-xchange-lib = { strictly = '5.0.13' }
 logback-lib = { strictly = '1.2.6' }
-lombok-lib = { strictly = '1.18.22' }
-mockito-lib = { strictly = '4.0.0' }
+lombok-lib = { strictly = '1.18.30' }
+mockito-lib = { strictly = '5.10.0' }
+buddy-lib = { strictly = '1.14.11' }
 slf4j-lib = { strictly = '1.7.36' }
 spring-dependency-management-plugin-lib = { strictly = '1.0.12.RELEASE' }
 spring-plugin-lib = { strictly = '2.5.6' }
@@ -35,6 +36,7 @@ logback-core = { module = 'ch.qos.logback:logback-core', version.ref = 'logback-
 logback-classic = { module = 'ch.qos.logback:logback-classic', version.ref = 'logback-lib' }
 lombok = { module = 'org.projectlombok:lombok', version.ref = 'lombok-lib' }
 mockito-core = { module = 'org.mockito:mockito-core', version.ref = 'mockito-lib' }
+byte-buddy = { module = 'net.bytebuddy:byte-buddy', version.ref = 'buddy-lib' }
 slf4j-api = { module = 'org.slf4j:slf4j-api', version.ref = 'slf4j-lib' }
 spring-dependency-management-plugin = { module = 'io.spring.gradle:dependency-management-plugin', version.ref = 'spring-dependency-management-plugin-lib' }
 spring-boot-starter-web = { module = 'org.springframework.boot:spring-boot-starter-web', version.ref = 'spring-boot-starter-web-lib' }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c244788..a80b22c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/scripts/install_pricenode_debian.sh b/scripts/install_pricenode_debian.sh
index 187c65d..d0c920a 100755
--- a/scripts/install_pricenode_debian.sh
+++ b/scripts/install_pricenode_debian.sh
@@ -37,7 +37,7 @@ sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get update -q
 sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq -y
 
 echo "[*] Installing Haveno dependencies"
-sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt install -qq -y make wget git openjdk-11-jdk
+sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt install -qq -y make wget git openjdk-21-jdk
 
 echo "[*] Installing Tor"
 sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get install -qq -y "${TOR_PKG}"