Skip to content

Commit eb132e2

Browse files
authored
Merge branch 'main' into GH-2020
Signed-off-by: Mikhail Polivakha <[email protected]>
2 parents ecc3a43 + 422dca0 commit eb132e2

File tree

36 files changed

+1103
-695
lines changed

36 files changed

+1103
-695
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#Thu Nov 07 09:47:30 CET 2024
2-
distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
1+
#Thu Jul 17 13:59:57 CEST 2025
2+
distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

pom.xml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
53

64
<modelVersion>4.0.0</modelVersion>
75

@@ -33,20 +31,20 @@
3331

3432
<!-- databases and jdbc drivers -->
3533
<!-- note that these currently do not control the versions of databases used via Testcontainers for testing -->
36-
<db2.version>12.1.0.0</db2.version>
34+
<db2.version>12.1.2.0</db2.version>
3735
<h2.version>2.3.232</h2.version>
3836
<hikari.version>5.1.0</hikari.version>
3937
<hsqldb.version>2.7.3</hsqldb.version>
40-
<mariadb-java-client.version>3.5.3</mariadb-java-client.version>
41-
<mssql.version>12.10.0.jre11</mssql.version>
42-
<mysql-connector-java.version>9.2.0</mysql-connector-java.version>
43-
<postgresql.version>42.7.5</postgresql.version>
38+
<mariadb-java-client.version>3.5.4</mariadb-java-client.version>
39+
<mssql.version>12.10.1.jre11</mssql.version>
40+
<mysql-connector-java.version>9.3.0</mysql-connector-java.version>
41+
<postgresql.version>42.7.7</postgresql.version>
4442
<oracle.version>23.8.0.25.04</oracle.version>
4543

4644
<!-- R2DBC driver dependencies-->
4745
<r2dbc-postgresql.version>1.0.7.RELEASE</r2dbc-postgresql.version>
4846
<r2dbc-h2.version>1.0.0.RELEASE</r2dbc-h2.version>
49-
<r2dbc-mariadb.version>1.1.4</r2dbc-mariadb.version>
47+
<r2dbc-mariadb.version>1.3.0</r2dbc-mariadb.version>
5048
<r2dbc-mssql.version>1.0.2.RELEASE</r2dbc-mssql.version>
5149
<r2dbc-mysql.version>1.4.1</r2dbc-mysql.version>
5250
<oracle-r2dbc.version>1.3.0</oracle-r2dbc.version>
@@ -191,6 +189,11 @@
191189
<plugin>
192190
<groupId>org.apache.maven.plugins</groupId>
193191
<artifactId>maven-surefire-plugin</artifactId>
192+
<configuration>
193+
<systemProperties>
194+
<io.netty.allocator.type>pooled</io.netty.allocator.type>
195+
</systemProperties>
196+
</configuration>
194197
<executions>
195198
<execution>
196199
<id>default-test</id>
@@ -211,6 +214,11 @@
211214
<plugin>
212215
<groupId>org.apache.maven.plugins</groupId>
213216
<artifactId>maven-failsafe-plugin</artifactId>
217+
<configuration>
218+
<systemProperties>
219+
<io.netty.allocator.type>pooled</io.netty.allocator.type>
220+
</systemProperties>
221+
</configuration>
214222
<executions>
215223
<execution>
216224
<id>default-test</id>

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/AggregateReferenceConverters.java

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)