Skip to content

Commit 3baf786

Browse files
Upgrade Spring Boot to 3.0.13
- Java 11 -> 17, Gradle 7.4 -> 8.5 - javax.validation -> jakarta.validation, javax.servlet -> jakarta.servlet - WebSecurityConfigurerAdapter -> SecurityFilterChain - antMatchers -> requestMatchers, authorizeRequests -> authorizeHttpRequests - DGS 4.9.21 -> 6.0.5, MyBatis 2.2.2 -> 3.0.3 - Rest-Assured 4.5.1 -> 5.4.0, JJWT 0.11.2 -> 0.11.5 - SQLite JDBC 3.36.0.3 -> 3.42.0.1 - PageInfo: graphql.relay.DefaultPageInfo -> DGS-generated types - handleMethodArgumentNotValid: HttpStatus -> HttpStatusCode Co-Authored-By: Travis Myers <travis.myers@cognition.ai>
1 parent ad2889f commit 3baf786

27 files changed

Lines changed: 251 additions & 202 deletions

build.gradle

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
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.0.13'
3+
id 'io.spring.dependency-management' version '1.1.4'
44
id 'java'
5-
id "com.netflix.dgs.codegen" version "5.0.6"
6-
id "com.diffplug.spotless" version "6.2.1"
5+
id "com.netflix.dgs.codegen" version "6.0.3"
6+
id "com.diffplug.spotless" version "6.22.0"
77
}
88

99
version = '0.0.1-SNAPSHOT'
10-
sourceCompatibility = '11'
11-
targetCompatibility = '11'
10+
sourceCompatibility = '17'
11+
targetCompatibility = '17'
1212

1313
spotless {
1414
java {
@@ -35,25 +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:2.2.2'
39-
implementation 'com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter:4.9.21'
38+
implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.3'
39+
implementation 'com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter:6.0.5'
4040
implementation 'org.flywaydb:flyway-core'
41-
implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
42-
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2',
43-
'io.jsonwebtoken:jjwt-jackson:0.11.2'
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'
4444
implementation 'joda-time:joda-time:2.10.13'
45-
implementation 'org.xerial:sqlite-jdbc:3.36.0.3'
45+
implementation 'org.xerial:sqlite-jdbc:3.42.0.1'
4646

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

50-
testImplementation 'io.rest-assured:rest-assured:4.5.1'
51-
testImplementation 'io.rest-assured:json-path:4.5.1'
52-
testImplementation 'io.rest-assured:xml-path:4.5.1'
53-
testImplementation 'io.rest-assured:spring-mock-mvc:4.5.1'
50+
testImplementation enforcedPlatform('io.rest-assured:rest-assured-bom:5.4.0')
51+
testImplementation 'io.rest-assured:rest-assured'
52+
testImplementation 'io.rest-assured:json-path'
53+
testImplementation 'io.rest-assured:xml-path'
54+
testImplementation 'io.rest-assured:spring-mock-mvc'
5455
testImplementation 'org.springframework.security:spring-security-test'
5556
testImplementation 'org.springframework.boot:spring-boot-starter-test'
56-
testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:2.2.2'
57+
testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:3.0.3'
5758
}
5859

5960
tasks.named('test') {

gradle/wrapper/gradle-wrapper.jar

618 Bytes
Binary file not shown.
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.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

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

0 commit comments

Comments
 (0)