[Improvement][Seatunnel-web] Upgrade spring-boot version to 3.3.3

pom.xml

@@ -62,7 +62,7 @@
         <maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
         <skipUT>false</skipUT>
         <!-- dependency -->
-        <jackson-databind.version>2.12.6</jackson-databind.version>
+        <jackson-databind.version>2.17.0</jackson-databind.version>
         <jackson.version>2.12.7</jackson.version>
         <mysql.version>8.0.16</mysql.version>
         <h2.version>2.1.214</h2.version>
@@ -88,29 +88,29 @@
         <maven-site-plugin.version>4.0.0-M16</maven-site-plugin.version>
         <versions-maven-plugin.version>2.14.1</versions-maven-plugin.version>
 
-        <spring-boot.version>2.6.8</spring-boot.version>
+        <spring-boot.version>3.3.3</spring-boot.version>
         <spring.version>5.3.20</spring.version>
-        <mybatis-plus-boot-starter.version>3.5.3.1</mybatis-plus-boot-starter.version>
+        <mybatis-plus-boot-starter.version>3.5.7</mybatis-plus-boot-starter.version>
         <druid-spring-boot-starter.version>1.2.9</druid-spring-boot-starter.version>
-        <springfox-swagger.version>2.6.1</springfox-swagger.version>
-        <swagger-annotations.version>1.5.10</swagger-annotations.version>
+        <springfox-swagger.version>3.0.0</springfox-swagger.version>
+        <swagger-annotations.version>1.6.14</swagger-annotations.version>
         <hibernate.validator.version>6.2.2.Final</hibernate.validator.version>
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
         <jsoup.version>1.14.3</jsoup.version>
-        <jwt.version>0.10.7</jwt.version>
+        <jwt.version>0.11.5</jwt.version>
         <cron-utils.version>9.1.6</cron-utils.version>
         <commons-io.version>2.11.0</commons-io.version>
         <jsr305.version>3.0.0</jsr305.version>
         <auto-service-annotation.version>1.0.1</auto-service-annotation.version>
         <hadoop-aws.version>3.1.4</hadoop-aws.version>
         <aws-java-sdk-bundle.version>1.11.271</aws-java-sdk-bundle.version>
         <spotless.version>2.29.0</spotless.version>
-        <logback.version>1.2.3</logback.version>
+        <logback.version>1.5.7</logback.version>
         <log4j2.version>2.17.1</log4j2.version>
         <commons-logging.version>1.2</commons-logging.version>
         <log4j.version>1.2.17</log4j.version>
         <log4j-core.version>2.17.1</log4j-core.version>
-        <slf4j.version>1.7.36</slf4j.version>
+        <slf4j.version>2.0.16</slf4j.version>
         <skip.spotless>false</skip.spotless>
     </properties>
 
@@ -275,6 +275,18 @@
                         <groupId>com.fasterxml.jackson.dataformat</groupId>
                         <artifactId>jackson-dataformat-properties</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-databind</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-annotations</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -365,11 +377,16 @@
                 <artifactId>druid-spring-boot-starter</artifactId>
                 <version>${druid-spring-boot-starter.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.plugin</groupId>
+                <artifactId>spring-plugin-core</artifactId>
+                <version>3.0.0</version>
+            </dependency>
 
             <!-- ORM -->
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
                 <version>${mybatis-plus-boot-starter.version}</version>
                 <exclusions>
                     <exclusion>
@@ -487,6 +504,12 @@
                 <version>${jackson-databind.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${jackson-databind.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
@@ -1269,6 +1292,9 @@
                     <configuration>
                         <source>${maven.compiler.source}</source>
                         <target>${maven.compiler.target}</target>
+                        <compilerArgs>
+                            <arg>-parameters</arg>
+                        </compilerArgs>
                     </configuration>
                 </plugin>
 
@@ -1509,7 +1535,6 @@
                         </execution>
                     </executions>
                 </plugin>
-
             </plugins>
         </pluginManagement>
 

seatunnel-server/seatunnel-app/pom.xml

@@ -41,6 +41,11 @@
             <artifactId>swagger-annotations</artifactId>
             <version>2.2.14</version>
         </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>1.3.1.Final</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
             <artifactId>seatunnel-common</artifactId>
@@ -313,7 +318,7 @@
 
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
 
         <dependency>

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/adapter/SeatunnelWebAdapter.java

@@ -30,7 +30,7 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.i18n.CookieLocaleResolver;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import java.util.List;
 import java.util.Locale;

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/aspect/LogoutAspect.java

@@ -28,11 +28,10 @@
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
 import static org.apache.seatunnel.server.common.Constants.USER_ID;
 
 @Slf4j

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/AuthController.java

@@ -28,8 +28,8 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 
-import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 
 @RequestMapping("/seatunnel/api/v1/auth")

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/BaseController.java

@@ -23,7 +23,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import java.text.MessageFormat;
 import java.util.HashMap;

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/ConnectorController.java

@@ -31,7 +31,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import java.io.IOException;
 import java.util.List;

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/ConnectorDataSourceController.java

@@ -34,7 +34,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import java.io.IOException;
 import java.util.List;

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/EngineController.java

@@ -27,7 +27,7 @@
 
 import io.swagger.annotations.ApiOperation;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import java.util.List;
 import java.util.stream.Collectors;

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/EnvController.java

@@ -26,7 +26,7 @@
 
 import io.swagger.annotations.ApiOperation;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @RequestMapping("/seatunnel/api/v1/job/env")
 @RestController

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/JobConfigController.java

@@ -33,7 +33,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @RestController
 @RequestMapping("/seatunnel/api/v1/job/config")

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/JobController.java

@@ -34,7 +34,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @RestController
 @RequestMapping("/seatunnel/api/v1/job")

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/JobDefinitionController.java

@@ -39,7 +39,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @RestController
 @RequestMapping("/seatunnel/api/v1/job/definition")

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/JobExecutorController.java

@@ -39,10 +39,9 @@
 
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.annotation.Resource;
-
 import java.io.IOException;
 
 @Slf4j

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/JobMetricsController.java

@@ -33,7 +33,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import java.io.IOException;
 import java.util.List;

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/JobTaskController.java

@@ -36,7 +36,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @RestController
 @RequestMapping("/seatunnel/api/v1/job/")

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/SchemaDerivationController.java

@@ -30,7 +30,7 @@
 
 import io.swagger.annotations.ApiParam;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @RestController
 @RequestMapping("/seatunnel/api/v1/schema/derivation")

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/ScriptController.java

@@ -46,7 +46,7 @@
 // import io.swagger.annotations.ApiParam;
 // import springfox.documentation.annotations.ApiIgnore;
 //
-// import javax.annotation.Resource;
+// import jakarta.annotation.Resource;
 // import javax.validation.constraints.NotNull;
 //
 // import java.util.List;

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/SeatunnelDatasourceController.java

@@ -57,10 +57,9 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.annotation.Resource;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/TableSchemaController.java

@@ -33,7 +33,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @RestController
 @RequestMapping("/seatunnel/api/v1/job/table")

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/TaskController.java

@@ -42,7 +42,7 @@
 // import io.swagger.annotations.ApiParam;
 // import springfox.documentation.annotations.ApiIgnore;
 //
-// import javax.annotation.Resource;
+// import jakarta.annotation.Resource;
 // import javax.validation.constraints.NotNull;
 //
 // @RequestMapping("/seatunnel/api/v1/task")

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/UserController.java

@@ -40,8 +40,8 @@
 
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import jakarta.annotation.Resource;
 
-import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 
 @RequestMapping("/seatunnel/api/v1/user")

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/VirtualTableController.java

@@ -43,10 +43,9 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.annotation.Resource;
-
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/DatasourceDaoImpl.java

@@ -27,7 +27,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import java.util.List;
 

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobDefinitionDaoImpl.java

@@ -29,10 +29,9 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jakarta.annotation.Resource;
 import lombok.NonNull;
 
-import javax.annotation.Resource;
-
 import java.util.List;
 
 @Repository

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceDaoImpl.java

@@ -27,10 +27,9 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import jakarta.annotation.Resource;
 import lombok.NonNull;
 
-import javax.annotation.Resource;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobInstanceHistoryDaoImpl.java

@@ -25,7 +25,7 @@
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @Repository
 public class JobInstanceHistoryDaoImpl implements IJobInstanceHistoryDao {

seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/dal/dao/impl/JobLineDaoImpl.java

@@ -25,7 +25,7 @@
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import java.util.List;