From daa4a3cb7cc03280e5ae3419fa4240edbc9c7c7c Mon Sep 17 00:00:00 2001
From: youpaishidifu <youpaishidifu@outlook.com>
Date: Sun, 19 Jul 2026 01:01:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=87=E7=BA=A7Maven=20compiler-plugi?=
 =?UTF-8?q?n=E5=88=B03.15.0=EF=BC=8C=E4=BC=98=E5=8C=96Java=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/release.yml | 23 ++++++++++++++++++++++-
 pom.xml                      |  2 +-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index fbe9432..5c4c0aa 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -15,10 +15,28 @@ jobs:
         run: |
           set -e
           # 1) 定位服务器已安装的最高版本 JDK —— 绝不安装新 JDK，避免版本冲突
-          JAVA_HOME=$(ls -d /usr/lib/jvm/java-* 2>/dev/null | sort -V | tail -1)
+          # 优先检查 sdkman 管理的 JDK
+          if [ -f "$HOME/.sdkman/bin/sdkman-init.sh" ]; then
+            source "$HOME/.sdkman/bin/sdkman-init.sh"
+            sdk list java 2>/dev/null | grep installed | tail -1 | awk '{print $NF}' | xargs sdk use java 2>/dev/null || true
+          fi
+
+          # 检查 /usr/lib/jvm 下的 JDK
+          JAVA_HOME=""
+          if [ -d "/usr/lib/jvm" ]; then
+            # 尝试找 Java 25
+            JAVA_HOME=$(find /usr/lib/jvm -name "java-*25*" -type d -print 2>/dev/null | head -1)
+            # 如果没有 Java 25，找最高版本
+            if [ -z "$JAVA_HOME" ]; then
+              JAVA_HOME=$(ls -d /usr/lib/jvm/java-* 2>/dev/null | sort -V | tail -1)
+            fi
+          fi
+
+          # 如果还没找到，用 which java 定位
           if [ -z "$JAVA_HOME" ] || [ ! -x "$JAVA_HOME/bin/java" ]; then
             JAVA_HOME=$(dirname $(dirname $(command -v java)))
           fi
+
           export JAVA_HOME
           echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
           echo "JAVA_HOME=$JAVA_HOME"
@@ -52,6 +70,9 @@ jobs:
           # 把 Maven 所在目录加入 PATH
           MVN_DIR=$(dirname "$MVN_BIN")
           echo "PATH=$MVN_DIR:$JAVA_HOME/bin:$PATH" >> $GITHUB_ENV
+          echo "Java version:"
+          java -version
+          echo "Maven version:"
           "$MVN_BIN" -version
 
       - name: Build with Maven
diff --git a/pom.xml b/pom.xml
index d2bf901..b5986a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.14.0</version>
+                <version>3.15.0</version>
                 <configuration>
                     <source>25</source>
                     <target>25</target>