From e3f199eb1db0d4f7144586f12fabf847f75dc589 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Mon, 10 Nov 2025 12:18:31 +0100 Subject: [PATCH 1/2] Adjust Asciidoctor execution mode --- documentation/documentation.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle index a640428150c3..d6cdaf6e55ef 100644 --- a/documentation/documentation.gradle +++ b/documentation/documentation.gradle @@ -901,4 +901,11 @@ tasks.withType(AsciidoctorTask).configureEach { separateOutputDirs = false backends 'html5' } + // See https://docs.asciidoctor.org/gradle-plugin/latest/common-task-configuration/#choosing-an-execution-mode-for-asciidoctorj + executionMode = org.ysb33r.grolifant.api.core.jvm.ExecutionMode.JAVA_EXEC +} + +tasks.withType(AsciidoctorPdfTask).configureEach { + // See https://docs.asciidoctor.org/gradle-plugin/latest/common-task-configuration/#choosing-an-execution-mode-for-asciidoctorj + executionMode = org.ysb33r.grolifant.api.core.jvm.ExecutionMode.JAVA_EXEC } From 697029ea26cfa3f33380efbe7f152b0627f94fa0 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Mon, 10 Nov 2025 12:53:27 +0100 Subject: [PATCH 2/2] Fix Asciidoc paths --- documentation/documentation.gradle | 5 ++++- documentation/src/main/asciidoc/dialect/dialect.adoc | 2 -- .../main/asciidoc/introduction/Hibernate_Introduction.adoc | 4 +--- .../asciidoc/querylanguage/Hibernate_Query_Language.adoc | 4 +--- documentation/src/main/asciidoc/querylanguage/Preface.adoc | 2 -- documentation/src/main/asciidoc/quickstart/guides/index.adoc | 2 -- .../src/main/asciidoc/quickstart/guides/preface.adoc | 2 -- .../asciidoc/repositories/Hibernate_Data_Repositories.adoc | 4 +--- documentation/src/main/asciidoc/repositories/Preface.adoc | 4 +--- .../src/main/asciidoc/shared/filesystem-attributes.adoc | 4 +--- documentation/src/main/asciidoc/topical/index.adoc | 2 -- documentation/src/main/asciidoc/topical/logging/Logging.adoc | 2 -- .../src/main/asciidoc/userguide/Hibernate_User_Guide.adoc | 2 -- documentation/src/main/asciidoc/userguide/Preface.adoc | 1 - 14 files changed, 9 insertions(+), 31 deletions(-) diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle index d6cdaf6e55ef..570d6983fb5f 100644 --- a/documentation/documentation.gradle +++ b/documentation/documentation.gradle @@ -263,7 +263,10 @@ asciidoctorj { fullVersion: rootProject.ormVersion.fullName, javaCompatibleVersions: jdks.versions.compatible.get(), jakartaJpaVersion: rootProject.jakartaJpaVersion, - jdbcVersion: jdks.versions.jdbc.get() + jdbcVersion: jdks.versions.jdbc.get(), + 'root-project-dir': rootProject.layout.projectDirectory.asFile.absolutePath, + 'doc-main-dir': project(':documentation').layout.projectDirectory.dir('src').dir("main").asFile.absolutePath, + 'shared-attributes-dir': project(':documentation').layout.projectDirectory.dir('src').dir("main").dir("asciidoc").dir("shared").asFile.absolutePath options logDocuments: true } diff --git a/documentation/src/main/asciidoc/dialect/dialect.adoc b/documentation/src/main/asciidoc/dialect/dialect.adoc index 7cf163c14ac0..51a34fd3d7f1 100644 --- a/documentation/src/main/asciidoc/dialect/dialect.adoc +++ b/documentation/src/main/asciidoc/dialect/dialect.adoc @@ -1,5 +1,3 @@ -:shared-attributes-dir: ../shared/ - include::{shared-attributes-dir}/common-attributes.adoc[] include::{shared-attributes-dir}/url-attributes.adoc[] include::{shared-attributes-dir}/filesystem-attributes.adoc[] diff --git a/documentation/src/main/asciidoc/introduction/Hibernate_Introduction.adoc b/documentation/src/main/asciidoc/introduction/Hibernate_Introduction.adoc index cf93d8d8b9a5..6526db7ec935 100644 --- a/documentation/src/main/asciidoc/introduction/Hibernate_Introduction.adoc +++ b/documentation/src/main/asciidoc/introduction/Hibernate_Introduction.adoc @@ -1,5 +1,3 @@ -:shared-attributes-dir: ../shared/ - include::{shared-attributes-dir}/common-attributes.adoc[] include::{shared-attributes-dir}/url-attributes.adoc[] include::{shared-attributes-dir}/filesystem-attributes.adoc[] @@ -7,7 +5,7 @@ include::{shared-attributes-dir}/renderer-attributes.adoc[] = An Introduction to Hibernate 6 -:title-logo-image: image:../../style/asciidoctor/images/org/hibernate/logo.png[] +:title-logo-image: image:{doc-main-dir}/style/asciidoctor/images/org/hibernate/logo.png[] :toc: :toclevels: 3 diff --git a/documentation/src/main/asciidoc/querylanguage/Hibernate_Query_Language.adoc b/documentation/src/main/asciidoc/querylanguage/Hibernate_Query_Language.adoc index 8d0b63d13fba..c9c425b144e1 100644 --- a/documentation/src/main/asciidoc/querylanguage/Hibernate_Query_Language.adoc +++ b/documentation/src/main/asciidoc/querylanguage/Hibernate_Query_Language.adoc @@ -1,5 +1,3 @@ -:shared-attributes-dir: ../shared/ - include::{shared-attributes-dir}/common-attributes.adoc[] include::{shared-attributes-dir}/url-attributes.adoc[] include::{shared-attributes-dir}/filesystem-attributes.adoc[] @@ -10,7 +8,7 @@ include::{shared-attributes-dir}/renderer-attributes.adoc[] :extrasdir: extras = A Guide to Hibernate Query Language -:title-logo-image: image:../../style/asciidoctor/images/org/hibernate/logo.png[] +:title-logo-image: image:{doc-main-dir}/style/asciidoctor/images/org/hibernate/logo.png[] :toc: :toclevels: 3 diff --git a/documentation/src/main/asciidoc/querylanguage/Preface.adoc b/documentation/src/main/asciidoc/querylanguage/Preface.adoc index 4976e23c64d7..d78667efc973 100644 --- a/documentation/src/main/asciidoc/querylanguage/Preface.adoc +++ b/documentation/src/main/asciidoc/querylanguage/Preface.adoc @@ -1,5 +1,3 @@ -:shared-attributes-dir: ../shared/ - include::{shared-attributes-dir}/url-attributes.adoc[] [[preface]] diff --git a/documentation/src/main/asciidoc/quickstart/guides/index.adoc b/documentation/src/main/asciidoc/quickstart/guides/index.adoc index 753eb12fc9f3..5074ed47aa7c 100644 --- a/documentation/src/main/asciidoc/quickstart/guides/index.adoc +++ b/documentation/src/main/asciidoc/quickstart/guides/index.adoc @@ -1,5 +1,3 @@ -:shared-attributes-dir: ../../shared/ - include::{shared-attributes-dir}/common-attributes.adoc[] include::{shared-attributes-dir}/url-attributes.adoc[] include::{shared-attributes-dir}/filesystem-attributes.adoc[] diff --git a/documentation/src/main/asciidoc/quickstart/guides/preface.adoc b/documentation/src/main/asciidoc/quickstart/guides/preface.adoc index b44b21b3538c..773af9518e89 100644 --- a/documentation/src/main/asciidoc/quickstart/guides/preface.adoc +++ b/documentation/src/main/asciidoc/quickstart/guides/preface.adoc @@ -1,5 +1,3 @@ -:shared-attributes-dir: ../../shared/ - include::{shared-attributes-dir}/url-attributes.adoc[] include::{shared-attributes-dir}/filesystem-attributes.adoc[] diff --git a/documentation/src/main/asciidoc/repositories/Hibernate_Data_Repositories.adoc b/documentation/src/main/asciidoc/repositories/Hibernate_Data_Repositories.adoc index 9c5bd400580a..1a8f22b32b52 100644 --- a/documentation/src/main/asciidoc/repositories/Hibernate_Data_Repositories.adoc +++ b/documentation/src/main/asciidoc/repositories/Hibernate_Data_Repositories.adoc @@ -1,12 +1,10 @@ -:shared-attributes-dir: ../shared/ - include::{shared-attributes-dir}/common-attributes.adoc[] include::{shared-attributes-dir}/url-attributes.adoc[] include::{shared-attributes-dir}/filesystem-attributes.adoc[] include::{shared-attributes-dir}/renderer-attributes.adoc[] = Introducing Hibernate Data Repositories -:title-logo-image: image:../../style/asciidoctor/images/org/hibernate/logo.png[] +:title-logo-image: image:{doc-main-dir}/style/asciidoctor/images/org/hibernate/logo.png[] :toc: :toclevels: 3 diff --git a/documentation/src/main/asciidoc/repositories/Preface.adoc b/documentation/src/main/asciidoc/repositories/Preface.adoc index 81e76a50a0be..75b5f0a364e9 100644 --- a/documentation/src/main/asciidoc/repositories/Preface.adoc +++ b/documentation/src/main/asciidoc/repositories/Preface.adoc @@ -1,5 +1,3 @@ -:shared-attributes-dir: ../shared/ - include::{shared-attributes-dir}/url-attributes.adoc[] [[preface]] @@ -16,4 +14,4 @@ On the other hand, the programming model for interacting with the database is qu Therefore, this document will show you a different way to use Hibernate. The coverage of Jakarta Data is intentionally inexhaustive. -If exhaustion is sought, this document should be read in conjunction with the specification, which we've worked hard to keep readable. \ No newline at end of file +If exhaustion is sought, this document should be read in conjunction with the specification, which we've worked hard to keep readable. diff --git a/documentation/src/main/asciidoc/shared/filesystem-attributes.adoc b/documentation/src/main/asciidoc/shared/filesystem-attributes.adoc index 4b0c59edba7a..e29f07e36fcd 100644 --- a/documentation/src/main/asciidoc/shared/filesystem-attributes.adoc +++ b/documentation/src/main/asciidoc/shared/filesystem-attributes.adoc @@ -2,14 +2,12 @@ // Centralized definition of Asciidoc attributes for local filesystem paths // **************************************************************************** -:doc-main-dir: ../.. :doc-main-asciidoc-dir: {doc-main-dir}/asciidoc :doc-main-style-dir: {doc-main-dir}/style :pdf-theme: {doc-main-style-dir}/pdf/theme.yml :pdf-fontsdir: {doc-main-style-dir}/pdf/fonts -//:title-logo-image: {doc-main-style-dir}/asciidoctor/images/org/hibernate/logo.png[] +//:title-logo-image: image:{doc-main-dir}/style/asciidoctor/images/org/hibernate/logo.png[] -:root-project-dir: ../../../../.. :core-project-dir: {root-project-dir}/hibernate-core :documentation-project-dir: {root-project-dir}/documentation :testing-project-dir: {root-project-dir}/hibernate-testing diff --git a/documentation/src/main/asciidoc/topical/index.adoc b/documentation/src/main/asciidoc/topical/index.adoc index 628562548d79..d4e575987cee 100644 --- a/documentation/src/main/asciidoc/topical/index.adoc +++ b/documentation/src/main/asciidoc/topical/index.adoc @@ -1,5 +1,3 @@ -:shared-attributes-dir: ../shared/ - include::{shared-attributes-dir}/common-attributes.adoc[] include::{shared-attributes-dir}/url-attributes.adoc[] include::{shared-attributes-dir}/filesystem-attributes.adoc[] diff --git a/documentation/src/main/asciidoc/topical/logging/Logging.adoc b/documentation/src/main/asciidoc/topical/logging/Logging.adoc index 4422ff99f054..5db89c05dec1 100644 --- a/documentation/src/main/asciidoc/topical/logging/Logging.adoc +++ b/documentation/src/main/asciidoc/topical/logging/Logging.adoc @@ -1,5 +1,3 @@ -:shared-attributes-dir: ../../shared/ - include::{shared-attributes-dir}/common-attributes.adoc[] include::{shared-attributes-dir}/url-attributes.adoc[] include::{shared-attributes-dir}/filesystem-attributes.adoc[] diff --git a/documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc b/documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc index 01e738fc3f8a..9bd5673a0f40 100644 --- a/documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc +++ b/documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc @@ -1,5 +1,3 @@ -:shared-attributes-dir: ../shared/ - include::{shared-attributes-dir}/common-attributes.adoc[] include::{shared-attributes-dir}/url-attributes.adoc[] include::{shared-attributes-dir}/filesystem-attributes.adoc[] diff --git a/documentation/src/main/asciidoc/userguide/Preface.adoc b/documentation/src/main/asciidoc/userguide/Preface.adoc index 5c2de61d009f..613a012b1803 100644 --- a/documentation/src/main/asciidoc/userguide/Preface.adoc +++ b/documentation/src/main/asciidoc/userguide/Preface.adoc @@ -1,4 +1,3 @@ -:shared-attributes-dir: ../shared/ include::{shared-attributes-dir}/url-attributes.adoc[] [[preface]]