Merge pull request #1086 from robertpanzer/update-gradle-and-tasks

Update gradle and tasks
asciidoctor · Apr 9, 2022 · b82344f · b82344f
2 parents 3ffbdc4 + 675e7ec
commit b82344f
Show file tree

Hide file tree

Showing 8 changed files with 176 additions and 133 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -25,10 +25,10 @@ jobs:
           - macos-latest
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 1
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: ${{ matrix.java }}
@@ -48,10 +48,10 @@ jobs:
           - '11'
           - '17'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 1
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: ${{ matrix.java }}

diff --git a/.github/workflows/upstream-build.yaml b/.github/workflows/upstream-build.yaml
@@ -6,11 +6,11 @@ jobs:
     name: ${{ github.event.client_payload.message }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: '8'
+          distribution: 'temurin'
+          java-version: '11'
       - name: Build
         run: |
           unset GEM_PATH GEM_HOME JRUBY_OPTS

diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -23,7 +23,7 @@ Bug Fixes::
 
 Build Improvement::
 
-* Upgrade to gradle 7.4.1 (#1085)
+* Upgrade to gradle 7.4.2 (#1086)
 * Upgrade to Wildfly 26.0.1 for integration test (#1085)
 * Upgrade to Spring Boot 2.6.5 for integration test (#1085)
 

diff --git a/asciidoctorj-api/src/main/java/org/asciidoctor/ast/Document.java b/asciidoctorj-api/src/main/java/org/asciidoctor/ast/Document.java
@@ -27,7 +27,7 @@ public interface Document extends StructuralNode {
 
     /**
      * Gets the author(s) information as defined in the author line
-     * in the document header, or in author & email attributes.
+     * in the document header, or in author &amp; email attributes.
      *
      * @return authors information
      */

diff --git a/asciidoctorj-wildfly-integration-test/build.gradle b/asciidoctorj-wildfly-integration-test/build.gradle
@@ -57,21 +57,20 @@ sourcesJar {
     dependsOn unpackWildfly
 }
 
-tasks.create("createModule").doLast {
-    copy {
-        from "src/test/resources/module.xml"
-        into "build/modules/org/asciidoctor/asciidoctorj/main"
-        filter {
-            it
-                    .replaceAll('@@version@@', project(':asciidoctorj').version)
-                    .replaceAll('@@jrubyVersion@@', jrubyVersion)
-        }
+task createModuleDescriptor(type: Copy) {
+    from "src/test/resources/module.xml"
+    into "build/modules/org/asciidoctor/asciidoctorj/main"
+    filter {
+        it
+                .replaceAll('@@version@@', project(':asciidoctorj').version)
+                .replaceAll('@@jrubyVersion@@', jrubyVersion)
     }
+}
 
-    copy {
-        from configurations.jbossmodule
-        into "build/modules/org/asciidoctor/asciidoctorj/main"
-    }
+task createModule(type: Copy) {
+    from configurations.jbossmodule
+    into "build/modules/org/asciidoctor/asciidoctorj/main"
+    dependsOn createModuleDescriptor
 }
 
 
@@ -110,8 +109,3 @@ test {
     dependsOn unpackWildfly
     dependsOn configurations.jbossmodule
 }
-
-
-configurations.all {
-    artifacts.clear()
-}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists