From 619d48f891e94048405a24b325073fedf2ed1cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Mon, 27 Oct 2025 10:46:40 +0100 Subject: [PATCH] HHH-19869 Fix handling of dialect guide in release.gradle # Conflicts: # release/release.gradle --- release/release.gradle | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/release/release.gradle b/release/release.gradle index bf04c1789a20..20ab54948257 100644 --- a/release/release.gradle +++ b/release/release.gradle @@ -96,6 +96,16 @@ def stageMigrationGuideTask = tasks.register( "stageMigrationGuide", Copy ) { into rootProject.layout.buildDirectory.dir("staging-deploy/documentation/migration-guide") } +def stageDialectGuideTask = tasks.register( "stageDialectGuide", Copy ) { + group 'documentation' + description "Stages the Dialect Guide as part of preparing for release" + + dependsOn ':documentation:renderDialectGuide' + + from project.provider { project( ":documentation" ).layout.buildDirectory.dir( "asciidoc/dialect" ) } + into rootProject.layout.buildDirectory.dir("staging-deploy/documentation/dialect") +} + def stageIncubationReportTask = tasks.register( "stageIncubationReport", Copy ) { task -> group 'documentation' description "Stages ORM @Incubating report" @@ -136,15 +146,6 @@ def stageLoggingReportTask = tasks.register( "stageLoggingReport", Copy ) { task into rootProject.layout.buildDirectory.dir("staging-deploy/documentation/logging") } -def stageDialectReportTask = tasks.register( "stageDialectReport", Copy ) { task -> - group 'documentation' - description "Stages the supported Dialects report" - dependsOn ':documentation:renderDialectReport' - - from project( ":documentation" ).tasks.renderDialectReport - into rootProject.layout.buildDirectory.dir("staging-deploy/documentation/dialect") -} - def stageOrmReportsTask = tasks.register( "stageOrmReports" ) { group 'documentation' description "Stages all ORM reports as part of preparing for release" @@ -154,7 +155,6 @@ def stageOrmReportsTask = tasks.register( "stageOrmReports" ) { dependsOn stageInternalsReportTask dependsOn stageDeprecationReportTask dependsOn stageLoggingReportTask - dependsOn stageDialectReportTask } def stageJavadocsTask = tasks.register( "stageJavadocs", Copy ) { @@ -185,6 +185,7 @@ def assembleDocumentationTask = tasks.register( "assembleDocumentation" ) { dependsOn stageIntegrationGuideTask dependsOn stageTopicalGuideTask dependsOn stageMigrationGuideTask + dependsOn stageDialectGuideTask dependsOn stageOrmReportsTask }