Skip to content

Commit 799c22b

Browse files
committed
Bump doma to 3
1 parent 5035a85 commit 799c22b

File tree

3 files changed

+10
-48
lines changed

3 files changed

+10
-48
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v4
2020

21-
- name: Set up JDK 8
21+
- name: Set up JDK 17
2222
uses: actions/setup-java@v4
2323
with:
2424
distribution: liberica
25-
java-version: 8
25+
java-version: 17
2626
cache: maven
2727

2828
- name: Grant execute permission for mvnw
@@ -46,42 +46,8 @@ jobs:
4646

4747
strategy:
4848
matrix:
49-
java: [ 11, 17, 21 ]
50-
spring-boot-version: [ 2.7.18 ]
51-
52-
steps:
53-
- uses: actions/checkout@v4
54-
55-
- name: Set up JDK ${{ matrix.java }}
56-
uses: actions/setup-java@v4
57-
with:
58-
distribution: liberica
59-
java-version: ${{ matrix.java }}
60-
cache: maven
61-
62-
- name: Grant execute permission for mvnw
63-
run: chmod +x mvnw
64-
65-
- name: Test with Maven
66-
run: ./mvnw $MAVEN_CLI_OPTS -pl :doma-spring-boot-core,:doma-spring-boot-autoconfigure,:doma-spring-boot-starter test -Dspring-boot.version=${{ matrix.spring-boot-version }}
67-
68-
- name: Upload reports
69-
if: failure()
70-
uses: actions/upload-artifact@v4
71-
with:
72-
name: reports
73-
path: ./**/target/surefire-reports
74-
75-
test-spring-boot-3:
76-
if: contains(github.event.head_commit.message, '[skip ci]') == false
77-
runs-on: ubuntu-latest
78-
timeout-minutes: 30
79-
needs: [ test ]
80-
81-
strategy:
82-
matrix:
83-
java: [ 17, 21 ]
84-
spring-boot-version: [ 3.0.13, 3.1.12, 3.2.6, 3.3.0 ]
49+
java: [ 21, 22 ]
50+
spring-boot-version: [ 3.2.9, 3.3.3, 3.4.0-M2 ]
8551

8652
steps:
8753
- uses: actions/checkout@v4
@@ -114,11 +80,11 @@ jobs:
11480
steps:
11581
- uses: actions/checkout@v4
11682

117-
- name: Set up JDK 8
83+
- name: Set up JDK 17
11884
uses: actions/setup-java@v4
11985
with:
12086
distribution: liberica
121-
java-version: 8
87+
java-version: 17
12288
cache: maven
12389

12490
- name: Grant execute permission for mvnw

doma-spring-boot-autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaProperties.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,6 @@ public enum NamingType {
239239
UPPER_CASE(Naming.UPPER_CASE),
240240
SNAKE_LOWER_CASE(Naming.SNAKE_LOWER_CASE),
241241
SNAKE_UPPER_CASE(Naming.SNAKE_UPPER_CASE),
242-
@Deprecated
243-
LENIENT_SNAKE_LOWER_CASE(Naming.LENIENT_SNAKE_LOWER_CASE),
244-
@Deprecated
245-
LENIENT_SNAKE_UPPER_CASE(Naming.LENIENT_SNAKE_UPPER_CASE),
246242
DEFAULT(Naming.DEFAULT);
247243

248244
private final Naming naming;

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545

4646
<properties>
4747
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
48-
<maven.compiler.source>1.8</maven.compiler.source>
49-
<maven.compiler.target>1.8</maven.compiler.target>
50-
<doma.version>2.62.1</doma.version>
51-
<spring-boot.version>2.7.16</spring-boot.version>
48+
<maven.compiler.source>17</maven.compiler.source>
49+
<maven.compiler.target>17</maven.compiler.target>
50+
<doma.version>3.0.0</doma.version>
51+
<spring-boot.version>3.2.9</spring-boot.version>
5252
<source-plugin.version>3.3.1</source-plugin.version>
5353
<javadoc-plugin.version>3.10.0</javadoc-plugin.version>
5454
<nexus-staging-plugin.version>1.7.0</nexus-staging-plugin.version>

0 commit comments

Comments
 (0)