Skip to content

Commit 87c43f7

Browse files
Upgrade Spring Boot to 3.4.5 (final target)
- Spring Boot 3.3.7 -> 3.4.5, Gradle 8.5 -> 8.12 - Spring dependency-management 1.1.4 -> 1.1.7 - JJWT 0.11.5 -> 0.12.6 (new builder/parser API) - Flyway pinned to 9.22.3 - MyBatis 3.0.3 -> 3.0.4 - SQLite JDBC 3.42.0.1 -> 3.47.1.0 - Joda-Time 2.10.13 -> 2.13.0 - Rest-Assured 5.4.0 -> 5.5.0 - Spotless 6.22.0 -> 6.25.0 - Spring Security: migrate to lambda DSL configuration Co-Authored-By: Travis Myers <travis.myers@cognition.ai>
1 parent 3f10d5b commit 87c43f7

22 files changed

Lines changed: 107 additions & 96 deletions

build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
2-
id 'org.springframework.boot' version '3.3.7'
3-
id 'io.spring.dependency-management' version '1.1.4'
2+
id 'org.springframework.boot' version '3.4.5'
3+
id 'io.spring.dependency-management' version '1.1.7'
44
id 'java'
55
id "com.netflix.dgs.codegen" version "6.3.0"
6-
id "com.diffplug.spotless" version "6.22.0"
6+
id "com.diffplug.spotless" version "6.25.0"
77
}
88

99
version = '0.0.1-SNAPSHOT'
@@ -35,26 +35,26 @@ dependencies {
3535
implementation 'org.springframework.boot:spring-boot-starter-validation'
3636
implementation 'org.springframework.boot:spring-boot-starter-hateoas'
3737
implementation 'org.springframework.boot:spring-boot-starter-security'
38-
implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.3'
38+
implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.4'
3939
implementation 'com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter:9.1.2'
40-
implementation 'org.flywaydb:flyway-core'
41-
implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
42-
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5',
43-
'io.jsonwebtoken:jjwt-jackson:0.11.5'
44-
implementation 'joda-time:joda-time:2.10.13'
45-
implementation 'org.xerial:sqlite-jdbc:3.42.0.1'
40+
implementation 'org.flywaydb:flyway-core:9.22.3'
41+
implementation 'io.jsonwebtoken:jjwt-api:0.12.6'
42+
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6',
43+
'io.jsonwebtoken:jjwt-jackson:0.12.6'
44+
implementation 'joda-time:joda-time:2.13.0'
45+
implementation 'org.xerial:sqlite-jdbc:3.47.1.0'
4646

4747
compileOnly 'org.projectlombok:lombok'
4848
annotationProcessor 'org.projectlombok:lombok'
4949

50-
testImplementation enforcedPlatform('io.rest-assured:rest-assured-bom:5.4.0')
50+
testImplementation enforcedPlatform('io.rest-assured:rest-assured-bom:5.5.0')
5151
testImplementation 'io.rest-assured:rest-assured'
5252
testImplementation 'io.rest-assured:json-path'
5353
testImplementation 'io.rest-assured:xml-path'
5454
testImplementation 'io.rest-assured:spring-mock-mvc'
5555
testImplementation 'org.springframework.security:spring-security-test'
5656
testImplementation 'org.springframework.boot:spring-boot-starter-test'
57-
testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:3.0.3'
57+
testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:3.0.4'
5858
}
5959

6060
tasks.named('test') {

gradle/wrapper/gradle-wrapper.jar

-16 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

Lines changed: 28 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/io/spring/api/ArticleApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import io.spring.core.article.ArticleRepository;
1111
import io.spring.core.service.AuthorizationService;
1212
import io.spring.core.user.User;
13+
import jakarta.validation.Valid;
1314
import java.util.HashMap;
1415
import java.util.Map;
15-
import jakarta.validation.Valid;
1616
import lombok.AllArgsConstructor;
1717
import org.springframework.http.ResponseEntity;
1818
import org.springframework.security.core.annotation.AuthenticationPrincipal;

src/main/java/io/spring/api/ArticlesApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import io.spring.application.article.NewArticleParam;
77
import io.spring.core.article.Article;
88
import io.spring.core.user.User;
9-
import java.util.HashMap;
109
import jakarta.validation.Valid;
10+
import java.util.HashMap;
1111
import lombok.AllArgsConstructor;
1212
import org.springframework.http.ResponseEntity;
1313
import org.springframework.security.core.annotation.AuthenticationPrincipal;

src/main/java/io/spring/api/CommentsApi.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
import io.spring.core.comment.CommentRepository;
1212
import io.spring.core.service.AuthorizationService;
1313
import io.spring.core.user.User;
14+
import jakarta.validation.Valid;
15+
import jakarta.validation.constraints.NotBlank;
1416
import java.util.HashMap;
1517
import java.util.List;
1618
import java.util.Map;
17-
import jakarta.validation.Valid;
18-
import jakarta.validation.constraints.NotBlank;
1919
import lombok.AllArgsConstructor;
2020
import lombok.Getter;
2121
import lombok.NoArgsConstructor;

src/main/java/io/spring/api/CurrentUserApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import io.spring.application.user.UpdateUserParam;
88
import io.spring.application.user.UserService;
99
import io.spring.core.user.User;
10+
import jakarta.validation.Valid;
1011
import java.util.HashMap;
1112
import java.util.Map;
12-
import jakarta.validation.Valid;
1313
import lombok.AllArgsConstructor;
1414
import org.springframework.http.ResponseEntity;
1515
import org.springframework.security.core.annotation.AuthenticationPrincipal;

src/main/java/io/spring/api/UsersApi.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
import io.spring.core.service.JwtService;
1313
import io.spring.core.user.User;
1414
import io.spring.core.user.UserRepository;
15-
import java.util.HashMap;
16-
import java.util.Map;
17-
import java.util.Optional;
1815
import jakarta.validation.Valid;
1916
import jakarta.validation.constraints.Email;
2017
import jakarta.validation.constraints.NotBlank;
18+
import java.util.HashMap;
19+
import java.util.Map;
20+
import java.util.Optional;
2121
import lombok.AllArgsConstructor;
2222
import lombok.Getter;
2323
import lombok.NoArgsConstructor;

0 commit comments

Comments
 (0)