Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update gradle and tasks #1086

Merged
merged 6 commits into from Apr 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/continuous-integration.yaml
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/upstream-build.yaml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.adoc
Expand Up @@ -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)

Expand Down
Expand Up @@ -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 & email attributes.
*
* @return authors information
*/
Expand Down
30 changes: 12 additions & 18 deletions asciidoctorj-wildfly-integration-test/build.gradle
Expand Up @@ -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
}


Expand Down Expand Up @@ -110,8 +109,3 @@ test {
dependsOn unpackWildfly
dependsOn configurations.jbossmodule
}


configurations.all {
artifacts.clear()
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion 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