Skip to content

Commit bbe34d2

Browse files
committed
Merge branch 'master' into test-polishing
2 parents fb47cf1 + aa81eba commit bbe34d2

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,10 @@ jobs:
3636
with:
3737
java-version: ${{ matrix.java }}
3838
- name: Test with Maven
39+
if: matrix.java != '16-ea'
3940
run: ./mvnw test -B -D"license.skip=true"
41+
- name: Test with Maven
42+
if: matrix.java == '16-ea'
43+
run: ./mvnw test -B -D"license.skip=true"
44+
env:
45+
MAVEN_OPTS: --add-opens java.base/java.util=ALL-UNNAMED

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
<spring.batch.version>4.3.1</spring.batch.version>
3939
<clirr.comparisonVersion>1.2.0</clirr.comparisonVersion>
4040
<module.name>org.mybatis.dynamic.sql</module.name>
41-
<kotlin.version>1.4.21</kotlin.version>
41+
<kotlin.version>1.4.21-2</kotlin.version>
4242
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
4343
<sonar.sources>pom.xml,src/main/java,src/main/kotlin</sonar.sources>
4444
<sonar.tests>src/test/java,src/test/kotlin</sonar.tests>
4545
<kotlin.code.style>official</kotlin.code.style>
46-
<test.containers.version>1.15.0</test.containers.version>
46+
<test.containers.version>1.15.1</test.containers.version>
4747
<osgi.export>org.mybatis.dynamic.sql.*;version=${project.version};-noimport:=true</osgi.export>
4848
</properties>
4949

@@ -206,7 +206,7 @@
206206
<dependency>
207207
<groupId>org.springframework</groupId>
208208
<artifactId>spring-jdbc</artifactId>
209-
<version>5.3.2</version>
209+
<version>5.3.3</version>
210210
<scope>provided</scope>
211211
<optional>true</optional>
212212
</dependency>

0 commit comments

Comments
 (0)