Skip to content

Various asciidocs build fixes #11208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2025
Merged

Various asciidocs build fixes #11208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3f199e
Adjust Asciidoctor execution mode
marko-bekhta Nov 10, 2025
697029e
Fix Asciidoc paths
marko-bekhta Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion documentation/documentation.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -901,4 +904,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
}
2 changes: 0 additions & 2 deletions documentation/src/main/asciidoc/dialect/dialect.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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[]
Expand Down
4 changes: 1 addition & 3 deletions documentation/src/main/asciidoc/introduction/Hibernate_Introduction.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
: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[]


= 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

Expand Down
4 changes: 1 addition & 3 deletions documentation/src/main/asciidoc/querylanguage/Hibernate_Query_Language.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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[]
Expand All @@ -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

Expand Down
2 changes: 0 additions & 2 deletions documentation/src/main/asciidoc/querylanguage/Preface.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
:shared-attributes-dir: ../shared/

include::{shared-attributes-dir}/url-attributes.adoc[]

[[preface]]
Expand Down
2 changes: 0 additions & 2 deletions documentation/src/main/asciidoc/quickstart/guides/index.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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[]
Expand Down
2 changes: 0 additions & 2 deletions documentation/src/main/asciidoc/quickstart/guides/preface.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
:shared-attributes-dir: ../../shared/

include::{shared-attributes-dir}/url-attributes.adoc[]
include::{shared-attributes-dir}/filesystem-attributes.adoc[]

Expand Down
4 changes: 1 addition & 3 deletions documentation/src/main/asciidoc/repositories/Hibernate_Data_Repositories.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 1 addition & 3 deletions documentation/src/main/asciidoc/repositories/Preface.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
:shared-attributes-dir: ../shared/

include::{shared-attributes-dir}/url-attributes.adoc[]

[[preface]]
Expand All @@ -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.
If exhaustion is sought, this document should be read in conjunction with the specification, which we've worked hard to keep readable.
4 changes: 1 addition & 3 deletions documentation/src/main/asciidoc/shared/filesystem-attributes.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions documentation/src/main/asciidoc/topical/index.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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[]
Expand Down
2 changes: 0 additions & 2 deletions documentation/src/main/asciidoc/topical/logging/Logging.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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[]
Expand Down
2 changes: 0 additions & 2 deletions documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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[]
Expand Down
1 change: 0 additions & 1 deletion documentation/src/main/asciidoc/userguide/Preface.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
:shared-attributes-dir: ../shared/
include::{shared-attributes-dir}/url-attributes.adoc[]

[[preface]]
Expand Down
Loading