Skip to content

Commit 8d61446

Browse files
committed
Merge branch 'master' into rework-spring-batch
# Conflicts: # pom.xml
2 parents d4005a7 + f3b0725 commit 8d61446

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<java.release.version>17</java.release.version>
6161
<java.test.version>17</java.test.version>
6262
<java.test.release.version>17</java.test.release.version>
63-
<junit.jupiter.version>5.11.1</junit.jupiter.version>
63+
<junit.jupiter.version>5.11.3</junit.jupiter.version>
6464
<spring.batch.version>5.1.2</spring.batch.version>
6565

6666
<checkstyle.config>checkstyle-override.xml</checkstyle.config>
@@ -69,7 +69,7 @@
6969

7070
<module.name>org.mybatis.dynamic.sql</module.name>
7171

72-
<kotlin.version>2.0.20</kotlin.version>
72+
<kotlin.version>2.0.21</kotlin.version>
7373
<kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
7474
<kotlin.compiler.languageVersion>2.0</kotlin.compiler.languageVersion>
7575
<kotlin.compiler.apiVersion>2.0</kotlin.compiler.apiVersion>
@@ -78,7 +78,7 @@
7878
<sonar.tests>src/test/java,src/test/kotlin</sonar.tests>
7979

8080
<kotlin.code.style>official</kotlin.code.style>
81-
<test.containers.version>1.20.1</test.containers.version>
81+
<test.containers.version>1.20.3</test.containers.version>
8282
<osgi.export>org.mybatis.dynamic.sql.*;version=${project.version};-noimport:=true</osgi.export>
8383

8484
<!-- Reproducible Builds -->
@@ -96,7 +96,7 @@
9696
<dependency>
9797
<groupId>org.springframework</groupId>
9898
<artifactId>spring-jdbc</artifactId>
99-
<version>6.1.13</version>
99+
<version>6.1.14</version>
100100
<scope>provided</scope>
101101
<optional>true</optional>
102102
</dependency>
@@ -165,7 +165,7 @@
165165
<dependency>
166166
<groupId>ch.qos.logback</groupId>
167167
<artifactId>logback-classic</artifactId>
168-
<version>1.5.8</version>
168+
<version>1.5.11</version>
169169
<scope>test</scope>
170170
</dependency>
171171
<dependency>

src/test/java/config/TestContainersConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
* Utility interface to hold Docker image tags for the test containers we use
2222
*/
2323
public interface TestContainersConfiguration {
24-
DockerImageName POSTGRES_LATEST = DockerImageName.parse("postgres:16.3");
25-
DockerImageName MARIADB_LATEST = DockerImageName.parse("mariadb:11.4.2");
24+
DockerImageName POSTGRES_LATEST = DockerImageName.parse("postgres:17.0");
25+
DockerImageName MARIADB_LATEST = DockerImageName.parse("mariadb:11.5.2");
2626
}

0 commit comments

Comments
 (0)