From 9b17d61d168321e91d17e324bdc1b3ac5c643e15 Mon Sep 17 00:00:00 2001 From: gfertuso Date: Tue, 19 Sep 2023 14:44:05 +0100 Subject: [PATCH 1/2] AAE-16642 Update java version used in maven-release --- .github/actions/maven-release/action.yml | 4 ++-- version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/maven-release/action.yml b/.github/actions/maven-release/action.yml index 3fb5141a7..f99ac9e5c 100644 --- a/.github/actions/maven-release/action.yml +++ b/.github/actions/maven-release/action.yml @@ -73,12 +73,12 @@ runs: tag: ${{ env.RELEASE_VERSION }} repository-directory: ${{ env.REPO_DIR }} - - name: Set up JDK 11 + - name: Set up JDK 17 if: steps.check-tag.outputs.exists == 'false' uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 17 cache: 'maven' - name: Configure Maven settings diff --git a/version.txt b/version.txt index b299be978..15ee400bd 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v3.3.0 +v3.3.1 From ae5dd0dde16417ed6c0749eb84606cad7daa2553 Mon Sep 17 00:00:00 2001 From: gfertuso Date: Tue, 19 Sep 2023 15:43:42 +0100 Subject: [PATCH 2/2] Use input variables --- .github/actions/maven-release/action.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/actions/maven-release/action.yml b/.github/actions/maven-release/action.yml index f99ac9e5c..ac5850d5c 100644 --- a/.github/actions/maven-release/action.yml +++ b/.github/actions/maven-release/action.yml @@ -46,6 +46,14 @@ inputs: description: "Path to the settings.xml file to be used for the release" required: false default: ${{ github.workspace }}/maven-config/settings.xml + java-version: + description: the desired Java version + required: false + default: "11" + java-distribution: + description: the desired Java distribution + required: false + default: "temurin" runs: using: composite @@ -73,12 +81,12 @@ runs: tag: ${{ env.RELEASE_VERSION }} repository-directory: ${{ env.REPO_DIR }} - - name: Set up JDK 17 + - name: Set up JDK if: steps.check-tag.outputs.exists == 'false' uses: actions/setup-java@v3 with: - distribution: temurin - java-version: 17 + java-version: ${{ inputs.java-version }} + distribution: ${{ inputs.java-distribution }} cache: 'maven' - name: Configure Maven settings