From f9f4b5bdda9a03d07c934d39d24ae168789c0f89 Mon Sep 17 00:00:00 2001
From: Jonatan Ivanov <jonatan.ivanov@gmail.com>
Date: Wed, 18 Sep 2024 00:03:13 -0700
Subject: [PATCH] Upgrade to Java 23

---
 .github/workflows/gradle.yml   | 2 +-
 build.gradle                   | 2 +-
 eureka/build.gradle            | 3 ---
 spring-boot-admin/build.gradle | 3 ---
 tea-service/build.gradle       | 3 ---
 tealeaf-service/build.gradle   | 3 ---
 water-service/build.gradle     | 3 ---
 7 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 6a5a6e7..ff47731 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -16,7 +16,7 @@ jobs:
       with:
         distribution: 'liberica'
         java-version: |
-          22
+          23
           21
         cache: 'gradle'
         check-latest: true
diff --git a/build.gradle b/build.gradle
index f6d9e20..6d0fba2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,7 +67,7 @@ subprojects {
         }
 
         java {
-            toolchain { languageVersion = JavaLanguageVersion.of(22) }
+            toolchain { languageVersion = JavaLanguageVersion.of(23) }
         }
 
         jar.manifest.attributes(
diff --git a/eureka/build.gradle b/eureka/build.gradle
index 4a02615..76a23fe 100644
--- a/eureka/build.gradle
+++ b/eureka/build.gradle
@@ -3,6 +3,3 @@ apply from: "$rootDir/gradle/spring-boot.gradle"
 dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-server'
 }
-
-// TODO: remove this once the Boot Gradle Plugin works with Java 22
-springBoot.mainClass = 'org.example.teahouse.eureka.EurekaApplication'
diff --git a/spring-boot-admin/build.gradle b/spring-boot-admin/build.gradle
index 9c6be06..b1ebf13 100644
--- a/spring-boot-admin/build.gradle
+++ b/spring-boot-admin/build.gradle
@@ -4,6 +4,3 @@ dependencies {
     implementation 'de.codecentric:spring-boot-admin-starter-server:latest.release'
     implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
 }
-
-// TODO: remove this once the Boot Gradle Plugin works with Java 22
-springBoot.mainClass = 'org.example.teahouse.sba.SbaApplication'
diff --git a/tea-service/build.gradle b/tea-service/build.gradle
index f9253f8..c3d7d0b 100644
--- a/tea-service/build.gradle
+++ b/tea-service/build.gradle
@@ -25,6 +25,3 @@ dependencies {
 
     runtimeOnly 'com.github.loki4j:loki-logback-appender:latest.release'
 }
-
-// TODO: remove this once the Boot Gradle Plugin works with Java 22
-springBoot.mainClass = 'org.example.teahouse.tea.TeaServiceApplication'
diff --git a/tealeaf-service/build.gradle b/tealeaf-service/build.gradle
index 807fc70..12c95e5 100644
--- a/tealeaf-service/build.gradle
+++ b/tealeaf-service/build.gradle
@@ -26,6 +26,3 @@ dependencies {
 
     testImplementation 'org.flywaydb:flyway-core'
 }
-
-// TODO: remove this once the Boot Gradle Plugin works with Java 22
-springBoot.mainClass = 'org.example.teahouse.tealeaf.TealeafServiceApplication'
diff --git a/water-service/build.gradle b/water-service/build.gradle
index 984b941..64d4106 100644
--- a/water-service/build.gradle
+++ b/water-service/build.gradle
@@ -26,6 +26,3 @@ dependencies {
 
     testImplementation 'org.flywaydb:flyway-core'
 }
-
-// TODO: remove this once the Boot Gradle Plugin works with Java 22
-springBoot.mainClass = 'org.example.teahouse.water.WaterServiceApplication'