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..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.4.240" // 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/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 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..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.4.240' + 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 f82848932..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.4.240' + 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 9860352d3..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.4.240' + version == System.getProperty('h2.version') cleanup: applicationContext.close()