feat: ✨ up java17, springboot 3

bubble-core/pom.xml

@@ -20,8 +20,8 @@
  </dependency>
  <!-- servlet-api -->
  <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
  </dependency>
  <!-- swagger-models -->
  <dependency>

bubble-core/src/main/java/cn/fxbin/bubble/core/model/PageRequest.java

@@ -7,8 +7,8 @@
 import lombok.ToString;
 import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;

bubble-core/src/main/java/cn/fxbin/bubble/core/util/WebUtils.java

@@ -7,9 +7,9 @@
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
@@ -51,11 +51,11 @@ public class WebUtils extends org.springframework.web.util.WebUtils {
  * getRequest
  *
  * <p>
- * get javax.servlet.http.HttpServletRequest instance
+ * get jakarta.servlet.http.HttpServletRequest instance
  * </p>
  *
  * @since 2020/4/13 17:32
- * @return javax.servlet.http.HttpServletRequest
+ * @return jakarta.servlet.http.HttpServletRequest
  */
  public HttpServletRequest getRequest() {
  return Optional.ofNullable(RequestContextHolder.getRequestAttributes())
@@ -141,11 +141,11 @@ public Map<String, String> getRequestHeaders(HttpServletRequest request) {
  * getResponse
  *
  * <p>
- * get javax.servlet.http.HttpServletResponse instance
+ * get jakarta.servlet.http.HttpServletResponse instance
  * </p>
  *
  * @since 2020/4/13 17:31
- * @return javax.servlet.http.HttpServletResponse
+ * @return jakarta.servlet.http.HttpServletResponse
  */
  public HttpServletResponse getResponse() {
  return Optional.ofNullable(RequestContextHolder.getRequestAttributes())

bubble-dependencies/pom.xml

@@ -15,10 +15,10 @@
 
  <properties>
  <!-- Spring Boot And Spring Cloud Dependency Versions -->
- <spring-boot.version>2.7.14</spring-boot.version>
- <spring-cloud.version>2021.0.8</spring-cloud.version>
- <spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
- <spring-boot-admin.version>2.7.10</spring-boot-admin.version>
+ <spring-boot.version>3.1.2</spring-boot.version>
+ <spring-cloud.version>2022.0.4</spring-cloud.version>
+ <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
+ <spring-boot-admin.version>3.1.5</spring-boot-admin.version>
 
  <!-- Other Dependency Versions -->
  <knife4j.version>3.0.3</knife4j.version>

bubble-spring-boot-starters/bubble-spring-boot-starter-data-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+cn.fxbin.bubble.data.elasticsearch.autoconfigure.ElasticsearchAutoConfiguration

bubble-spring-boot-starters/bubble-spring-boot-starter-data-mybatis-plus/src/main/resources/META-INF/spring.factories → bubble-spring-boot-starters/bubble-spring-boot-starter-data-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,4 +1,2 @@
-## Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-cn.fxbin.bubble.data.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration,\
+cn.fxbin.bubble.data.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration
 cn.fxbin.bubble.data.mybatisplus.autoconfigure.DataSourceConfiguration

bubble-spring-boot-starters/bubble-spring-boot-starter-data-redis/src/main/resources/META-INF/spring.factories → bubble-spring-boot-starters/bubble-spring-boot-starter-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,4 +1,2 @@
-## Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-cn.fxbin.bubble.data.redis.autoconfigure.RedisTemplateAutoConfiguration,\
+cn.fxbin.bubble.data.redis.autoconfigure.RedisTemplateAutoConfiguration
 cn.fxbin.bubble.data.redis.autoconfigure.SessionAutoConfiguration

bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/DynamicThreadPoolAutoConfiguration.java

@@ -23,8 +23,8 @@
 import org.springframework.context.event.EventListener;
 import org.springframework.core.env.Environment;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.BlockingQueue;

bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/endpoint/ThreadPoolEndpoint.java

@@ -9,7 +9,7 @@
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;

bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/java/cn/fxbin/bubble/plugin/dynamic/threadpool/autoconfigure/listener/ConfigServerHandler.java

@@ -7,7 +7,7 @@
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.PropertySource;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executors;

bubble-spring-boot-starters/bubble-spring-boot-starter-dynamic-threadpool/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
+cn.fxbin.bubble.plugin.dynamic.threadpool.autoconfigure.DynamicThreadPoolAutoConfiguration
+cn.fxbin.bubble.plugin.dynamic.threadpool.autoconfigure.ConfigServerRefreshAutoConfiguration

bubble-spring-boot-starters/bubble-spring-boot-starter-excel/src/main/java/cn/fxbin/bubble/plugin/excel/util/ExcelUtils.java

@@ -6,7 +6,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.web.util.UriUtils;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 
 /**
@@ -25,7 +25,7 @@ public class ExcelUtils {
  * setResponse
  *
  * @since 2020/4/7 16:13
- * @param response javax.servlet.http.HttpServletResponse
+ * @param response jakarta.servlet.http.HttpServletResponse
  * @param fileName excel file name
  */
  public void setResponse(HttpServletResponse response, String fileName) {

bubble-spring-boot-starters/bubble-spring-boot-starter-i18n/src/main/java/cn/fxbin/bubble/i18n/I18nAutoConfiguration.java

@@ -19,7 +19,7 @@
 import org.springframework.web.servlet.i18n.CookieLocaleResolver;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Objects;

bubble-spring-boot-starters/bubble-spring-boot-starter-i18n/src/main/java/cn/fxbin/bubble/i18n/I18nMessageProvider.java

@@ -4,7 +4,7 @@
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Locale;
 
 /**

bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/java/cn/fxbin/bubble/plugin/lock/factory/LockFactory.java

@@ -7,7 +7,7 @@
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * LockFactory

bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/java/cn/fxbin/bubble/plugin/lock/support/LockActionAspect.java

@@ -20,7 +20,7 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.util.Assert;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.lang.reflect.Method;
 
 /**

bubble-spring-boot-starters/bubble-spring-boot-starter-lock/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
+cn.fxbin.bubble.plugin.lock.autoconfigure.RedissonAutoConfiguration
+cn.fxbin.bubble.plugin.lock.autoconfigure.LockAutoConfiguration

bubble-spring-boot-starters/bubble-spring-boot-starter-logging/pom.xml

@@ -29,12 +29,13 @@
  </dependency>
 
  <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>transmittable-thread-local</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
  </dependency>
+
  <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-sleuth</artifactId>
+ <groupId>com.alibaba</groupId>
+ <artifactId>transmittable-thread-local</artifactId>
  </dependency>
 
  <dependency>

bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/aspect/LoggingWebAspect.java

@@ -17,9 +17,9 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.ApplicationEventPublisher;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.concurrent.TimeUnit;
 
 /**

bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/autoconfigure/AliyunLogContextAutoConfigure.java

@@ -17,7 +17,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.Assert;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * AliyunLogContext

bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/event/runner/LoggingNoticeRunner.java

@@ -12,7 +12,7 @@
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collections;
 
 /**

bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/report/AliyunLoggingReport.java

@@ -24,7 +24,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.lang.Nullable;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;

bubble-spring-boot-starters/bubble-spring-boot-starter-logging/src/main/java/cn/fxbin/bubble/plugin/logging/report/LoggingReportScheduled.java

@@ -5,7 +5,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;