HHH-19827 Improve config of the Asciidoc attributes to set the directories and paths

marko-bekhta · marko-bekhta · commit 5add4f5123ae · 2025-10-03T16:44:37.000+02:00
diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle
@@ -230,14 +230,16 @@ asciidoctorj {
 			version '2.3.18'
 		}
 	}
-	attributes  icons: 'font',
+	attributes icons: 'font',
 			experimental: true,
 			'source-highlighter': 'rouge',
 			majorMinorVersion: hibernateVersion.family,
 			fullVersion: hibernateVersion.fullName,
 			javaCompatibleVersions: jdks.versions.compatible.get(),
 			jakartaJpaVersion: jpaVersion.name,
-			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
 
 	options logDocuments: true
 }
diff --git a/documentation/src/main/asciidoc/introduction/Hibernate_Introduction.adoc b/documentation/src/main/asciidoc/introduction/Hibernate_Introduction.adoc
@@ -1,4 +1,4 @@
-:shared-attributes-dir: ../shared/
+:shared-attributes-dir: ../shared
 
 include::{shared-attributes-dir}/common-attributes.adoc[]
 include::{shared-attributes-dir}/url-attributes.adoc[]
diff --git a/documentation/src/main/asciidoc/querylanguage/Hibernate_Query_Language.adoc b/documentation/src/main/asciidoc/querylanguage/Hibernate_Query_Language.adoc
@@ -1,4 +1,4 @@
-:shared-attributes-dir: ../shared/
+:shared-attributes-dir: ../shared
 
 include::{shared-attributes-dir}/common-attributes.adoc[]
 include::{shared-attributes-dir}/url-attributes.adoc[]
diff --git a/documentation/src/main/asciidoc/quickstart/guides/index.adoc b/documentation/src/main/asciidoc/quickstart/guides/index.adoc
@@ -1,4 +1,4 @@
-:shared-attributes-dir: ../../shared/
+:shared-attributes-dir: ../../shared
 
 include::{shared-attributes-dir}/common-attributes.adoc[]
 include::{shared-attributes-dir}/url-attributes.adoc[]
diff --git a/documentation/src/main/asciidoc/repositories/Hibernate_Data_Repositories.adoc b/documentation/src/main/asciidoc/repositories/Hibernate_Data_Repositories.adoc
@@ -1,4 +1,4 @@
-:shared-attributes-dir: ../shared/
+:shared-attributes-dir: ../shared
 
 include::{shared-attributes-dir}/common-attributes.adoc[]
 include::{shared-attributes-dir}/url-attributes.adoc[]
diff --git 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[]
 
-: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
@@ -1,4 +1,4 @@
-:shared-attributes-dir: ../shared/
+:shared-attributes-dir: ../shared
 
 include::{shared-attributes-dir}/common-attributes.adoc[]
 include::{shared-attributes-dir}/url-attributes.adoc[]
diff --git a/documentation/src/main/asciidoc/topical/logging/Logging.adoc b/documentation/src/main/asciidoc/topical/logging/Logging.adoc
@@ -1,4 +1,4 @@
-:shared-attributes-dir: ../../shared/
+:shared-attributes-dir: ../../shared
 
 include::{shared-attributes-dir}/common-attributes.adoc[]
 include::{shared-attributes-dir}/url-attributes.adoc[]
diff --git a/documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc b/documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc
@@ -1,4 +1,4 @@
-:shared-attributes-dir: ../shared/
+:shared-attributes-dir: ../shared
 
 include::{shared-attributes-dir}/common-attributes.adoc[]
 include::{shared-attributes-dir}/url-attributes.adoc[]

Original file line number	Diff line number	Diff line change
`@@ -230,14 +230,16 @@ asciidoctorj {`
`230`	`230`	`version '2.3.18'`
`231`	`231`	`}`
`232`	`232`	`}`
`233`		`- attributes icons: 'font',`
	`233`	`+ attributes icons: 'font',`
`234`	`234`	`experimental: true,`
`235`	`235`	`'source-highlighter': 'rouge',`
`236`	`236`	`majorMinorVersion: hibernateVersion.family,`
`237`	`237`	`fullVersion: hibernateVersion.fullName,`
`238`	`238`	`javaCompatibleVersions: jdks.versions.compatible.get(),`
`239`	`239`	`jakartaJpaVersion: jpaVersion.name,`
`240`		`- jdbcVersion: jdks.versions.jdbc.get()`
	`240`	`+ jdbcVersion: jdks.versions.jdbc.get(),`
	`241`	`+ 'root-project-dir': rootProject.layout.projectDirectory.asFile.absolutePath,`
	`242`	`+ 'doc-main-dir': project( ':documentation').layout.projectDirectory.dir('src').dir("main").asFile.absolutePath`
`241`	`243`
`242`	`244`	`options logDocuments: true`
`243`	`245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-:shared-attributes-dir: ../shared/`
	`1`	`+:shared-attributes-dir: ../shared`
`2`	`2`
`3`	`3`	`include::{shared-attributes-dir}/common-attributes.adoc[]`
`4`	`4`	`include::{shared-attributes-dir}/url-attributes.adoc[]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-:shared-attributes-dir: ../../shared/`
	`1`	`+:shared-attributes-dir: ../../shared`
`2`	`2`
`3`	`3`	`include::{shared-attributes-dir}/common-attributes.adoc[]`
`4`	`4`	`include::{shared-attributes-dir}/url-attributes.adoc[]`