From 1601b6e64d5a3e31ae4d7750018bc8843561002a Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Wed, 31 Jan 2024 23:14:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=203.1.0=201.=20=E5=8D=87=E7=BA=A7spring?= =?UTF-8?q?=20boot=203.2.2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/META-INF/spring.factories | 3 --- ...boot.autoconfigure.AutoConfiguration.imports | 3 ++- .../easy-retry-client-common/pom.xml | 4 ++-- .../core/strategy/RemoteRetryStrategies.java | 2 +- .../easy-retry-client-job-core/pom.xml | 4 ++-- .../easy/retry/client/model/StopJobDTO.java | 5 ++--- .../model/request/DispatchJobRequest.java | 5 ++--- easy-retry-common/easy-retry-common-log/pom.xml | 4 +++- .../main/resources/META-INF/spring.factories | 3 --- ...boot.autoconfigure.AutoConfiguration.imports | 2 ++ .../easy-retry-server-common/pom.xml | 4 ++-- .../retry/server/common/dto/JobTaskConfig.java | 2 -- .../main/resources/META-INF/spring.factories | 2 -- ...boot.autoconfigure.AutoConfiguration.imports | 1 + .../easy-retry-server-job-task/pom.xml | 4 ++-- .../main/resources/META-INF/spring.factories | 2 -- ...boot.autoconfigure.AutoConfiguration.imports | 1 + .../easy-retry-server-retry-task/pom.xml | 4 ++-- .../main/resources/META-INF/spring.factories | 2 -- ...boot.autoconfigure.AutoConfiguration.imports | 1 + .../easy-retry-server-starter/pom.xml | 17 ++++++++++++++--- easy-retry-server/easy-retry-server-web/pom.xml | 4 ++-- .../model/request/JobNotifyConfigRequestVO.java | 6 +++--- .../server/web/model/request/JobRequestVO.java | 6 +++--- .../request/JobUpdateJobStatusRequestVO.java | 2 +- .../web/model/request/NamespaceRequestVO.java | 2 +- .../model/request/NotifyConfigRequestVO.java | 6 +++--- .../web/model/request/SceneConfigRequestVO.java | 2 +- .../web/model/request/WorkflowRequestVO.java | 10 +++++----- .../retry/server/web/util/UserSessionUtils.java | 2 +- .../main/resources/META-INF/spring.factories | 2 -- ...boot.autoconfigure.AutoConfiguration.imports | 1 + easy-retry-server/pom.xml | 1 - pom.xml | 8 ++++---- 34 files changed, 64 insertions(+), 63 deletions(-) delete mode 100644 easy-retry-client-starter/src/main/resources/META-INF/spring.factories delete mode 100644 easy-retry-common/easy-retry-common-log/src/main/resources/META-INF/spring.factories create mode 100644 easy-retry-common/easy-retry-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 easy-retry-server/easy-retry-server-common/src/main/resources/META-INF/spring.factories create mode 100644 easy-retry-server/easy-retry-server-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 easy-retry-server/easy-retry-server-job-task/src/main/resources/META-INF/spring.factories create mode 100644 easy-retry-server/easy-retry-server-job-task/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 easy-retry-server/easy-retry-server-retry-task/src/main/resources/META-INF/spring.factories create mode 100644 easy-retry-server/easy-retry-server-retry-task/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 easy-retry-server/easy-retry-server-web/src/main/resources/META-INF/spring.factories create mode 100644 easy-retry-server/easy-retry-server-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/easy-retry-client-starter/src/main/resources/META-INF/spring.factories b/easy-retry-client-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index c087051c..00000000 --- a/easy-retry-client-starter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.aizuda.easy.retry.client.starter.EasyRetryJobClientAutoConfiguration,\ - com.aizuda.easy.retry.client.starter.EasyRetryClientAutoConfiguration diff --git a/easy-retry-client-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-retry-client-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index eda4d7ef..d2dc781a 100644 --- a/easy-retry-client-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/easy-retry-client-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1,2 @@ -com.aizuda.easy.retry.client.starter.EasyRetryClientAutoConfiguration +com.aizuda.easy.retry.client.starter.EasyRetryJobClientAutoConfiguration +com.aizuda.easy.retry.client.starter.EasyRetryClientAutoConfiguration \ No newline at end of file diff --git a/easy-retry-client/easy-retry-client-common/pom.xml b/easy-retry-client/easy-retry-client-common/pom.xml index db98fcd0..17db16bd 100644 --- a/easy-retry-client/easy-retry-client-common/pom.xml +++ b/easy-retry-client/easy-retry-client-common/pom.xml @@ -15,8 +15,8 @@ easy-retry-client-common - 8 - 8 + 17 + 17 UTF-8 diff --git a/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RemoteRetryStrategies.java b/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RemoteRetryStrategies.java index 690460aa..27a08cda 100644 --- a/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RemoteRetryStrategies.java +++ b/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RemoteRetryStrategies.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Collections; import java.util.List; import java.util.Objects; diff --git a/easy-retry-client/easy-retry-client-job-core/pom.xml b/easy-retry-client/easy-retry-client-job-core/pom.xml index b128c3f2..0038b164 100644 --- a/easy-retry-client/easy-retry-client-job-core/pom.xml +++ b/easy-retry-client/easy-retry-client-job-core/pom.xml @@ -15,8 +15,8 @@ easy-retry-client-job-core - 8 - 8 + 17 + 17 UTF-8 32.0.0-jre diff --git a/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/StopJobDTO.java b/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/StopJobDTO.java index b511883b..a1c23d00 100644 --- a/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/StopJobDTO.java +++ b/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/StopJobDTO.java @@ -1,10 +1,9 @@ package com.aizuda.easy.retry.client.model; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - /** * @author: www.byteblogs.com * @date : 2023-09-26 15:10 diff --git a/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/request/DispatchJobRequest.java b/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/request/DispatchJobRequest.java index 5ff00d13..ed50ffdd 100644 --- a/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/request/DispatchJobRequest.java +++ b/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/request/DispatchJobRequest.java @@ -1,10 +1,9 @@ package com.aizuda.easy.retry.client.model.request; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - /** * @author: www.byteblogs.com * @date : 2023-09-26 15:10 diff --git a/easy-retry-common/easy-retry-common-log/pom.xml b/easy-retry-common/easy-retry-common-log/pom.xml index 1835b905..9b61512c 100644 --- a/easy-retry-common/easy-retry-common-log/pom.xml +++ b/easy-retry-common/easy-retry-common-log/pom.xml @@ -16,7 +16,9 @@ jar - 1.8 + 17 + 17 + 17 diff --git a/easy-retry-common/easy-retry-common-log/src/main/resources/META-INF/spring.factories b/easy-retry-common/easy-retry-common-log/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 0592ac7f..00000000 --- a/easy-retry-common/easy-retry-common-log/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.aizuda.easy.retry.common.log.CommonLogConfigure - diff --git a/easy-retry-common/easy-retry-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-retry-common/easy-retry-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..c6a80d40 --- /dev/null +++ b/easy-retry-common/easy-retry-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.aizuda.easy.retry.common.log.CommonLogConfigure + diff --git a/easy-retry-server/easy-retry-server-common/pom.xml b/easy-retry-server/easy-retry-server-common/pom.xml index 856ea21c..6189c9b8 100644 --- a/easy-retry-server/easy-retry-server-common/pom.xml +++ b/easy-retry-server/easy-retry-server-common/pom.xml @@ -16,8 +16,8 @@ jar - 8 - 8 + 17 + 17 UTF-8 diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/dto/JobTaskConfig.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/dto/JobTaskConfig.java index 21b31d77..c08a6cc6 100644 --- a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/dto/JobTaskConfig.java +++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/dto/JobTaskConfig.java @@ -2,8 +2,6 @@ package com.aizuda.easy.retry.server.common.dto; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @author xiaowoniu * @date 2023-12-30 21:42:59 diff --git a/easy-retry-server/easy-retry-server-common/src/main/resources/META-INF/spring.factories b/easy-retry-server/easy-retry-server-common/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 8a90ec75..00000000 --- a/easy-retry-server/easy-retry-server-common/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.aizuda.easy.retry.server.common.config.EasyRetryServerCommonAutoConfiguration diff --git a/easy-retry-server/easy-retry-server-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-retry-server/easy-retry-server-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..b1ee987a --- /dev/null +++ b/easy-retry-server/easy-retry-server-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.aizuda.easy.retry.server.common.config.EasyRetryServerCommonAutoConfiguration diff --git a/easy-retry-server/easy-retry-server-job-task/pom.xml b/easy-retry-server/easy-retry-server-job-task/pom.xml index fdabac4f..2e7208a6 100644 --- a/easy-retry-server/easy-retry-server-job-task/pom.xml +++ b/easy-retry-server/easy-retry-server-job-task/pom.xml @@ -16,8 +16,8 @@ jar - 8 - 8 + 17 + 17 UTF-8 diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/resources/META-INF/spring.factories b/easy-retry-server/easy-retry-server-job-task/src/main/resources/META-INF/spring.factories deleted file mode 100644 index d7880cce..00000000 --- a/easy-retry-server/easy-retry-server-job-task/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.aizuda.easy.retry.server.job.task.EasyRetryJobTaskStarter diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-retry-server/easy-retry-server-job-task/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..6ae3df63 --- /dev/null +++ b/easy-retry-server/easy-retry-server-job-task/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.aizuda.easy.retry.server.job.task.EasyRetryJobTaskStarter diff --git a/easy-retry-server/easy-retry-server-retry-task/pom.xml b/easy-retry-server/easy-retry-server-retry-task/pom.xml index f8c82a11..8a047596 100644 --- a/easy-retry-server/easy-retry-server-retry-task/pom.xml +++ b/easy-retry-server/easy-retry-server-retry-task/pom.xml @@ -16,8 +16,8 @@ jar - 8 - 8 + 17 + 17 UTF-8 diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/resources/META-INF/spring.factories b/easy-retry-server/easy-retry-server-retry-task/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 8ee06e51..00000000 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.aizuda.easy.retry.server.retry.task.EasyRetryRetryTaskStarter diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-retry-server/easy-retry-server-retry-task/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..5018c3cf --- /dev/null +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.aizuda.easy.retry.server.retry.task.EasyRetryRetryTaskStarter diff --git a/easy-retry-server/easy-retry-server-starter/pom.xml b/easy-retry-server/easy-retry-server-starter/pom.xml index ef8acebd..b1ab02b2 100644 --- a/easy-retry-server/easy-retry-server-starter/pom.xml +++ b/easy-retry-server/easy-retry-server-starter/pom.xml @@ -16,9 +16,9 @@ jar - 1.8 - 8 - 8 + 17 + 17 + 17 UTF-8 @@ -26,6 +26,17 @@ com.aizuda easy-retry-server-web + + + mybatis-spring + org.mybatis + + + + + org.mybatis + mybatis-spring + 3.0.3 com.aizuda diff --git a/easy-retry-server/easy-retry-server-web/pom.xml b/easy-retry-server/easy-retry-server-web/pom.xml index 0d492a00..c9b20c8b 100644 --- a/easy-retry-server/easy-retry-server-web/pom.xml +++ b/easy-retry-server/easy-retry-server-web/pom.xml @@ -16,8 +16,8 @@ jar - 8 - 8 + 17 + 17 UTF-8 4.4.0 diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobNotifyConfigRequestVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobNotifyConfigRequestVO.java index 21a3d02b..f4482bce 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobNotifyConfigRequestVO.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobNotifyConfigRequestVO.java @@ -2,9 +2,9 @@ package com.aizuda.easy.retry.server.web.model.request; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; /** * @author zuoJunLin diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobRequestVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobRequestVO.java index b5b62570..19666d6b 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobRequestVO.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobRequestVO.java @@ -2,9 +2,9 @@ package com.aizuda.easy.retry.server.web.model.request; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; /** * @author www.byteblogs.com diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobUpdateJobStatusRequestVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobUpdateJobStatusRequestVO.java index 776516ae..440c1418 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobUpdateJobStatusRequestVO.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobUpdateJobStatusRequestVO.java @@ -2,7 +2,7 @@ package com.aizuda.easy.retry.server.web.model.request; import lombok.Data; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * @author www.byteblogs.com diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/NamespaceRequestVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/NamespaceRequestVO.java index 19db29b2..63940bcc 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/NamespaceRequestVO.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/NamespaceRequestVO.java @@ -2,7 +2,7 @@ package com.aizuda.easy.retry.server.web.model.request; import lombok.Data; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * @author: xiaowoniu diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/NotifyConfigRequestVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/NotifyConfigRequestVO.java index b6518cd6..bb731b4a 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/NotifyConfigRequestVO.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/NotifyConfigRequestVO.java @@ -2,9 +2,9 @@ package com.aizuda.easy.retry.server.web.model.request; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; /** * @author www.byteblogs.com diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/SceneConfigRequestVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/SceneConfigRequestVO.java index f28959a8..4beabad1 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/SceneConfigRequestVO.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/SceneConfigRequestVO.java @@ -3,7 +3,7 @@ package com.aizuda.easy.retry.server.web.model.request; import com.aizuda.easy.retry.common.core.constant.SystemConstants; import lombok.Data; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; /** * @author www.byteblogs.com diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/WorkflowRequestVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/WorkflowRequestVO.java index 25281237..af9f84a6 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/WorkflowRequestVO.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/WorkflowRequestVO.java @@ -5,11 +5,11 @@ import com.aizuda.easy.retry.server.common.dto.DecisionConfig; import com.aizuda.easy.retry.server.common.dto.JobTaskConfig; import lombok.Data; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import java.util.List; /** diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/util/UserSessionUtils.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/util/UserSessionUtils.java index d6291dae..0011f9b8 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/util/UserSessionUtils.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/util/UserSessionUtils.java @@ -4,7 +4,7 @@ import com.aizuda.easy.retry.server.web.model.request.UserSessionVO; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * @author www.byteblogs.com diff --git a/easy-retry-server/easy-retry-server-web/src/main/resources/META-INF/spring.factories b/easy-retry-server/easy-retry-server-web/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 7e074802..00000000 --- a/easy-retry-server/easy-retry-server-web/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.aizuda.easy.retry.server.web.EasyRetryWebStarter diff --git a/easy-retry-server/easy-retry-server-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-retry-server/easy-retry-server-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..73289651 --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.aizuda.easy.retry.server.web.EasyRetryWebStarter diff --git a/easy-retry-server/pom.xml b/easy-retry-server/pom.xml index dc79d14d..036bc274 100644 --- a/easy-retry-server/pom.xml +++ b/easy-retry-server/pom.xml @@ -24,7 +24,6 @@ 17 - true 1.5.3.Final 2.6.21 4.4.0 diff --git a/pom.xml b/pom.xml index 33313ed4..2488ad2b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.2.2 @@ -21,11 +21,11 @@ 17 17 17 - 3.0.0 + 3.1.0-SNAPSHOT 1.0.0 4.1.94.Final 5.8.19 - 3.5.3.2 + 3.5.5 2.0.0 2.0.0 1.3.6 @@ -277,7 +277,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.2.0 attach-javadocs