[groovy] 01/02: Revert "GROOVY-9697: Bump asciidoctor to 3.2.0 (experimental pdf support - still fails rendering some code/images) (closes #1350)"

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit d27e82c682c6dec0ea244fa74d7019b115f58925
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Aug 22 09:41:40 2020 +1000

    Revert "GROOVY-9697: Bump asciidoctor to 3.2.0 (experimental pdf support - still fails rendering some code/images) (closes #1350)"
    
    This reverts commit 4dda037b09a4e1d86023020239f37aae97bc9b64. We need to fix up classpath issues first.
---
 build.gradle              |  1 -
 gradle/asciidoctor.gradle |  6 +++---
 gradle/docs.gradle        | 14 +-------------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index ab207fb..7969a5e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,6 @@ buildscript {
 }
 
 plugins {
-    id 'org.asciidoctor.jvm.pdf' version '3.2.0'
     id 'me.champeau.buildscan-recipes' version '0.2.3'
     id 'com.github.spotbugs' version '4.5.0'
     id 'com.github.ben-manes.versions' version '0.29.0'
diff --git a/gradle/asciidoctor.gradle b/gradle/asciidoctor.gradle
index 623d841..4e45715 100644
--- a/gradle/asciidoctor.gradle
+++ b/gradle/asciidoctor.gradle
@@ -76,10 +76,10 @@ asciidoctorj {
             }
         }
     }
-    modules {
+//    modules {
 //        diagram.version('2.0.2')
-        pdf.version('1.5.3')
-    }
+//        pdf.version('1.5.3')
+//    }
 }
 
 // skip the asciidoctor task if there's no directory with asciidoc files
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index e9ff503..a39136e 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-task doc(dependsOn: ['javadocAll', 'groovydocAll', 'docGDK', 'asciidocAll', 'asciidoctorPdf']) {
+task doc(dependsOn: ['javadocAll', 'groovydocAll', 'docGDK', 'asciidocAll']) {
     ext.footer = 'Copyright &copy; 2003-2020 The Apache Software Foundation. All rights reserved.'
     ext.title = "Groovy ${groovyVersion}"
 }
@@ -30,18 +30,6 @@ task asciidocAll(type: Copy) {
     into "$buildDir/asciidocAll/html5"
 }
 
-asciidoctorPdf {
-    baseDirIsRootProjectDir() // needed for asciidocAll
-    logDocuments = true
-    sourceDir = project.file('src/spec/doc')
-    sources {
-        include 'index.adoc'
-    }
-    outputDir = "$buildDir/asciidoc/pdf"
-    attributes 'rootProjectDir': rootProject.projectDir,
-            specfolder: 'src/spec/doc'
-}
-
 def javadocSpec = {
     maxMemory = javaDoc_mx
     project.configure(options) {