Merge pull request #205 from 17629354490/master

dependency upgrade

.github/workflows/codeql-analysis.yml

@@ -51,7 +51,9 @@ jobs:
 
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
-
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 17
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)

devops/it/pom.xml

@@ -27,7 +27,7 @@
     <version>3.0.0-RC4</version>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
         <maven.compiler.encoding>${project.build.sourceEncoding}</maven.compiler.encoding>
@@ -121,7 +121,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>properties-maven-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <phase>initialize</phase>
@@ -139,6 +139,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.2.3</version>
                 <configuration>
                     <skip>${dew.it.skip}</skip>
                 </configuration>
@@ -154,7 +155,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.12.1</version>
                 <configuration>
                     <source>${maven.compiler.source}</source>
                     <target>${maven.compiler.source}</target>

devops/it/src/it/todo/backend/libraries/common/src/main/java/group/idealworld/dew/devops/it/todo/common/domain/IdEntity.java

@@ -16,10 +16,10 @@
 
 package group.idealworld.dew.devops.it.todo.common.domain;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 
 /**
  * Id entity.

devops/it/src/it/todo/backend/services/compute/src/main/java/group/idealworld/dew/devops/it/todo/compute/controller/ComputeController.java

@@ -16,9 +16,9 @@
 
 package group.idealworld.dew.devops.it.todo.compute.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import group.idealworld.dew.devops.it.todo.compute.service.ComputeService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -33,7 +33,7 @@
  * @author gudaoxuri
  */
 @RestController
-@Api("TODO计算")
+@Tag(name = "TODO计算")
 @RequestMapping("/")
 public class ComputeController {
 
@@ -49,7 +49,7 @@ public class ComputeController {
      * @throws ScriptException the script exception
      */
     @PutMapping("compute")
-    @ApiOperation(value = "执行计算")
+    @Operation(summary = "执行计算")
     public String compute(@RequestBody String jsCode) throws ScriptException {
         return computeService.compute(jsCode);
     }

devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/controller/TodoController.java

@@ -17,10 +17,10 @@
 package group.idealworld.dew.devops.it.todo.kernel.controller;
 
 import com.ecfront.dew.common.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import group.idealworld.dew.devops.it.todo.kernel.domain.Todo;
 import group.idealworld.dew.devops.it.todo.kernel.service.TodoService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,7 +31,7 @@
  */
 @RestController
 // Swagger文档注解
-@Api("TODO示例")
+@Tag(name = "TODO示例")
 @RequestMapping("/api")
 public class TodoController {
 
@@ -46,7 +46,7 @@ public class TodoController {
      * @return the page
      */
     @GetMapping("")
-    @ApiOperation(value = "获取Todo列表")
+    @Operation(summary = "获取Todo列表")
     public Page<Todo> findAll(@RequestParam(value = "pageNumber", required = false, defaultValue = "1") int pageNumber,
                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize) {
         return todoService.list(pageNumber, pageSize);
@@ -59,7 +59,7 @@ public Page<Todo> findAll(@RequestParam(value = "pageNumber", required = false,
      * @return the int
      */
     @PostMapping("")
-    @ApiOperation(value = "添加Todo记录")
+    @Operation(summary = "添加Todo记录")
     public Todo add(@RequestBody String content) {
         return todoService.add(content);
     }
@@ -70,7 +70,7 @@ public Todo add(@RequestBody String content) {
      * @param id the id
      */
     @DeleteMapping("{id}")
-    @ApiOperation(value = "删除Todo记录")
+    @Operation(summary = "删除Todo记录")
     public boolean delete(@PathVariable("id") int id) {
         return todoService.delete(id);
     }
@@ -82,7 +82,7 @@ public boolean delete(@PathVariable("id") int id) {
      * @param afterBy the after by
      */
     @PutMapping("{id}/sort")
-    @ApiOperation(value = "调整Todo记录顺序")
+    @Operation(summary = "调整Todo记录顺序")
     public boolean sort(@PathVariable("id") int id,
                      @RequestParam(value = "afterBy") int afterBy) {
         return todoService.sort(id, afterBy);

devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/domain/Todo.java

@@ -20,10 +20,10 @@
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import java.util.Date;
 
 /**

devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/repository/TodoRepository.java

@@ -19,7 +19,7 @@
 import group.idealworld.dew.devops.it.todo.kernel.domain.Todo;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * The interface To-do repository.

devops/it/src/it/todo/backend/services/notifier/src/main/java/group/idealworld/dew/devops/it/todo/notifier/controller/NotifierController.java

@@ -22,7 +22,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 /**
  * Notifier controller.

examples/auth-example/src/main/java/group/idealworld/dew/example/auth/AuthExampleController.java

@@ -23,7 +23,7 @@
 import group.idealworld.dew.example.auth.dto.OptInfoExt;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;

examples/bone-example/src/main/java/group/idealworld/dew/example/bone/BoneExampleInitiator.java

@@ -22,7 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 /**
  * 在根路径创建用于初始化数据/行为的类.

examples/cluster-example/src/main/java/group/idealworld/dew/example/cluster/ClusterExampleInitiator.java

@@ -24,7 +24,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.Serializable;
 
 /**

examples/hbase-example/src/main/java/group/idealworld/dew/example/hbase/HBaseExampleInitiator.java

@@ -23,7 +23,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 /**
  * Cluster example initiator.

examples/idempotent-example/src/main/java/group/idealworld/dew/example/idempotent/IdempotentService.java

@@ -22,7 +22,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 /**
  * 演示通过MQ等非HTTP调用的幂等处理.

framework/modules/boot-starter/src/main/java/group/idealworld/dew/Dew.java

@@ -40,8 +40,8 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.*;

framework/modules/boot-starter/src/main/java/group/idealworld/dew/DewStartup.java

@@ -24,8 +24,8 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.web.client.RestTemplate;
 
-import javax.annotation.PostConstruct;
-import javax.servlet.*;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.*;
 import java.io.IOException;
 
 /**

framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/auth/AuthAutoConfiguration.java

@@ -21,7 +21,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 /**
  * Auth auto configuration.

framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/auth/BasicAuthAdapter.java

@@ -23,7 +23,7 @@
 import group.idealworld.dew.core.auth.dto.OptInfo;
 import group.idealworld.dew.core.cluster.ClusterCache;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;

framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/basic/utils/convert/ConvertAutoConfiguration.java

@@ -22,7 +22,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 /**
  * Convert auto configuration.

framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/error/ErrorAutoConfiguration.java

@@ -28,8 +28,8 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.DispatcherServlet;
 
-import javax.annotation.PostConstruct;
-import javax.servlet.Servlet;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.Servlet;
 
 /**
  * Error auto configuration.

framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/error/ErrorController.java

@@ -41,9 +41,9 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.ServletRequestWrapper;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
 import java.io.IOException;
 import java.util.List;

framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/BasicHandlerInterceptor.java

@@ -21,8 +21,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * 基础拦截器.

framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/IdentInfoHandlerInterceptor.java

@@ -27,9 +27,9 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 
-import javax.security.auth.message.AuthException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.security.auth.message.AuthException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;

framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/InterceptorWebAutoConfiguration.java

@@ -27,7 +27,7 @@
 import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 /**
  * Interceptor web auto configuration.

framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/RouterHandlerInterceptor.java

@@ -27,9 +27,9 @@
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 
-import javax.security.auth.message.AuthException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.security.auth.message.AuthException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
 

framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/TokenHandlerInterceptor.java

@@ -24,8 +24,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 

framework/modules/boot-starter/src/test/java/com/trc/test/GeneralTest.java

@@ -30,7 +30,7 @@
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 
 /**

framework/modules/boot-starter/src/test/java/com/trc/test/auth/AuthController.java

@@ -22,7 +22,7 @@
 import group.idealworld.dew.core.DewContext;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
 

framework/modules/cluster-hazelcast/src/main/java/group/idealworld/dew/core/cluster/spi/hazelcast/HazelcastAdapter.java

@@ -20,8 +20,8 @@
 import com.hazelcast.client.config.ClientConfig;
 import com.hazelcast.core.HazelcastInstance;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 /**
  * Hazelcast adapter.

framework/modules/cluster-mqtt/src/main/java/group/idealworld/dew/core/cluster/spi/mqtt/MqttAutoConfiguration.java

@@ -25,7 +25,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 /**
  * Mqtt auto configuration.