This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch 8.0.x-hibernate7 in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 68a52fed758dba0e8056171ccdfc9ccb5883a15f Merge: 48f557a793 340a1f1ffc Author: James Daugherty <[email protected]> AuthorDate: Sun May 17 11:41:18 2026 -0400 Merge branch '8.0.x-stage-hibernate7' into 8.0.x-hibernate7 # Conflicts: # grails-data-hibernate7/dbmigration/build.gradle grails-data-hibernate5/dbmigration/build.gradle | 8 ++++++++ .../dbmigration/src/test/resources/logging.properties | 16 ++++++++++++++++ grails-data-hibernate7/dbmigration/build.gradle | 12 ++++++++---- .../dbmigration/src/test/resources/logging.properties | 16 ++++++++++++++++ 4 files changed, 48 insertions(+), 4 deletions(-) diff --cc grails-data-hibernate7/dbmigration/build.gradle index 2ca797a36c,4df15cceb6..a6d22085a3 --- a/grails-data-hibernate7/dbmigration/build.gradle +++ b/grails-data-hibernate7/dbmigration/build.gradle @@@ -90,27 -75,21 +90,32 @@@ dependencies testImplementation project(':grails-core') testImplementation project(':grails-testing-support-datamapping') testImplementation project(':grails-testing-support-web') + + testImplementation 'org.testcontainers:testcontainers' + testImplementation 'org.testcontainers:testcontainers-postgresql' + testImplementation 'org.testcontainers:testcontainers-spock' testImplementation 'com.h2database:h2' + testImplementation 'org.hsqldb:hsqldb' + testImplementation 'org.postgresql:postgresql' + testImplementation('org.liquibase:liquibase-test-harness') { + exclude group: 'org.liquibase', module: 'liquibase-commercial' + } + enversRuntime("org.hibernate.orm:hibernate-envers") - } - tasks.named('jar', Jar) { - exclude('testapp/**/**') + // Liquibase uses JUL for logging -> redirect it to SLF4J to reliably capture its output + testRuntimeOnly 'org.slf4j:jul-to-slf4j' + testRuntimeOnly 'org.slf4j:slf4j-simple' } tasks.named('test', Test) { + systemProperty("java.util.logging.config.file", "src/test/resources/logging.properties") + classpath += configurations.enversRuntime } + tasks.named('jar', Jar) { + exclude('testapp/**/**') + } + apply { from rootProject.layout.projectDirectory.file('gradle/hibernate7-test-config.gradle') from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
