feat: bump spring boot to v3.0.0

.bazelrc

@@ -1 +1,5 @@
-build --java_language_version=17
+build --java_language_version=17
+
+# Load any settings which are specific to the current user. Needs to be *last* statement
+# in this config, as the user configuration should be able to overwrite flags from this file.
+try-import %workspace%/.bazelrc.user

.github/workflows/ci.yaml

@@ -75,4 +75,4 @@ jobs:
       - name: Build with vite
         run: cd ./src/main/react && yarn && yarn build
       - name: Build with bazel
-        run: bazel build //:java-maven 
+        run: bazel build //:jobs

.gitignore

@@ -43,4 +43,5 @@ logs
 bazel-bin
 bazel-jobs
 bazel-out
-bazel-testlogs
+bazel-testlogs
+.bazelrc.user

BUILD.bazel

@@ -61,7 +61,7 @@ java_library(
 )
 
 java_binary(
-    name = "java-maven",
+    name = "jobs",
     main_class = "org.daming.jobs.JobsApplication",
     runtime_deps = [":java-maven-lib"],
 )

WORKSPACE

@@ -22,30 +22,71 @@ load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
 
 # rules_jvm_external_setup()
 
+load("@rules_jvm_external//:specs.bzl", "maven")
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 
+# for https://github.com/apache/shiro/issues/891
+shiros = [
+    maven.artifact(
+        group ="org.apache.shiro",
+        artifact = "shiro-spring-boot-web-starter",
+        version = "1.12.0",
+        # classifier = "jakarta",
+    ),
+    maven.artifact(
+        group ="org.apache.shiro",
+        artifact = "shiro-spring-boot-starter",
+        version = "1.12.0",
+        classifier = "jakarta",
+    ),
+    maven.artifact(
+        group = "org.apache.shiro",
+        artifact = "shiro-spring",
+        version = "1.12.0",
+        classifier = "jakarta",
+        exclusions = [
+            maven.exclusion(
+                  group = "javax.servlet",
+                  artifact = "*",
+            ),
+            maven.exclusion(
+                  group = "org.apache.shiro",
+                  artifact = "*",
+            ),
+        ]
+    ),
+    maven.artifact(
+        group = "org.apache.shiro",
+        artifact = "shiro-web",
+        version ="1.12.0",
+        classifier = "jakarta",
+    )
+]
+
 maven_install(
     artifacts = [
-        "org.springframework.boot:spring-boot-starter-web:2.7.12",
-        "org.springframework.boot:spring-boot-starter-jdbc:2.7.12",
-        "org.springframework.boot:spring-boot-starter-quartz:2.7.12",
-        "org.springframework.boot:spring-boot-starter-aop:2.7.12",
+        "org.springframework.boot:spring-boot-starter-web:3.0.0",
+        "org.springframework.boot:spring-boot-starter-jdbc:3.0.0",
+        "org.springframework.boot:spring-boot-starter-quartz:3.0.0",
+        "org.springframework.boot:spring-boot-starter-aop:3.0.0",
 
         "io.springfox:springfox-boot-starter:3.0.0",
-        "org.apache.shiro:shiro-spring-boot-starter:1.9.1",
         "com.auth0:java-jwt:3.19.4",
         "org.postgresql:postgresql:42.4.0",
 
-        "org.springframework.boot:spring-boot-devtools:2.7.12",
-        "org.springframework.boot:spring-boot-starter-test:2.7.12"
+        "org.springframework.boot:spring-boot-devtools:3.0.0",
+        "org.springframework.boot:spring-boot-starter-test:3.0.0"
 
-    ],
-     fetch_sources = True,
+    ] + shiros,
+    fetch_sources = True,
     repositories = [
         "https://maven.aliyun.com/repository/public/",
         "https://maven.aliyun.com/nexus/content/groups/public/",
         "http://uk.maven.org/maven2",
         "https://maven.google.com",
         "https://repo1.maven.org/maven2",
     ],
-)
+    override_targets = {
+        "javax.servlet:javax.servlet-api": "jakarta.servlet:jakarta.servlet-api",
+    },
+)

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '2.7.12'
+	id 'org.springframework.boot' version '3.0.0'
 	id 'io.spring.dependency-management' version '1.1.0'
 	id 'org.flywaydb.flyway' version '9.19.1'
 	id 'java'
@@ -27,7 +27,9 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-quartz'
 	implementation 'org.springframework.boot:spring-boot-starter-aop'
 	implementation 'io.springfox:springfox-boot-starter:3.0.0'
-	implementation 'org.apache.shiro:shiro-spring-boot-starter:1.9.1'
+	implementation 'org.apache.shiro:shiro-spring-boot-starter:1.12.0:jakarta'
+    implementation('org.apache.shiro:shiro-spring:1.12.0:jakarta') { exclude group: 'org.apache.shiro', module: 'shiro-web' }
+    implementation 'org.apache.shiro:shiro-web:1.12.0:jakarta'
 
 	implementation 'com.auth0:java-jwt:3.19.4'
 	implementation 'org.postgresql:postgresql'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

src/main/java/org/daming/jobs/api/interceptor/ControllerInterceptor.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -14,7 +15,6 @@
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.UUID;
 
 /**

src/main/java/org/daming/jobs/base/shiro/JWTFilter.java

@@ -1,15 +1,15 @@
 package org.daming.jobs.base.shiro;
 
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
 import org.daming.jobs.base.logger.DamingLogger;
 import org.daming.jobs.base.logger.LoggerManager;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 

src/main/java/org/daming/jobs/base/shiro/ShiroUserService.java

@@ -1,8 +1,8 @@
 package org.daming.jobs.base.shiro;
 
+import jakarta.annotation.PostConstruct;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/daming/jobs/base/utils/CommonUtils.java

@@ -1,6 +1,7 @@
 package org.daming.jobs.base.utils;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.*;

src/main/java/org/daming/jobs/config/ShiroConfig.java

@@ -1,5 +1,6 @@
 package org.daming.jobs.config;
 
+import jakarta.servlet.Filter;
 import org.apache.shiro.mgt.DefaultSessionStorageEvaluator;
 import org.apache.shiro.mgt.DefaultSubjectDAO;
 import org.apache.shiro.spring.LifecycleBeanPostProcessor;
@@ -13,7 +14,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 
-import javax.servlet.Filter;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;

src/main/java/org/daming/jobs/config/service/impl/ErrorCodeServiceImpl.java

@@ -5,7 +5,7 @@
 import org.daming.jobs.pojo.ApiError;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;