diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38bfd22b..ae1673f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,8 +20,9 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: 8 - name: Cache Gradle uses: actions/cache@v2 @@ -46,8 +47,9 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: 8 - name: Cache Gradle uses: actions/cache@v2 @@ -77,8 +79,9 @@ 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: + 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 35c28930..543f915c 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -23,8 +23,9 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: ${{ matrix.java }} - name: Cache Gradle uses: actions/cache@v2 @@ -60,8 +61,9 @@ 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: + 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 ca994b08..eea5e7f6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,8 +16,9 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: 8 - name: Cache Gradle uses: actions/cache@v2 @@ -42,8 +43,9 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: 8 - name: Cache Gradle uses: actions/cache@v2 diff --git a/build.gradle b/build.gradle index 8b583a3c..54d7a1eb 100644 --- a/build.gradle +++ b/build.gradle @@ -203,16 +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') ?: '' - } } -task build { - dependsOn subprojects.findResults { it.tasks.findByName('assemble') } - dependsOn subprojects.findResults { it.tasks.findByName('check') } +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') ?: '' } wrapper { 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