Merge pull request asciidoctor#507 from ysb33r/prepare-3.x-for-release

Prepare 3.x for release
ysb33r · Jan 20, 2020 · cbd1bf5 · cbd1bf5
2 parents 087cc4b + 13c6ff3
commit cbd1bf5
Show file tree

Hide file tree

Showing 394 changed files with 11,435 additions and 5,195 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,9 @@ out
 *.iml
 *.ipr
 *.iws
+buildSrc/gradle/wrapper
+buildSrc/gradlew*
+.asciidoctor-module-versions.generated
 
 # Because we auto-generate this from the main project
 # and it is only needed for IntelliJ

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 stages:
-  - repo
+  - infrastructure
   - build
   - test
   - docs
@@ -9,21 +9,26 @@ stages:
 cache:
   key: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME-$CI_JOB_STAGE-$CI_JOB_NAME"
   paths:
-  - $HOME/.gradle
+    - $HOME/.gradle
+
+variables:
+    JDK8_TEST_IMAGE: $CI_REGISTRY/asciidoctor/testing-lab/openjdk8-with-libxss:latest
+    JDK11_TEST_IMAGE: $CI_REGISTRY/asciidoctor/testing-lab/openjdk11-with-libxss:latest
+    JDK12_TEST_IMAGE: $CI_REGISTRY/asciidoctor/testing-lab/openjdk12-with-libxss:latest
 
 testrepo:
-  stage: repo
+  stage: infrastructure
   image: openjdk:8
   script: ./gradlew -i --console=plain --no-build-cache :testfixtures-offline-repo:buildOfflineRepositories
   artifacts:
     paths:
-    - testfixtures/offline-repo/build/repo/
+      - testfixtures/offline-repo/build/repo/
     expire_in: 90min
     when: always
   except:
-  - pages
-  - gh-pages
-  - tags
+    - pages
+    - gh-pages
+    - tags
   cache:
     key: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME-$CI_JOB_STAGE-$CI_JOB_NAME"
     paths:
@@ -36,94 +41,93 @@ jdk8:
   script: ./gradlew -i -S --console=plain --no-build-cache assemble codenarcAll license
   artifacts:
     paths:
-    - .gradle/
-    - '*/build/'
+      - .gradle/
+      - '*/build/'
     expire_in: 60min
     when: always
   except:
-  - pages
-  - gh-pages
-  - tags
+    - pages
+    - gh-pages
+    - tags
 
 jdk11:
   stage: build
   image: openjdk:11
   script: ./gradlew -i -S --console=plain --no-build-cache assemble
   artifacts:
     paths:
-    - .gradle/
-    - '*/build/'
+      - .gradle/
+      - '*/build/'
     expire_in: 60min
     when: always
   except:
-  - pages
-  - gh-pages
-  - tags
+    - pages
+    - gh-pages
+    - tags
 
-test:integration:
-  stage: test
-  image: openjdk:8
-  except:
-  - pages
-  - gh-pages
-  - tags
-  dependencies:
-  - testrepo
-  - jdk8
-  script: ./gradlew -i -s --console=plain --no-build-cache test intTest remoteTest
+jdk12:
+  stage: build
+  image: openjdk:12
+  script: ./gradlew -i -S --console=plain --no-build-cache assemble
   artifacts:
     paths:
-    - '*/build/reports'
-    - '*/build/jacoco'
-    expire_in: 10 days
-    when: on_failure
+      - .gradle/
+      - '*/build/'
+    expire_in: 60min
+    when: always
+  except:
+    - pages
+    - gh-pages
+    - tags
 
-test:gradle_4.0.2,4.1,4.2.1:
+test:integration:
   stage: test
-  image: openjdk:8
+  image: $JDK8_TEST_IMAGE
+#  image: openjdk:8
   except:
-  - pages
-  - gh-pages
-  - tags
+    - pages
+    - gh-pages
+    - tags
   dependencies:
-  - testrepo
-  - jdk8
-  script: ./run-compatibility-test-on-ci.sh
+    - testrepo
+    - jdk8
+  script: ./gradlew -i -s --console=plain --no-build-cache test intTest remoteTest -x asciidoctor-gradle-slides-export:intTest -x asciidoctor-gradle-jvm-slides:intTest
   artifacts:
     paths:
       - '*/build/reports'
       - '*/build/jacoco'
     expire_in: 10 days
     when: on_failure
 
-test:gradle_4.3.1,4.4.1,4.5.1:
+test:integration_slides:
   stage: test
-  image: openjdk:8
+  image: $JDK8_TEST_IMAGE
+  #  image: openjdk:8
   except:
-  - pages
-  - gh-pages
-  - tags
+    - pages
+    - gh-pages
+    - tags
   dependencies:
-  - testrepo
-  - jdk8
-  script: ./run-compatibility-test-on-ci.sh
+    - testrepo
+    - jdk8
+  script: ./gradlew -i -s --console=plain --no-build-cache test asciidoctor-gradle-jvm-slides:intTest asciidoctor-gradle-slides-export:intTest
   artifacts:
     paths:
       - '*/build/reports'
       - '*/build/jacoco'
     expire_in: 10 days
     when: on_failure
 
-test:gradle_4.6,4.7,4.8.1:
+test:gradle_4.9,4.10.2:
   stage: test
-  image: openjdk:8
+  image: $JDK11_TEST_IMAGE
   except:
-  - pages
-  - gh-pages
-  - tags
+    - pages
+    - gh-pages
+    - tags
   dependencies:
-  - testrepo
-  - jdk8
+    - testrepo
+    - jdk11
   script: ./run-compatibility-test-on-ci.sh
   artifacts:
     paths:
@@ -132,16 +136,16 @@ test:gradle_4.6,4.7,4.8.1:
     expire_in: 10 days
     when: on_failure
 
-test:gradle_4.9,4.10.2:
+test:gradle_5.0,5.1.1,5.3.1:
   stage: test
-  image: openjdk:11
+  image: $JDK11_TEST_IMAGE
   except:
-  - pages
-  - gh-pages
-  - tags
+    - pages
+    - gh-pages
+    - tags
   dependencies:
-  - testrepo
-  - jdk11
+    - testrepo
+    - jdk11
   script: ./run-compatibility-test-on-ci.sh
   artifacts:
     paths:
@@ -150,16 +154,16 @@ test:gradle_4.9,4.10.2:
     expire_in: 10 days
     when: on_failure
 
-test:gradle_5.0,5.1.1:
+test:gradle_5.4.1,5.5.1,5.6.4:
   stage: test
-  image: openjdk:11
+  image: $JDK12_TEST_IMAGE
   except:
-  - pages
-  - gh-pages
-  - tags
+    - pages
+    - gh-pages
+    - tags
   dependencies:
-  - testrepo
-  - jdk11
+    - testrepo
+    - jdk11
   script: ./run-compatibility-test-on-ci.sh
   artifacts:
     paths:
@@ -168,16 +172,16 @@ test:gradle_5.0,5.1.1:
     expire_in: 10 days
     when: on_failure
 
-test:gradle_5.3:
+test:gradle_6.0.1:
   stage: test
-  image: openjdk:11
+  image: $JDK12_TEST_IMAGE
   except:
-  - pages
-  - gh-pages
-  - tags
+    - pages
+    - gh-pages
+    - tags
   dependencies:
-  - testrepo
-  - jdk11
+    - testrepo
+    - jdk11
   script: ./run-compatibility-test-on-ci.sh
   artifacts:
     paths:

diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,11 @@ cache:
         - $HOME/.gradle
         - .gradle/
         - testfixtures/offline-repo/build/root
+
 matrix:
     include:
         - jdk: openjdk11
+        - os: osx
 
 stages:
     - quality

diff --git a/README.adoc b/README.adoc
@@ -1,7 +1,7 @@
 = Asciidoctor Gradle Plugin
 Andres Almiray <https://github.com/aalmiray[@aalmiray]>
-:version: 2.4.0
-:version-published: 2.4.0
+:version: 3.0.0-alpha.4
+:version-published: 3.0.0-alpha.3
 :asciidoc-url: http://asciidoc.org
 :asciidoctor-url: http://asciidoctor.org
 :issues: https://github.com/asciidoctor/asciidoctor-maven-plugin/issues
@@ -20,7 +20,7 @@ Andres Almiray <https://github.com/aalmiray[@aalmiray]>
 :plugin-name: Asciidoctor Gradle plugin
 :project-name: asciidoctor-gradle-plugin
 :project-full-path: asciidoctor/asciidoctor-gradle-plugin
-:github-branch: development-2.0
+:github-branch: development-3.x
 :linkattrs:
 ifndef::env-github[:icons: font]
 ifdef::env-github,env-browser[]
@@ -40,6 +40,7 @@ image:http://img.shields.io/travis/{project-full-path}/{github-branch}.svg[Build
 image:https://ci.appveyor.com/api/projects/status/db102rphsu5lviv6/branch/{github-branch}?svg=true&passingText={github-branch}%20-%20OK&failingText={github-branch}%20-%20Fails&pendingText={github-branch}%20-%20Pending[Build Status, link=https://ci.appveyor.com/project/{project-full-path}/branch/{github-branch}]
 image:http://img.shields.io/coveralls/{project-full-path}/{github-branch}.svg[Coverage Status, link=https://coveralls.io/r/{project-full-path}]
 image:http://img.shields.io/badge/license-ASF2-blue.svg[Apache License 2, link=http://www.apache.org/licenses/LICENSE-2.0.txt]
+image:https://api.bintray.com/packages/asciidoctor/maven/{project-name}/images/download.svg[Download, link=https://bintray.com/asciidoctor/maven/{project-name}]
 image:https://gitlab.com/asciidoctor/asciidoctor-gradle-plugin/badges/master/pipeline.svg[link="https://gitlab.com/asciidoctor/asciidoctor-gradle-plugin/commits/master",title="pipeline status"]
 endif::[]
 
@@ -48,5 +49,5 @@ The {doctitle} is the official means of using {asciidoctor-url}[Asciidoctor] to
 Documentation:: We are migrating our documentation to the new Asciidoctor Antora-based site when it is ready. In the meantime you can read a snapshot of the new documentation at {asciidoctor-development-docs}{github-branch}
 
 ifdef::env-github[]
-Structure:: `master` now represents the code for the latest 2.x release of these plugins. Development for for 2.x is against the link:https://github.com/asciidoctor/asciidoctor-gradle-plugin/tree/development-2.0[development-2.0] branch. PRs are preferably taking against that branch. The 1.5.x series of the plugin is now in maintenance only mode. PRs for that should be raised against the https://github.com/asciidoctor/asciidoctor-gradle-plugin/tree/maintenance-1.5[maintenance-1.5] branch.
+Structure:: `master` now represents the code for the latest 2.x release of these plugins. Development for for 2.x is against the link:https://github.com/asciidoctor/asciidoctor-gradle-plugin/tree/development-2.0[development-2.0] branch. PRs are preferably taking against that branch. The 1.5.x series of the plugin is now in maintenance only mode. PRs for that should be raised against the https://github.com/asciidoctor/asciidoctor-gradle-plugin/tree/maintenance-1.5[maintenance-1.5] branch. PRs for the next generation work could preferably be raised against link:https://github.com/asciidoctor/asciidoctor-gradle-plugin/tree/development-3.x[development-3.x]
 endif::[]
diff --git a/appveyor.yml b/appveyor.yml
@@ -16,7 +16,7 @@ install:
 build_script:
   - gradlew.bat --console=plain --warning-mode=all -s clean assemble
 test_script:
-  - gradlew.bat --console=plain --warning-mode=all -s check --no-parallel -Djava.net.preferIPv4Stack=true
+  - gradlew.bat --console=plain --warning-mode=all -s check --no-parallel -Djava.net.preferIPv4Stack=true -x gradleTest --scan
 after_test:
   - cd docs && gradlew.bat asciidoctor
   - gradlew.bat --stop