From 2607faa7e7d26fa870e09c7a643692bdede236dc Mon Sep 17 00:00:00 2001 From: Puneet Behl Date: Fri, 31 Mar 2023 16:23:38 +0530 Subject: [PATCH 1/5] Update Minimum Java Compatibility to 11 --- .github/workflows/gradle.yml | 2 +- .github/workflows/release.yml | 2 +- build.gradle | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 273e4777..1c466caa 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: ['8', '11', '14'] + java: ['11', '14'] env: WORKSPACE: ${{ github.workspace }} GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0fcba26a..00645c65 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: ['8'] + java: ['11'] env: GIT_USER_NAME: puneetbehl GIT_USER_EMAIL: behlp@objectcomputing.com diff --git a/build.gradle b/build.gradle index 25d99313..64a97752 100644 --- a/build.gradle +++ b/build.gradle @@ -59,8 +59,8 @@ subprojects { project -> apply from: "${commonBuild}/common-project.gradle" } - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 1.11 + targetCompatibility = 1.11 } configurations.all { From 8678eae1c9346b75fa2f82d4d44b168b90e593b4 Mon Sep 17 00:00:00 2001 From: Puneet Behl Date: Fri, 31 Mar 2023 16:25:09 +0530 Subject: [PATCH 2/5] Update Workflows Trigger --- .github/workflows/gradle.yml | 4 ++-- .github/workflows/release-notes.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1c466caa..0167ef57 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -2,12 +2,12 @@ name: Java CI on: push: branches: - - master - '[2-9]+.[1-9]+.x' + - '[3-9]+.[0-9]+.x' pull_request: branches: - - master - '[2-9]+.[1-9]+.x' + - '[3-9]+.[0-9]+.x' jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index e9611b2e..a913f1bc 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -6,6 +6,7 @@ on: branches: - master - '[2-9]+.[1-9]+.x' + - '[3-9]+.[0-9]+.x' workflow_dispatch: jobs: release_notes: From e06fc52f0c6c35939bca4b896cc0e6404c9f3dfe Mon Sep 17 00:00:00 2001 From: Puneet Behl Date: Fri, 31 Mar 2023 16:26:59 +0530 Subject: [PATCH 3/5] Update gradle.yml --- .github/workflows/gradle.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 0167ef57..34aeec70 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -31,6 +31,7 @@ jobs: with: arguments: check env: + GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} - name: Run Build @@ -58,12 +59,20 @@ jobs: ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} with: arguments: -Dorg.gradle.internal.publish.checksums.insecure=true publish + env: + GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} + GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} + GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} - name: Generate Docs id: docs if: steps.publish.outcome == 'success' && github.event_name == 'push' && matrix.java == '8' uses: gradle/gradle-build-action@v2 with: arguments: docs + env: + GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} + GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} + GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} - name: Publish to Github Pages if: steps.docs.outcome == 'success' && github.event_name == 'push' && matrix.java == '8' uses: micronaut-projects/github-pages-deploy-action@master From d6e03c96245d53784fd285ffc6f193ff9350828a Mon Sep 17 00:00:00 2001 From: Puneet Behl Date: Fri, 31 Mar 2023 16:27:44 +0530 Subject: [PATCH 4/5] Update release.yml Enable Gradle Caching for Release Workflow --- .github/workflows/release.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 00645c65..78c79cc7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,6 +37,9 @@ jobs: id: publish uses: gradle/gradle-build-action@v2 env: + GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} + GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} + GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} @@ -51,6 +54,10 @@ jobs: uses: gradle/gradle-build-action@v2 with: arguments: docs + env: + GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} + GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} + GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} - name: Export Gradle Properties uses: micronaut-projects/github-actions/export-gradle-properties@master - name: Publish to Github Pages From b5e7dbe01b3959780e094ed1debc891a3cc7b38a Mon Sep 17 00:00:00 2001 From: Puneet Behl Date: Fri, 31 Mar 2023 16:31:28 +0530 Subject: [PATCH 5/5] Update gradle.yml --- .github/workflows/gradle.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 34aeec70..0aaaa1b6 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -54,12 +54,11 @@ jobs: id: publish if: steps.build.outcome == 'success' && github.event_name == 'push' && matrix.java == '8' uses: gradle/gradle-build-action@v2 - env: - ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} - ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} with: arguments: -Dorg.gradle.internal.publish.checksums.insecure=true publish env: + ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}