Update asciidoctor gradle plugin, make documentation generation task work

Closes gh-91

Author: rainboyan

build.gradle

@@ -10,7 +10,7 @@ buildscript {
     }
     dependencies {
         classpath "io.github.gradle-nexus:publish-plugin:2.0.0"
-        // classpath "io.github.groovylang.groovydoc:groovydoc-gradle-plugin:1.0.1"
+        classpath "org.asciidoctor:asciidoctor-gradle-jvm:4.0.3"
         classpath "org.graceframework:grace-gradle-plugin:$graceVersion"
         classpath "com.github.erdi:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
         classpath "org.gradle:test-retry-gradle-plugin:1.6.0"
@@ -114,7 +114,6 @@ subprojects { Project subproject ->
         documentation "org.fusesource.jansi:jansi:$jansiVersion"
         documentation "org.apache.groovy:groovy-dateutil:$groovyVersion"
         documentation "org.apache.groovy:groovy-xml:$groovyVersion"
-        documentation "info.picocli:picocli:$picocliVersion"
         documentation "com.github.javaparser:javaparser-core:$javaParserCoreVersion"
 
         testImplementation "org.spockframework:spock-core:$spockVersion", {

docs/build.gradle

@@ -1,5 +1,5 @@
 ext {
-    githubBranch = "release/2023.0.0-M1"
+    githubBranch = "2023.3.x"
     checkOutDir = "build/checkout"
     zipFile = "build/source.zip"
 
@@ -12,19 +12,13 @@ ext {
 
 version rootProject.version
 
-apply plugin: 'org.asciidoctor.convert'
+apply plugin: "org.asciidoctor.jvm.convert"
 apply plugin: 'groovy'
 
-configurations.all {
-    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        if (details.requested.group == 'org.apache.groovy' && details.requested.name.startsWith('groovy')) {
-            details.useVersion(groovyVersion)
-        }
-        if (details.requested.group == 'org.springframework') {
-            details.useVersion(springVersion)
-        }
-        if (details.requested.group == "org.springframework.boot") {
-            details.useVersion(springBootVersion)
+configurations {
+    documentation {
+        attributes {
+            attribute(Bundling.BUNDLING_ATTRIBUTE, (Bundling) (objects.named(Bundling, 'external')))
         }
     }
 }
@@ -33,7 +27,6 @@ dependencies {
     documentation "org.graceframework:grace-core:$graceVersion"
     documentation "org.graceframework:grace-bootstrap:$graceVersion"
     documentation "org.graceframework:grace-spring:$graceVersion"
-    documentation "info.picocli:picocli:$picocliVersion"
     documentation "org.fusesource.jansi:jansi:$jansiVersion"
     documentation "org.apache.groovy:groovy-dateutil:$groovyVersion"
     documentation "com.github.javaparser:javaparser-core:$javaParserCoreVersion"
@@ -51,21 +44,21 @@ dependencies {
 
 asciidoctor {
     resources {
-        from("${project.projectDir}/src/docs/asciidoc/images")
-        into "./images"
+        from("${project.projectDir}/src/docs/images")
+        into "${project.projectDir}/images"
     }
 
     attributes  'experimental'  : 'true',
                 'compat-mode'   : 'true',
+                'toc'           : 'left',
                 'icons'         : 'font',
                 'reproducible'  : '',
                 'version'       : project.version,
                 'pluginVersion' : project.version,
-                'sourcedir'     : "${project.projectDir}/src/main/groovy"
-}
+                // 'mongoDriverVersion': mongodbDriverVersion,
+                'sourcedir'     : "${project.rootDir}"
 
-asciidoctorj {
-    version = '1.5.4'
+    baseDirFollowsSourceDir()
 }
 
 task fetchSource {
@@ -76,9 +69,9 @@ task fetchSource {
         println "Downloading GORM source code."
         def tag = System.getenv('TRAVIS_TAG')
         if (tag) {
-            ant.get src: "https://github.com/grace/grace-data/archive/${tag}.zip", dest: zipFile, verbose: true
+            ant.get src: "https://github.com/graceframework/grace-data/archive/${tag}.zip", dest: zipFile, verbose: true
         } else {
-            ant.get src: "https://github.com/grace/grace-data/zipball/${githubBranch}", dest: zipFile, verbose: true
+            ant.get src: "https://github.com/graceframework/grace-data/zipball/${githubBranch}", dest: zipFile, verbose: true
         }
 
         ant.unzip src: zipFile, dest: checkOutDir, {
@@ -105,9 +98,9 @@ tasks.withType(Groovydoc) {
     def files
     for (p in coreProjects) {
         if (files == null) {
-            files = project.files("${checkOutDir}/gorm-src/grails-datastore-${p}/src/main/groovy")
+            files = project.files("${checkOutDir}/gorm-src/grace-datastore-${p}/src/main/groovy")
         } else {
-            files += project.files("${checkOutDir}/gorm-src/grails-datastore-${p}/src/main/groovy")
+            files += project.files("${checkOutDir}/gorm-src/grace-datastore-${p}/src/main/groovy")
         }
     }
     project.rootProject.subprojects
@@ -131,8 +124,8 @@ task docs(dependsOn:[asciidoctor, groovydoc, copyDocs, copyResources] +
                 .collect { project -> project.tasks.groovydoc }
 )
 
-//task assemble(type: Zip, dependsOn:docs) {
-//    from "${project.buildDir}/docs"
-//    baseName = "${project.name}-${project.version}"
-//    destinationDir = project.file("${project.buildDir}/distributions")
-//}
+task assemble(type: Zip, dependsOn:docs) {
+   from "${project.buildDir}/docs"
+   baseName = "${project.name}-${project.version}"
+   destinationDir = project.file("${project.buildDir}/distributions")
+}

gradle.properties

@@ -15,7 +15,6 @@ jpaVersion=3.1.0
 jtaVersion=2.0.1
 junitJupiterVersion=5.10.5
 junitPlatformVersion=1.10.5
-picocliVersion=4.6.3
 seleniumSafariDriverVersion=3.14.0
 seleniumVersion=3.14.0
 slf4jVersion=2.0.16

settings.gradle

@@ -4,7 +4,7 @@ rootProject.name = 'Grace.Data.Hibernate'
 include "grace-datastore-gorm-hibernate"
 
 // Documentation
-// include 'docs'
+include 'docs'
 
 // Plugins
 include 'grace-plugin'