From 4bce96e7d39a9976d4d1ac7c10abaa3bae045f8c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2026 21:00:32 +0000 Subject: [PATCH 1/3] Update dependency com.h2database:h2 to v2.5.250 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4263d6c6b..6be8826da 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -50,7 +50,7 @@ managed-tomcat-jdbc = "11.0.25" managed-jakarta-persistence-api = "3.2.0" managed-jakarta-transaction-api = "2.0.1" -managed-h2 = "2.4.240" +managed-h2 = "2.5.250" # Other From 51e14139d410893e01336918ed377b1f5e1fe386 Mon Sep 17 00:00:00 2001 From: radovanradic Date: Mon, 21 Sep 2026 23:09:38 +0200 Subject: [PATCH 2/3] Update H2 database version to 2.5.250 in configurations and tests --- .../main/groovy/io.micronaut.build.internal.sql-module.gradle | 2 +- .../configuration/jdbc/dbcp/DatasourceConfigurationSpec.groovy | 2 +- .../jdbc/hikari/DatasourceConfigurationSpec.groovy | 2 +- .../jdbc/tomcat/DatasourceConfigurationSpec.groovy | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.sql-module.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.sql-module.gradle index c4be9dcd3..22cd4ba35 100644 --- a/buildSrc/src/main/groovy/io.micronaut.build.internal.sql-module.gradle +++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.sql-module.gradle @@ -5,7 +5,7 @@ plugins { ossIndexAudit { excludeCoordinates = [ - "com.h2database:h2:2.4.240" // no version patched https://ossindex.sonatype.org/component/pkg:maven/com.h2database/h2 + "com.h2database:h2:2.5.250" // no version patched https://ossindex.sonatype.org/component/pkg:maven/com.h2database/h2 ] } diff --git a/jdbc-dbcp/src/test/groovy/io/micronaut/configuration/jdbc/dbcp/DatasourceConfigurationSpec.groovy b/jdbc-dbcp/src/test/groovy/io/micronaut/configuration/jdbc/dbcp/DatasourceConfigurationSpec.groovy index 3a5e5ab7f..eec24a1d8 100644 --- a/jdbc-dbcp/src/test/groovy/io/micronaut/configuration/jdbc/dbcp/DatasourceConfigurationSpec.groovy +++ b/jdbc-dbcp/src/test/groovy/io/micronaut/configuration/jdbc/dbcp/DatasourceConfigurationSpec.groovy @@ -216,7 +216,7 @@ class DatasourceConfigurationSpec extends Specification { String version = resultSet.getString(1) then: - version == '2.4.240' + version == '2.5.250' cleanup: applicationContext.close() diff --git a/jdbc-hikari/src/test/groovy/io/micronaut/configuration/jdbc/hikari/DatasourceConfigurationSpec.groovy b/jdbc-hikari/src/test/groovy/io/micronaut/configuration/jdbc/hikari/DatasourceConfigurationSpec.groovy index f82848932..c06530bed 100644 --- a/jdbc-hikari/src/test/groovy/io/micronaut/configuration/jdbc/hikari/DatasourceConfigurationSpec.groovy +++ b/jdbc-hikari/src/test/groovy/io/micronaut/configuration/jdbc/hikari/DatasourceConfigurationSpec.groovy @@ -225,7 +225,7 @@ class DatasourceConfigurationSpec extends Specification { String version = resultSet.getString(1) then: - version == '2.4.240' + version == '2.5.250' cleanup: applicationContext.close() diff --git a/jdbc-tomcat/src/test/groovy/io/micronaut/configuration/jdbc/tomcat/DatasourceConfigurationSpec.groovy b/jdbc-tomcat/src/test/groovy/io/micronaut/configuration/jdbc/tomcat/DatasourceConfigurationSpec.groovy index 9860352d3..47b75036d 100644 --- a/jdbc-tomcat/src/test/groovy/io/micronaut/configuration/jdbc/tomcat/DatasourceConfigurationSpec.groovy +++ b/jdbc-tomcat/src/test/groovy/io/micronaut/configuration/jdbc/tomcat/DatasourceConfigurationSpec.groovy @@ -226,7 +226,7 @@ class DatasourceConfigurationSpec extends Specification { String version = resultSet.getString(1) then: - version == '2.4.240' + version == '2.5.250' cleanup: applicationContext.close() From 424d0c3ee9f00e31970a6763617a6ed306af2153 Mon Sep 17 00:00:00 2001 From: radovanradic Date: Mon, 21 Sep 2026 23:26:58 +0200 Subject: [PATCH 3/3] Use catalog H2 version in SQL module tests and the OSS Index exclusion. --- .../groovy/io.micronaut.build.internal.sql-module.gradle | 8 +++++++- .../jdbc/dbcp/DatasourceConfigurationSpec.groovy | 2 +- .../jdbc/hikari/DatasourceConfigurationSpec.groovy | 2 +- .../jdbc/tomcat/DatasourceConfigurationSpec.groovy | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.sql-module.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.sql-module.gradle index 22cd4ba35..e7be5d0c8 100644 --- a/buildSrc/src/main/groovy/io.micronaut.build.internal.sql-module.gradle +++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.sql-module.gradle @@ -3,12 +3,18 @@ plugins { id 'io.micronaut.build.internal.sql-base' } +def h2Version = libs.versions.managed.h2.get() + ossIndexAudit { excludeCoordinates = [ - "com.h2database:h2:2.5.250" // no version patched https://ossindex.sonatype.org/component/pkg:maven/com.h2database/h2 + "com.h2database:h2:${h2Version}" // no version patched https://ossindex.sonatype.org/component/pkg:maven/com.h2database/h2 ] } +tasks.withType(org.gradle.api.tasks.testing.Test).configureEach { + systemProperty('h2.version', h2Version) +} + micronautBuild { descriptor { parentModuleId = "io.micronaut.sql:micronaut-sql-jdbc" diff --git a/jdbc-dbcp/src/test/groovy/io/micronaut/configuration/jdbc/dbcp/DatasourceConfigurationSpec.groovy b/jdbc-dbcp/src/test/groovy/io/micronaut/configuration/jdbc/dbcp/DatasourceConfigurationSpec.groovy index eec24a1d8..879787117 100644 --- a/jdbc-dbcp/src/test/groovy/io/micronaut/configuration/jdbc/dbcp/DatasourceConfigurationSpec.groovy +++ b/jdbc-dbcp/src/test/groovy/io/micronaut/configuration/jdbc/dbcp/DatasourceConfigurationSpec.groovy @@ -216,7 +216,7 @@ class DatasourceConfigurationSpec extends Specification { String version = resultSet.getString(1) then: - version == '2.5.250' + version == System.getProperty('h2.version') cleanup: applicationContext.close() diff --git a/jdbc-hikari/src/test/groovy/io/micronaut/configuration/jdbc/hikari/DatasourceConfigurationSpec.groovy b/jdbc-hikari/src/test/groovy/io/micronaut/configuration/jdbc/hikari/DatasourceConfigurationSpec.groovy index c06530bed..372a93682 100644 --- a/jdbc-hikari/src/test/groovy/io/micronaut/configuration/jdbc/hikari/DatasourceConfigurationSpec.groovy +++ b/jdbc-hikari/src/test/groovy/io/micronaut/configuration/jdbc/hikari/DatasourceConfigurationSpec.groovy @@ -225,7 +225,7 @@ class DatasourceConfigurationSpec extends Specification { String version = resultSet.getString(1) then: - version == '2.5.250' + version == System.getProperty('h2.version') cleanup: applicationContext.close() diff --git a/jdbc-tomcat/src/test/groovy/io/micronaut/configuration/jdbc/tomcat/DatasourceConfigurationSpec.groovy b/jdbc-tomcat/src/test/groovy/io/micronaut/configuration/jdbc/tomcat/DatasourceConfigurationSpec.groovy index 47b75036d..b7c867711 100644 --- a/jdbc-tomcat/src/test/groovy/io/micronaut/configuration/jdbc/tomcat/DatasourceConfigurationSpec.groovy +++ b/jdbc-tomcat/src/test/groovy/io/micronaut/configuration/jdbc/tomcat/DatasourceConfigurationSpec.groovy @@ -226,7 +226,7 @@ class DatasourceConfigurationSpec extends Specification { String version = resultSet.getString(1) then: - version == '2.5.250' + version == System.getProperty('h2.version') cleanup: applicationContext.close()