Skip to content

Commit 46e9443

Browse files
Fix CI and MyBatis configuration for Spring Boot 3.5.10
- Update CI workflow to use Java 17 (required by Spring Boot 3) - Downgrade MyBatis Spring Boot Starter from 4.0.1 to 3.0.4 to fix NullPointerException in MybatisProperties.CoreConfiguration.applyTo - Remove mybatis.configuration.default-statement-timeout property - Add classpath: prefix to mybatis.mapper-locations - Add spring.main.allow-bean-definition-overriding=true for bean override Co-Authored-By: Sam Fertig <sam.fertig@codeium.com>
1 parent 5ef1fba commit 46e9443

4 files changed

Lines changed: 7 additions & 8 deletions

File tree

.github/workflows/gradle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717

1818
steps:
1919
- uses: actions/checkout@v4
20-
- name: Set up JDK 11
20+
- name: Set up JDK 17
2121
uses: actions/setup-java@v4
2222
with:
2323
distribution: zulu
24-
java-version: '11'
24+
java-version: '17'
2525
- uses: actions/cache@v4
2626
with:
2727
path: |

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
implementation 'org.springframework.boot:spring-boot-starter-validation'
3939
implementation 'org.springframework.boot:spring-boot-starter-hateoas'
4040
implementation 'org.springframework.boot:spring-boot-starter-security'
41-
implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:4.0.1'
41+
implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.4'
4242
implementation 'com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter:9.2.2'
4343
implementation 'org.flywaydb:flyway-core'
4444
implementation 'io.jsonwebtoken:jjwt-api:0.12.6'
@@ -56,7 +56,7 @@ dependencies {
5656
testImplementation 'io.rest-assured:spring-mock-mvc:5.5.0'
5757
testImplementation 'org.springframework.security:spring-security-test'
5858
testImplementation 'org.springframework.boot:spring-boot-starter-test'
59-
testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:4.0.1'
59+
testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:3.0.4'
6060
}
6161

6262
tasks.named('test') {

src/main/resources/application.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
spring.main.allow-bean-definition-overriding=true
12
spring.datasource.url=jdbc:sqlite:dev.db
23
spring.datasource.driver-class-name=org.sqlite.JDBC
34
spring.datasource.username=
@@ -10,11 +11,10 @@ jwt.secret=nRvyYC4soFxBdZ-F-5Nnzz5USXstR1YylsTd-mA0aKtI9HUlriGrtkf-TiuDapkLiUCog
1011
jwt.sessionTime=86400
1112

1213
mybatis.configuration.cache-enabled=true
13-
mybatis.configuration.default-statement-timeout=3000
1414
mybatis.configuration.map-underscore-to-camel-case=true
1515
mybatis.configuration.use-generated-keys=true
1616
mybatis.type-handlers-package=io.spring.infrastructure.mybatis
17-
mybatis.mapper-locations=mapper/*.xml
17+
mybatis.mapper-locations=classpath:mapper/*.xml
1818

1919
logging.level.io.spring.infrastructure.mybatis.readservice.ArticleReadService=DEBUG
2020
logging.level.io.spring.infrastructure.mybatis.mapper=DEBUG

src/test/resources/application.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ jwt.secret=${JWT_SECRET:test-secret-key-for-testing-purposes-only-minimum-256-bi
1111
jwt.sessionTime=86400
1212

1313
mybatis.configuration.cache-enabled=true
14-
mybatis.configuration.default-statement-timeout=3000
1514
mybatis.configuration.map-underscore-to-camel-case=true
1615
mybatis.configuration.use-generated-keys=true
1716
mybatis.type-handlers-package=io.spring.infrastructure.mybatis
18-
mybatis.mapper-locations=mapper/*.xml
17+
mybatis.mapper-locations=classpath:mapper/*.xml

0 commit comments

Comments
 (0)