[Bug][scaleph-datasource] fix gravitino dependency error

.github/workflows/ci-docker-build.yml

@@ -17,10 +17,6 @@
 name: CI-Docker-Build
 
 on:
-  push:
-    paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
-  pull_request:
-    paths-ignore: [ 'docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
   workflow_dispatch:
   workflow_call:
 
@@ -45,6 +41,7 @@ jobs:
     strategy:
       matrix:
         image: [ scaleph-api, scaleph-ui-react, scaleph-file-fetcher, mysql ]
+        jdk: [ 17 ]
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -55,6 +52,12 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
+      - name: Setup Java JDK ${{ matrix.jdk }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.jdk }}
+          distribution: temurin
+          cache: maven
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:

.github/workflows/ci-maven.yml

@@ -17,10 +17,6 @@
 name: CI-Maven
 
 on:
-  pull_request:
-    paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
-  push:
-    paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
   workflow_dispatch:
   workflow_call:
 
@@ -30,7 +26,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        jdk: [ 11, 17 ]
+        jdk: [ 17 ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout

.github/workflows/ci-npm.yml

@@ -17,10 +17,6 @@
 name: CI-NPM
 
 on:
-  pull_request:
-    paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
-  push:
-    paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
   workflow_dispatch:
   workflow_call:
 

.github/workflows/ci.yml

@@ -17,6 +17,10 @@
 name: CI
 
 on:
+  push:
+    paths-ignore: [ 'docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
+  pull_request:
+    paths-ignore: [ 'docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
   schedule:
     - cron: '0 20 * * *' # automatic test while every day on 04:00 am at UTC+10
   workflow_dispatch:

.github/workflows/release-manual-docker-flink.yml

@@ -66,4 +66,4 @@ jobs:
           build-args: FLINK_VERSION=${{ env.FLINK_VERSION }}
           platforms: linux/amd64,linux/arm64
           file: tools/docker/build/flink/Dockerfile
-          tags: ${{ env.HUB }}:${{ env.FLINK_VERSION }}_${{ env.SCALA_VERSION }}
+          tags: ${{ env.HUB }}:${{ env.FLINK_VERSION }}

.github/workflows/release-master-docker-scaleph.yml

@@ -42,6 +42,12 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
+      - name: Setup Java JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: maven
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:

.github/workflows/release-tag-docker-scaleph.yml

@@ -40,6 +40,12 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
+      - name: Setup Java JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: maven
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:

pom.xml

@@ -119,15 +119,16 @@
         <docker.build.skip>true</docker.build.skip>
         <docker.push.skip>true</docker.push.skip>
 
-        <spring.boot.version>2.7.17</spring.boot.version>
-        <spring.cloud.version>2021.0.7</spring.cloud.version>
-        <mybatis.plus.version>3.5.4.1</mybatis.plus.version>
+        <spring.boot.version>3.2.5</spring.boot.version>
+        <spring.cloud.version>2023.0.1</spring.cloud.version>
+        <mybatis.version>3.0.3</mybatis.version>
+        <mybatis.plus.version>3.5.6</mybatis.plus.version>
         <org.mapstruct.extensions.spring.version>0.1.1</org.mapstruct.extensions.spring.version>
         <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
         <mapstruct.lombok.binding.version>0.2.0</mapstruct.lombok.binding.version>
         <org.projectlombok.version>1.18.24</org.projectlombok.version>
         <velocity.engine.version>2.2</velocity.engine.version>
-        <knife4j.version>4.1.0</knife4j.version>
+        <knife4j.version>4.4.0</knife4j.version>
         <auto-service.version>1.0.1</auto-service.version>
         <hutool.version>5.8.27</hutool.version>
         <commons.lang3.version>3.12.0</commons.lang3.version>
@@ -161,7 +162,6 @@
         <flink.base.version>1.18</flink.base.version>
         <flink-jdbc.version>3.1.2</flink-jdbc.version>
         <paimon.version>0.7.0-incubating</paimon.version>
-        <kubernetes.client.version>6.2.0</kubernetes.client.version>
         <spring-cloud-openfeign.version>3.1.7</spring-cloud-openfeign.version>
         <zjsonpatch.version>0.4.14</zjsonpatch.version>
         <kogito.version>2.44.0.Alpha</kogito.version>
@@ -174,27 +174,27 @@
 
     <dependencyManagement>
         <dependencies>
-            <!--<dependency>
+            <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
                 <version>${spring.cloud.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
-            </dependency>-->
+            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
                 <version>${spring.boot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-openfeign-dependencies</artifactId>
-                <version>${spring-cloud-openfeign.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
+            <!--            <dependency>-->
+            <!--                <groupId>org.springframework.cloud</groupId>-->
+            <!--                <artifactId>spring-cloud-openfeign-dependencies</artifactId>-->
+            <!--                <version>${spring-cloud-openfeign.version}</version>-->
+            <!--                <type>pom</type>-->
+            <!--                <scope>import</scope>-->
+            <!--            </dependency>-->
             <dependency>
                 <groupId>io.micrometer</groupId>
                 <artifactId>micrometer-bom</artifactId>
@@ -358,7 +358,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>scaleph-plugin-datasource</artifactId>
+                <artifactId>scaleph-plugin-datasource-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -388,10 +388,22 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- mybatis-plus 依赖的 mybatis-spring 版本过低，与 springboot 3.2.0 版本不兼容 -->
+            <dependency>
+                <groupId>org.mybatis</groupId>
+                <artifactId>mybatis-spring</artifactId>
+                <version>${mybatis.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>mybatis-plus-boot-starter</artifactId>
                 <version>${mybatis.plus.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.mybatis</groupId>
+                        <artifactId>mybatis-spring</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.baomidou</groupId>
@@ -618,12 +630,6 @@
                 <version>${flink.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>io.fabric8</groupId>
-                <artifactId>kubernetes-client</artifactId>
-                <version>${kubernetes.client.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.pekko</groupId>
                 <artifactId>pekko-actor-typed_${scala.binary.version}</artifactId>
@@ -749,18 +755,6 @@
                 <groupId>org.redisson</groupId>
                 <artifactId>redisson-spring-boot-starter</artifactId>
                 <version>${redisson.version}</version>
-                <!-- 需要使用 redisson-spring-data-27 版本 -->
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.redisson</groupId>
-                        <artifactId>redisson-spring-data-32</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.redisson</groupId>
-                <artifactId>redisson-spring-data-27</artifactId>
-                <version>${redisson.version}</version>
             </dependency>
 
             <dependency>
@@ -872,20 +866,11 @@
     </build>
 
     <profiles>
-        <profile>
-            <id>java11</id>
-            <activation>
-                <jdk>11</jdk>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <java.version>11</java.version>
-            </properties>
-        </profile>
         <profile>
             <id>java17</id>
             <activation>
                 <jdk>17</jdk>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
                 <java.version>17</java.version>

scaleph-api/pom.xml

@@ -94,7 +94,7 @@
 
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
+            <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
         </dependency>
 
         <dependency>

scaleph-api/src/main/java/cn/sliew/scaleph/api/aspect/LogAspect.java

@@ -18,16 +18,6 @@
 
 package cn.sliew.scaleph.api.aspect;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.http.useragent.Browser;
 import cn.hutool.http.useragent.OS;
 import cn.hutool.http.useragent.UserAgent;
@@ -41,8 +31,12 @@
 import cn.sliew.scaleph.log.service.dto.LogActionDTO;
 import cn.sliew.scaleph.log.service.dto.LogLoginDTO;
 import cn.sliew.scaleph.security.util.SecurityUtil;
+import cn.sliew.scaleph.security.util.WebUtil;
 import cn.sliew.scaleph.system.service.vo.DictVO;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -55,6 +49,8 @@
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.*;
+
 /**
  * 使用aop记录用户操作日志数据
  *
@@ -116,7 +112,7 @@ public Object loginLogAround(ProceedingJoinPoint joinPoint) throws Throwable {
         long startTime = System.currentTimeMillis();
         Object result = joinPoint.proceed();
         insertLoginLog(result, startTime,
-            DictVO.toVO(DictConstants.LOGIN_TYPE, LoginTypeEnum.LOGIN.getValue()));
+                DictVO.toVO(DictConstants.LOGIN_TYPE, LoginTypeEnum.LOGIN.getValue()));
         return result;
     }
 
@@ -130,7 +126,7 @@ public Object logoutLogAround(ProceedingJoinPoint joinPoint) throws Throwable {
         long startTime = System.currentTimeMillis();
         Object result = joinPoint.proceed();
         insertLoginLog(result, startTime,
-            DictVO.toVO(DictConstants.LOGIN_TYPE, LoginTypeEnum.LOGOUT.getValue()));
+                DictVO.toVO(DictConstants.LOGIN_TYPE, LoginTypeEnum.LOGOUT.getValue()));
         return result;
     }
 
@@ -141,7 +137,7 @@ public Object logoutLogAround(ProceedingJoinPoint joinPoint) throws Throwable {
      */
     private HttpServletRequest getRequest() {
         ServletRequestAttributes sra =
-            (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+                (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         assert sra != null;
         return sra.getRequest();
     }
@@ -167,7 +163,7 @@ private String getParameter(Object[] args) throws JsonProcessingException {
         List<Object> argList = new ArrayList<>();
         for (Object o : args) {
             if (o instanceof ServletRequest || o instanceof ServletResponse ||
-                o instanceof MultipartFile) {
+                    o instanceof MultipartFile) {
                 continue;
             }
             argList.add(o);
@@ -192,7 +188,7 @@ private void insertActionLog(JoinPoint joinPoint, long startTime) {
             UserAgent userAgent = UserAgentUtil.parse(agentStr);
             OS os = userAgent.getOs();
             Browser browser = userAgent.getBrowser();
-            log.setIpAddress(ServletUtil.getClientIP(request));
+            log.setIpAddress(WebUtil.getClientIP(request));
             log.setActionUrl(request.getRequestURL().toString());
             log.setToken(resolveToken(request));
             log.setClientInfo(userAgent.getPlatform().getName());
@@ -237,7 +233,7 @@ private void insertLoginLog(Object result, long startTime, DictVO loginType) {
             UserAgent userAgent = UserAgentUtil.parse(agentStr);
             OS os = userAgent.getOs();
             Browser browser = userAgent.getBrowser();
-            log.setIpAddress(ServletUtil.getClientIP(request));
+            log.setIpAddress(WebUtil.getClientIP(request));
             log.setLoginType(loginType);
             log.setClientInfo(userAgent.getPlatform().getName());
             log.setOsInfo(os.getName());

scaleph-api/src/main/java/cn/sliew/scaleph/api/config/ValidatorConfig.java

@@ -18,10 +18,9 @@
 
 package cn.sliew.scaleph.api.config;
 
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 import org.hibernate.validator.HibernateValidator;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

scaleph-api/src/main/java/cn/sliew/scaleph/api/config/WebMvcConfig.java

@@ -21,6 +21,10 @@
 import cn.sliew.scaleph.api.util.RequestParamUtil;
 import cn.sliew.scaleph.security.util.SecurityUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
@@ -39,10 +43,6 @@
 import org.springframework.web.util.ContentCachingResponseWrapper;
 import org.springframework.web.util.WebUtils;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.HashSet;