Skip to content

Commit cb49fb2

Browse files
marko-bekhtamarko-bekhta
committed
HHH-19827 Fix problem with unpack theme task dependency
1 parent e6d5fee commit cb49fb2

File tree

2 files changed

+20
-24
lines changed

2 files changed

+20
-24
lines changed

‎documentation/documentation.gradle‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,13 @@ asciidoctorj {
249249
'doc-main-dir': project(':documentation').layout.projectDirectory.dir('src').dir("main").asFile.absolutePath,
250250
'doc-generated-content-dir': project(':documentation').layout.buildDirectory.dir('asciidoc').get()
251251
.dir("fragments").asFile.absolutePath,
252-
'theme-main-dir': rootProject.layout.buildDirectory.dir("unpacked-theme").get()
252+
'theme-main-dir': project.layout.buildDirectory.dir("unpacked-theme").get()
253253
.dir("hibernate-asciidoctor-theme").dir("asciidoc").asFile.absolutePath,
254254
stylesdir: "css",
255255
'iconfont-remote': false,
256256
'iconfont-name': 'font-awesome/css/solid',
257257
docinfo: 'shared,private',
258-
docinfodir: rootProject.layout.buildDirectory.dir("unpacked-theme").get()
258+
docinfodir: project.layout.buildDirectory.dir("unpacked-theme").get()
259259
.dir("hibernate-asciidoctor-theme").dir("asciidoc").dir("docinfo").dir('hibernate').asFile.absolutePath,
260260
'html.meta.project-key': 'orm',
261261
'html-outdated-content-project-key': 'orm',
@@ -282,7 +282,7 @@ def renderTopicalLoggingGuideHtmlTask = tasks.register( 'renderTopicalLoggingGui
282282
from( 'src/main/asciidoc/topical/' ) {
283283
include '**/images/**'
284284
}
285-
from(rootProject.layout.buildDirectory.dir("unpacked-theme").get()
285+
from(project.layout.buildDirectory.dir("unpacked-theme").get()
286286
.dir("hibernate-asciidoctor-theme").dir("asciidoc")) {
287287
include 'css/**'
288288
include 'images/**'
@@ -304,7 +304,7 @@ def renderTopicalRegistriesGuideHtmlTask = tasks.register( 'renderTopicalRegistr
304304
from( 'src/main/asciidoc/topical/' ) {
305305
include '**/images/**'
306306
}
307-
from(rootProject.layout.buildDirectory.dir("unpacked-theme").get()
307+
from(project.layout.buildDirectory.dir("unpacked-theme").get()
308308
.dir("hibernate-asciidoctor-theme").dir("asciidoc")) {
309309
include 'css/**'
310310
include 'images/**'
@@ -327,7 +327,7 @@ def renderTopicalGuideHtmlTask = tasks.register( 'renderTopicalGuideHtml', Ascii
327327
from( 'src/main/asciidoc/topical/' ) {
328328
include '**/images/**'
329329
}
330-
from(rootProject.layout.buildDirectory.dir("unpacked-theme").get()
330+
from(project.layout.buildDirectory.dir("unpacked-theme").get()
331331
.dir("hibernate-asciidoctor-theme").dir("asciidoc")) {
332332
include 'css/**'
333333
include 'images/**'
@@ -376,7 +376,7 @@ def renderGettingStartedGuideHtmlTask = tasks.register( 'renderGettingStartedGui
376376
attributes jpaJavadocUrlPrefix: "https://javaee.github.io/javaee-spec/javadocs/javax/persistence/"
377377

378378
resources {
379-
from(rootProject.layout.buildDirectory.dir("unpacked-theme").get()
379+
from(project.layout.buildDirectory.dir("unpacked-theme").get()
380380
.dir("hibernate-asciidoctor-theme").dir("asciidoc")) {
381381
include 'css/**'
382382
include 'images/**'
@@ -425,7 +425,7 @@ def renderIntroductionHtmlTask = tasks.register( 'renderIntroductionHtml', Ascii
425425
from( 'src/main/asciidoc/introduction/' ) {
426426
include 'images/**'
427427
}
428-
from(rootProject.layout.buildDirectory.dir("unpacked-theme").get()
428+
from(project.layout.buildDirectory.dir("unpacked-theme").get()
429429
.dir("hibernate-asciidoctor-theme").dir("asciidoc")) {
430430
include 'css/**'
431431
include 'images/**'
@@ -484,7 +484,7 @@ def renderQueryLanguageGuideHtmlTask = tasks.register( 'renderQueryLanguageGuide
484484
from( 'src/main/asciidoc/querylanguage/' ) {
485485
include 'images/**'
486486
}
487-
from(rootProject.layout.buildDirectory.dir("unpacked-theme").get()
487+
from(project.layout.buildDirectory.dir("unpacked-theme").get()
488488
.dir("hibernate-asciidoctor-theme").dir("asciidoc")) {
489489
include 'css/**'
490490
include 'images/**'
@@ -531,7 +531,7 @@ def renderRepositoriesHtmlTask = tasks.register( 'renderRepositoriesHtml', Ascii
531531
from( 'src/main/asciidoc/repositories/' ) {
532532
include 'images/**'
533533
}
534-
from(rootProject.layout.buildDirectory.dir("unpacked-theme").get()
534+
from(project.layout.buildDirectory.dir("unpacked-theme").get()
535535
.dir("hibernate-asciidoctor-theme").dir("asciidoc")) {
536536
include 'css/**'
537537
include 'images/**'
@@ -762,7 +762,7 @@ def renderUserGuideHtmlTask = tasks.register( 'renderUserGuideHtml', Asciidoctor
762762
from( 'src/main/asciidoc/userguide/' ) {
763763
include 'images/**'
764764
}
765-
from(rootProject.layout.buildDirectory.dir("unpacked-theme").get()
765+
from(project.layout.buildDirectory.dir("unpacked-theme").get()
766766
.dir("hibernate-asciidoctor-theme").dir("asciidoc")) {
767767
include 'css/**'
768768
include 'images/**'
@@ -796,7 +796,7 @@ def renderIntegrationGuideHtmlTask = tasks.register( "renderIntegrationGuideHtml
796796
from( 'src/main/asciidoc/integrationguide/' ) {
797797
include 'images/**'
798798
}
799-
from(rootProject.layout.buildDirectory.dir("unpacked-theme").get()
799+
from(project.layout.buildDirectory.dir("unpacked-theme").get()
800800
.dir("hibernate-asciidoctor-theme").dir("asciidoc")) {
801801
include 'css/**'
802802
include 'images/**'
@@ -848,7 +848,7 @@ def renderWhatsNewTask = tasks.register( "renderWhatsNew", AsciidoctorTask ) {
848848
outputDir = project.layout.buildDirectory.dir( 'asciidoc/whats-new' )
849849

850850
resources {
851-
from(rootProject.layout.buildDirectory.dir("unpacked-theme").get()
851+
from(project.layout.buildDirectory.dir("unpacked-theme").get()
852852
.dir("hibernate-asciidoctor-theme").dir("asciidoc")) {
853853
include 'css/**'
854854
include 'images/**'
@@ -891,7 +891,7 @@ def renderMigrationGuideTask = tasks.register( "renderMigrationGuide", Asciidoct
891891
outputDir = project.layout.buildDirectory.dir( 'asciidoc/migration-guide' )
892892

893893
resources {
894-
from(rootProject.layout.buildDirectory.dir("unpacked-theme").get()
894+
from(project.layout.buildDirectory.dir("unpacked-theme").get()
895895
.dir("hibernate-asciidoctor-theme").dir("asciidoc")) {
896896
include 'css/**'
897897
include 'images/**'
@@ -915,7 +915,7 @@ def renderDialectGuideTask = tasks.register( 'renderDialectGuide', AsciidoctorTa
915915
attributes 'generated-report-dir': layout.buildDirectory.dir( 'orm/generated' ).get()
916916

917917
resources {
918-
from(rootProject.layout.buildDirectory.dir("unpacked-theme").get()
918+
from(project.layout.buildDirectory.dir("unpacked-theme").get()
919919
.dir("hibernate-asciidoctor-theme").dir("asciidoc")) {
920920
include 'css/**'
921921
include 'images/**'
@@ -940,7 +940,7 @@ def renderLoggingReportTask = tasks.register( 'renderLoggingReport', Asciidoctor
940940
task.outputDir = project.layout.buildDirectory.dir( 'asciidoc/logging' )
941941

942942
task.resources {
943-
from(rootProject.layout.buildDirectory.dir("unpacked-theme").get()
943+
from(project.layout.buildDirectory.dir("unpacked-theme").get()
944944
.dir("hibernate-asciidoctor-theme").dir("asciidoc")) {
945945
include 'css/**'
946946
include 'images/**'
@@ -1001,7 +1001,7 @@ tasks.withType(AsciidoctorPdfTask).configureEach {
10011001
executionMode = ExecutionMode.JAVA_EXEC
10021002

10031003
asciidoctorj {
1004-
requires rootProject.layout.buildDirectory.dir("unpacked-theme").get()
1004+
requires project.layout.buildDirectory.dir("unpacked-theme").get()
10051005
.dir("hibernate-asciidoctor-theme").dir("asciidoc").dir("theme").file("hibernate.rb").asFile.absolutePath
10061006
}
10071007

‎local-build-plugins/src/main/groovy/local.javadoc.gradle‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@ dependencies {
1414
themezip 'org.hibernate.infra:hibernate-asciidoctor-theme:6.1.1.Final@zip'
1515
}
1616

17-
tasks.register('unpackTheme', Copy) {
18-
def unpackDir = rootProject.layout.buildDirectory.dir("unpacked-theme")
19-
20-
onlyIf {
21-
!unpackDir.get().asFile.exists()
22-
}
17+
def unpackThemeTask = tasks.register('unpackTheme', Copy) {
18+
def unpackDir = project.layout.buildDirectory.dir("unpacked-theme")
2319
destinationDir = unpackDir.get().asFile
2420

2521
def zipFile = configurations.themezip.singleFile
@@ -33,6 +29,7 @@ tasks.withType(Javadoc).configureEach {
3329

3430
inputs.property "ormVersion", project.extensions.ormBuildDetails.hibernateVersion
3531
inputs.property "currentYear", currentYear
32+
inputs.property "theme-location", unpackThemeTask.get().destinationDir
3633

3734
// exclude any generated sources and internal packages
3835
exclude 'org/hibernate/grammars'
@@ -44,8 +41,7 @@ tasks.withType(Javadoc).configureEach {
4441
windowTitle = "Hibernate Javadocs ($project.name)"
4542
docTitle = "Hibernate Javadocs ($project.name : $project.version)"
4643
// Pick the styles for the JDK that is used to "build" the Javadocs:
47-
48-
def rootThemeDir = rootProject.layout.buildDirectory.dir("unpacked-theme").get().dir("hibernate-asciidoctor-theme").dir("javadoc").dir("jdk25")
44+
def rootThemeDir = project.layout.buildDirectory.dir("unpacked-theme").get().dir("hibernate-asciidoctor-theme").dir("javadoc").dir("jdk25")
4945
stylesheetFile = rootThemeDir.file("stylesheet.css").asFile
5046
bottom = "Copyright &copy; 2001-$currentYear <a href=\"https://redhat.com\">Red Hat, Inc.</a> All Rights Reserved."
5147

0 commit comments

Comments
 (0)