Skip to content

Commit 1da226c

Browse files
authored
Merge pull request #155 from domaframework/feature-update-versions
Bump Spring Boot to 2.7.4
2 parents b10b0ad + 1ef19db commit 1da226c

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
pull_request:
77
branches: [ master ]
88

9+
env:
10+
MAVEN_CLI_OPTS: --batch-mode --no-transfer-progress
11+
912
jobs:
1013
test:
1114
if: contains(github.event.head_commit.message, '[skip ci]') == false
@@ -26,7 +29,7 @@ jobs:
2629
run: chmod +x mvnw
2730

2831
- name: Test with Maven
29-
run: ./mvnw test -B
32+
run: ./mvnw $MAVEN_CLI_OPTS test
3033

3134
- name: Upload reports
3235
if: failure()
@@ -43,8 +46,8 @@ jobs:
4346

4447
strategy:
4548
matrix:
46-
java: [ 11, 17 ]
47-
spring-boot-version: [ 2.3.12.RELEASE, 2.4.13, 2.5.14, 2.6.9, 2.7.1 ]
49+
java: [ 11, 17, 19 ]
50+
spring-boot-version: [ 2.4.13, 2.5.14, 2.6.12, 2.7.4 ]
4851

4952
steps:
5053
- uses: actions/checkout@v3
@@ -60,7 +63,7 @@ jobs:
6063
run: chmod +x mvnw
6164

6265
- name: Test with Maven
63-
run: ./mvnw -pl :doma-spring-boot-core,:doma-spring-boot-autoconfigure,:doma-spring-boot-starter test -B -Dspring-boot.version=${{ matrix.spring-boot-version }}
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 }}
6467

6568
- name: Upload reports
6669
if: failure()
@@ -89,7 +92,7 @@ jobs:
8992
run: chmod +x mvnw
9093

9194
- name: Test with Maven
92-
run: ./mvnw -B compile -Pbackward-compatible && ./mvnw -B test -Dmaven.main.skip=true -Ddoma.version=2.49.0
95+
run: ./mvnw $MAVEN_CLI_OPTS compile -Pbackward-compatible && ./mvnw $MAVEN_CLI_OPTS test -Dmaven.main.skip=true -Ddoma.version=2.49.0
9396

9497
- name: Upload reports
9598
if: failure()

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<maven.compiler.source>1.8</maven.compiler.source>
4848
<maven.compiler.target>1.8</maven.compiler.target>
4949
<doma.version>2.53.0</doma.version>
50-
<spring-boot.version>2.7.1</spring-boot.version>
50+
<spring-boot.version>2.7.4</spring-boot.version>
5151
<source-plugin.version>3.2.1</source-plugin.version>
5252
<javadoc-plugin.version>3.4.1</javadoc-plugin.version>
5353
<nexus-staging-plugin.version>1.6.13</nexus-staging-plugin.version>

0 commit comments

Comments
 (0)