From 96f5f5302c9cf1ce09bf1bfd546f39b9b5ee7a9c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 29 Apr 2021 06:36:10 +0000 Subject: [PATCH 1/5] chore(deps): update actions/setup-java action to v2 --- .github/workflows/ci.yml | 6 +++--- .github/workflows/pull-request.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38bfd22b..0b8fb2d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 8 - name: Cache Gradle @@ -46,7 +46,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 8 - name: Cache Gradle @@ -77,7 +77,7 @@ jobs: with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 11 - name: Cache SonarCloud packages diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 35c28930..8d7369d1 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -23,7 +23,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: ${{ matrix.java }} - name: Cache Gradle @@ -60,7 +60,7 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK 11 if: env.SONAR_TOKEN != null - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 11 - name: Cache SonarCloud packages diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ca994b08..a610b164 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 8 - name: Cache Gradle @@ -42,7 +42,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 8 - name: Cache Gradle From 49b658568ff99a4ce20bca7033b7fbd6b28a1aee Mon Sep 17 00:00:00 2001 From: oliemansm Date: Thu, 29 Apr 2021 08:47:57 +0200 Subject: [PATCH 2/5] ci: fix nexus staging close and release configuration --- build.gradle | 8 ++++---- github-build.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 8b583a3c..2f30daba 100644 --- a/build.gradle +++ b/build.gradle @@ -203,11 +203,11 @@ subprojects { } } } +} - nexusStaging { - username = System.env.OSS_USER_TOKEN_KEY ?: project.findProperty('OSS_USER_TOKEN_KEY') ?: '' - password = System.env.OSS_USER_TOKEN_PASS ?: project.findProperty('OSS_USER_TOKEN_PASS') ?: '' - } +nexusStaging { + username = System.env.OSS_USER_TOKEN_KEY ?: project.findProperty('OSS_USER_TOKEN_KEY') ?: '' + password = System.env.OSS_USER_TOKEN_PASS ?: project.findProperty('OSS_USER_TOKEN_PASS') ?: '' } task build { diff --git a/github-build.sh b/github-build.sh index ce562ab7..cfec06b2 100644 --- a/github-build.sh +++ b/github-build.sh @@ -42,7 +42,7 @@ commitNextVersion() { git config --global user.email "actions@github.com" git config --global user.name "GitHub Actions" -echo "Deploying release to Sonatype" +echo "Deploying release to Maven Central" removeSnapshots ./gradlew clean build publish closeAndReleaseRepository From 75426da349996cf89c2d2bbefe9f7b17e8743b53 Mon Sep 17 00:00:00 2001 From: oliemansm Date: Thu, 29 Apr 2021 08:53:57 +0200 Subject: [PATCH 3/5] ci: remove unnecessary build task configuration --- build.gradle | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build.gradle b/build.gradle index 2f30daba..54d7a1eb 100644 --- a/build.gradle +++ b/build.gradle @@ -210,11 +210,6 @@ nexusStaging { password = System.env.OSS_USER_TOKEN_PASS ?: project.findProperty('OSS_USER_TOKEN_PASS') ?: '' } -task build { - dependsOn subprojects.findResults { it.tasks.findByName('assemble') } - dependsOn subprojects.findResults { it.tasks.findByName('check') } -} - wrapper { distributionType = Wrapper.DistributionType.ALL } From 5a3e1193572b9963dc31fe17a2bad9ff64a8b930 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 29 Apr 2021 06:36:10 +0000 Subject: [PATCH 4/5] chore(deps): update actions/setup-java action to v2 --- .github/workflows/ci.yml | 6 +++--- .github/workflows/pull-request.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38bfd22b..0b8fb2d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 8 - name: Cache Gradle @@ -46,7 +46,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 8 - name: Cache Gradle @@ -77,7 +77,7 @@ jobs: with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 11 - name: Cache SonarCloud packages diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 35c28930..8d7369d1 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -23,7 +23,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: ${{ matrix.java }} - name: Cache Gradle @@ -60,7 +60,7 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK 11 if: env.SONAR_TOKEN != null - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 11 - name: Cache SonarCloud packages diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ca994b08..a610b164 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 8 - name: Cache Gradle @@ -42,7 +42,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 8 - name: Cache Gradle From d1bfa2c84dbfdeee45f2981c4c0e819bf9ec574c Mon Sep 17 00:00:00 2001 From: oliemansm Date: Thu, 29 Apr 2021 10:19:49 +0200 Subject: [PATCH 5/5] ci(deps): define java distribution --- .github/workflows/ci.yml | 3 +++ .github/workflows/pull-request.yml | 2 ++ .github/workflows/release.yml | 2 ++ 3 files changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b8fb2d4..ae1673f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: 8 - name: Cache Gradle uses: actions/cache@v2 @@ -48,6 +49,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: 8 - name: Cache Gradle uses: actions/cache@v2 @@ -79,6 +81,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: 11 - name: Cache SonarCloud packages uses: actions/cache@v2 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 8d7369d1..543f915c 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -25,6 +25,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: ${{ matrix.java }} - name: Cache Gradle uses: actions/cache@v2 @@ -62,6 +63,7 @@ jobs: if: env.SONAR_TOKEN != null uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: 11 - name: Cache SonarCloud packages if: env.SONAR_TOKEN != null diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a610b164..eea5e7f6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,6 +18,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: 8 - name: Cache Gradle uses: actions/cache@v2 @@ -44,6 +45,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: 8 - name: Cache Gradle uses: actions/cache@v2