Skip to content

Commit 070bc04

Browse files
committed
[refactor/#350] Spring Boot 3 마이그레이션
1 parent c228325 commit 070bc04

192 files changed

Lines changed: 524 additions & 527 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build.gradle

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
2-
id 'org.springframework.boot' version '2.7.18'
3-
id 'io.spring.dependency-management' version '1.0.15.RELEASE'
2+
id 'org.springframework.boot' version '3.3.5'
3+
id 'io.spring.dependency-management' version '1.1.6'
44
id 'java-library'
5-
id 'com.diffplug.spotless' version '6.13.0'
5+
id 'com.diffplug.spotless' version '6.25.0'
66
}
77

88
spotless {
@@ -20,7 +20,7 @@ spotless {
2020
//임포트 순서 정리
2121
importOrder(
2222
"java",
23-
"javax",
23+
"jakarta",
2424
"lombok",
2525
"org.springframework",
2626
"",
@@ -70,20 +70,19 @@ subprojects {
7070
'org.springframework.boot:spring-boot-configuration-processor',
7171
'jakarta.persistence:jakarta.persistence-api',
7272
'jakarta.annotation:jakarta.annotation-api',
73-
"com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jpa"
73+
'com.querydsl:querydsl-apt:5.0.0:jakarta'
7474
)
7575

7676
implementation (
7777
'org.springframework.boot:spring-boot-starter-web',
7878
'org.springframework.boot:spring-boot-starter-validation',
79-
'org.springdoc:springdoc-openapi-ui:1.7.0',
79+
'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0',
8080
'com.google.code.findbugs:jsr305:3.0.2',
81-
'io.awspring.cloud:spring-cloud-starter-aws:2.4.4',
8281

8382
// cloud config
84-
'org.springframework.cloud:spring-cloud-starter-config:3.1.8',
83+
'org.springframework.cloud:spring-cloud-starter-config:4.1.4',
8584
'org.springframework.boot:spring-boot-starter-actuator',
86-
'org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.8',
85+
'org.springframework.cloud:spring-cloud-starter-bootstrap:4.1.4',
8786

8887
// mail
8988
'org.springframework.boot:spring-boot-starter-mail',
@@ -117,8 +116,8 @@ project(':module-jpa') {
117116
dependencies {
118117
api (
119118
'org.springframework.boot:spring-boot-starter-data-jpa',
120-
'com.querydsl:querydsl-jpa', // query dsl
121-
'com.jcraft:jsch:0.1.55', // 로컬 개발용 db ssh tunneling, https://mavenlibs.com/maven/dependency/com.jcraft/jsch
119+
'com.querydsl:querydsl-jpa:5.0.0:jakarta',
120+
'com.jcraft:jsch:0.1.55',
122121
// 'org.mariadb.jdbc:mariadb-java-client',
123122
'com.mysql:mysql-connector-j',
124123
'com.h2database:h2'
@@ -133,18 +132,18 @@ project(':module-auth') {
133132
dependencies {
134133
api project(':module-jpa')
135134
// jwt
136-
api 'io.jsonwebtoken:jjwt-api:0.11.2'
137-
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2',
135+
api 'io.jsonwebtoken:jjwt-api:0.11.5'
136+
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5',
138137
// Uncomment the next line if you want to use RSASSA-PSS (PS256, PS384, PS512) algorithms:
139138
//'org.bouncycastle:bcprov-jdk15on:1.60',
140-
'io.jsonwebtoken:jjwt-jackson:0.11.2' // or 'io.jsonwebtoken:jjwt-gson:0.11.2' for gson
139+
'io.jsonwebtoken:jjwt-jackson:0.11.5'
141140

142141
// security
143142
api 'org.springframework.boot:spring-boot-starter-security'
144143
api 'org.springframework.boot:spring-boot-starter-oauth2-client'
145-
api 'javax.xml.bind:jaxb-api'
144+
api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
146145
testImplementation 'org.springframework.security:spring-security-test'
147-
testImplementation 'org.mockito:mockito-inline:2.13.0'
146+
testImplementation 'org.mockito:mockito-inline:5.2.0'
148147
}
149148
}
150149

@@ -155,9 +154,10 @@ project(':module-fileStorage') {
155154
dependencies {
156155
api project(':module-jpa')
157156

158-
api 'javax.xml.bind:jaxb-api'
157+
api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
158+
implementation 'com.amazonaws:aws-java-sdk-s3:1.12.188'
159159
testImplementation 'org.springframework.security:spring-security-test'
160-
testImplementation 'org.mockito:mockito-inline:2.13.0'
160+
testImplementation 'org.mockito:mockito-inline:5.2.0'
161161
}
162162
}
163163

@@ -167,6 +167,7 @@ project(':resource-server') {
167167
api project(':module-auth')
168168
api project(':module-fileStorage')
169169
api 'org.springframework.boot:spring-boot-starter-security'
170+
implementation 'com.amazonaws:aws-java-sdk-s3:1.12.188'
170171
testImplementation 'org.springframework.security:spring-security-test'
171172
}
172173

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

module-auth/src/main/java/com/inhabas/api/auth/config/AuthSecurityConfig.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.springframework.security.config.http.SessionCreationPolicy;
1313
import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
1414
import org.springframework.security.web.SecurityFilterChain;
15-
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
1615
import org.springframework.web.cors.CorsUtils;
1716

1817
import com.inhabas.api.auth.domain.oauth2.CustomOAuth2UserService;
@@ -40,7 +39,7 @@ public SecurityFilterChain authSecurityFilterChain(HttpSecurity http) throws Exc
4039

4140
http
4241
// /login/** 경로에만 이 보안 체인 적용
43-
.requestMatcher(new AntPathRequestMatcher("/login/**"))
42+
.securityMatcher("/login/**")
4443
// 세션 생성 금지
4544
.sessionManagement(
4645
session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))

module-auth/src/main/java/com/inhabas/api/auth/config/TemplateConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import org.springframework.context.annotation.Configuration;
55

66
import org.thymeleaf.TemplateEngine;
7-
import org.thymeleaf.spring5.SpringTemplateEngine;
8-
import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
7+
import org.thymeleaf.spring6.SpringTemplateEngine;
8+
import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver;
99
import org.thymeleaf.templatemode.TemplateMode;
1010

1111
@Configuration

module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import java.util.Objects;
66
import java.util.Optional;
77

8-
import javax.servlet.http.Cookie;
9-
import javax.servlet.http.HttpServletRequest;
10-
import javax.servlet.http.HttpServletResponse;
8+
import jakarta.servlet.http.Cookie;
9+
import jakarta.servlet.http.HttpServletRequest;
10+
import jakarta.servlet.http.HttpServletResponse;
1111

1212
import org.springframework.http.ResponseCookie;
1313
import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;

module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepository.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.inhabas.api.auth.domain.oauth2.cookie;
22

3-
import javax.servlet.http.HttpServletRequest;
4-
import javax.servlet.http.HttpServletResponse;
3+
import jakarta.servlet.http.HttpServletRequest;
4+
import jakarta.servlet.http.HttpServletResponse;
55

66
import org.springframework.security.oauth2.client.web.AuthorizationRequestRepository;
77
import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
@@ -66,12 +66,6 @@ public void saveAuthorizationRequest(
6666
}
6767
}
6868

69-
@Deprecated
70-
@Override
71-
public OAuth2AuthorizationRequest removeAuthorizationRequest(HttpServletRequest request) {
72-
return null;
73-
}
74-
7569
/**
7670
* OAuth2AuthorizationRequest 를 쿠키에서 제거함.
7771
*

module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.net.URLEncoder;
55
import java.nio.charset.StandardCharsets;
66

7-
import javax.servlet.http.HttpServletRequest;
8-
import javax.servlet.http.HttpServletResponse;
7+
import jakarta.servlet.http.HttpServletRequest;
8+
import jakarta.servlet.http.HttpServletResponse;
99

1010
import lombok.RequiredArgsConstructor;
1111

module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
import java.io.IOException;
66

7-
import javax.servlet.http.Cookie;
8-
import javax.servlet.http.HttpServletRequest;
9-
import javax.servlet.http.HttpServletResponse;
7+
import jakarta.servlet.http.Cookie;
8+
import jakarta.servlet.http.HttpServletRequest;
9+
import jakarta.servlet.http.HttpServletResponse;
1010

1111
import lombok.RequiredArgsConstructor;
1212
import lombok.extern.slf4j.Slf4j;

module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/MajorInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.inhabas.api.auth.domain.oauth2.majorInfo.domain;
22

3-
import javax.persistence.*;
3+
import jakarta.persistence.*;
44

55
import lombok.AccessLevel;
66
import lombok.NoArgsConstructor;

module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/College.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import java.util.Objects;
44

5-
import javax.persistence.Column;
6-
import javax.persistence.Embeddable;
7-
import javax.persistence.Transient;
5+
import jakarta.persistence.Column;
6+
import jakarta.persistence.Embeddable;
7+
import jakarta.persistence.Transient;
88

99
import com.inhabas.api.auth.domain.error.businessException.InvalidInputException;
1010

0 commit comments

Comments
 (0)