8000 Update and migrate to asciidoc gradle plugin `3.3.2` · hibernate/hibernate-orm@7fed5c6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7fed5c6

Browse files
mbelladedreab8
mbellade
authored and
dreab8
committed
Update and migrate to asciidoc gradle plugin 3.3.2
Older versions cannot correctly resolve dependencies
1 parent 25e274e commit 7fed5c6

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
classpath 'org.hibernate.build.gradle:hibernate-matrix-testing:3.0.0.Final'
1515
classpath 'org.hibernate.build.gradle:version-injection-plugin:1.0.0'
1616
classpath 'gradle.plugin.com.github.lburgazzoli:gradle-karaf-plugin:0.5.1'
17-
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.7'
17+
classpath 'org.asciidoctor:asciidoctor-gradle-jvm:3.3.2'
1818
classpath 'de.thetaphi:forbiddenapis:3.0.1'
1919
}
2020
}

‎documentation/documentation.gradle

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import org.apache.tools.ant.filters.ReplaceTokens
2-
import org.asciidoctor.gradle.AsciidoctorTask
2+
import org.asciidoctor.gradle.jvm.AsciidoctorTask
33

44
/*
55
* Hibernate, Relational Persistence for Idiomatic Java
@@ -28,7 +28,7 @@ rootProject.subprojects { subproject ->
2828

2929
apply from: rootProject.file( 'gradle/java-module.gradle' )
3030

31-
apply plugin: 'org.asciidoctor.convert'
31+
apply plugin: 'org.asciidoctor.jvm.convert'
3232

3333
apply plugin: 'hibernate-matrix-testing'
3434

@@ -179,8 +179,6 @@ task renderTopicalGuides(type: AsciidoctorTask, group: 'Documentation') {
179179
description = 'Renders the Topical Guides in HTML format using Asciidoctor.'
180180
sourceDir = file( 'src/main/asciidoc/topical' )
181181
outputDir = new File("$buildDir/asciidoc/topical/html_single")
182-
backends "html5"
183-
separateOutputDirs false
184182
options logDocuments: true
185183
attributes icons: 'font',
186184
experimental: true,
@@ -204,8 +202,6 @@ task renderGettingStartedGuides(type: AsciidoctorTask, group: 'Documentation') {
204202
include 'index.adoc'
205203
}
206204
outputDir = new File("$buildDir/asciidoc/quickstart/html_single")
207-
backends "html5"
208-
separateOutputDirs false
209205
options logDocuments: true
210206
attributes icons: 'font', experimental: true, 'source-highlighter': 'prettify'
211207
}
@@ -234,8 +230,6 @@ task renderUserGuide(type: AsciidoctorTask, group: 'Documentation') {
234230
include 'Hibernate_User_Guide.adoc'
235231
}
236232
outputDir = new File("$buildDir/asciidoc/userguide/html_single")
237-
backends "html5"
238-
separateOutputDirs false
239233
options logDocuments: true
240234
attributes icons: 'font', experimental: true,
241235
'source-highlighter': 'prettify',
@@ -270,8 +264,6 @@ task renderIntegrationGuide(type: AsciidoctorTask, group: 'Documentation') {
270264
include 'Hibernate_Integration_Guide.adoc'
271265
}
272266
outputDir = new File("$buildDir/asciidoc/integrationguide/html_single")
273-
backends "html5"
274-
separateOutputDirs false
275267
options logDocuments: true
276268
attributes icons: 'font',
277269
experimental: true,
@@ -318,3 +310,10 @@ buildDocsForPublishing.dependsOn renderIntegrationGuide
318310

319311
checkstyleMain.exclude '**/org/hibernate/userguide/model/*'
320312

313+
tasks.withType(AsciidoctorTask).configureEach {
314+
baseDirFollowsSourceDir()
315+
outputOptions {
316+
separateOutputDirs = false
317+
backends 'html5'
318+
}
319+
}

0 commit comments

Comments
 (0)
0