diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 455b5ff9f..7e5e9b453 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,8 @@ on: pull_request: env: - JAVA_VERSION: '23' + JAVA_RELEASE: '23' + JAVA_VERSION: '23.0.1' jobs: verify: @@ -20,7 +21,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 with: website: jdk.java.net - release: ${{ env.JAVA_VERSION }} + release: ${{ env.JAVA_RELEASE }} + version: ${{ env.JAVA_VERSION }} - name: Run Tests (Linux) if: runner.os == 'Linux' diff --git a/.github/workflows/bundles-kit.yml b/.github/workflows/bundles-kit.yml index 16f0cb9b4..d4f7c2704 100644 --- a/.github/workflows/bundles-kit.yml +++ b/.github/workflows/bundles-kit.yml @@ -6,10 +6,14 @@ on: project-version: required: true type: string - java-version: + java-release: default: '23' required: false type: string + java-version: + default: '23.0.1' + required: false + type: string jobs: build: @@ -21,7 +25,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 with: website: jdk.java.net - release: ${{ inputs.java-version }} + release: ${{ inputs.java-release }} + version: ${{ inputs.java-version }} - name: Cache Maven packages uses: actions/cache@v4 diff --git a/.github/workflows/bundles-linux.yml b/.github/workflows/bundles-linux.yml index 2c2779f29..68dfce3ce 100644 --- a/.github/workflows/bundles-linux.yml +++ b/.github/workflows/bundles-linux.yml @@ -9,12 +9,16 @@ on: project-version: required: true type: string - java-version: + java-release: default: '23' required: false type: string + java-version: + default: '23.0.1' + required: false + type: string javafx-version: - default: '23' + default: '23.0.1' required: false type: string test: @@ -35,7 +39,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 with: website: jdk.java.net - release: ${{ inputs.java-version }} + release: ${{ inputs.java-release }} + version: ${{ inputs.java-version }} - name: Setup JavaFX id: javafx diff --git a/.github/workflows/bundles-mac.yml b/.github/workflows/bundles-mac.yml index 61fed6407..cd9cea1cc 100644 --- a/.github/workflows/bundles-mac.yml +++ b/.github/workflows/bundles-mac.yml @@ -9,12 +9,16 @@ on: project-version: required: true type: string - java-version: + java-release: default: '23' required: false type: string + java-version: + default: '23.0.1' + required: false + type: string javafx-version: - default: '23' + default: '23.0.1' required: false type: string test: @@ -44,7 +48,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 with: website: jdk.java.net - release: ${{ inputs.java-version }} + release: ${{ inputs.java-release }} + version: ${{ inputs.java-version }} - uses: Apple-Actions/import-codesign-certs@v1 with: diff --git a/.github/workflows/bundles-mac_aarch64.yml b/.github/workflows/bundles-mac_aarch64.yml index c59950aa1..16d80b6b6 100644 --- a/.github/workflows/bundles-mac_aarch64.yml +++ b/.github/workflows/bundles-mac_aarch64.yml @@ -9,12 +9,16 @@ on: project-version: required: true type: string - java-version: + java-release: default: '23' required: false type: string + java-version: + default: '23.0.1' + required: false + type: string javafx-version: - default: '23' + default: '23.0.1' required: false type: string test: @@ -45,7 +49,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 with: website: jdk.java.net - release: ${{ inputs.java-version }} + release: ${{ inputs.java-release }} + version: ${{ inputs.java-version }} - uses: Apple-Actions/import-codesign-certs@v1 with: diff --git a/.github/workflows/bundles-windows.yml b/.github/workflows/bundles-windows.yml index a4009f006..ede5252e0 100644 --- a/.github/workflows/bundles-windows.yml +++ b/.github/workflows/bundles-windows.yml @@ -9,12 +9,16 @@ on: project-version: required: true type: string - java-version: + java-release: default: '23' required: false type: string + java-version: + default: '23.0.1' + required: false + type: string javafx-version: - default: '23' + default: '23.0.1' required: false type: string test: @@ -39,7 +43,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 with: website: jdk.java.net - release: ${{ inputs.java-version }} + release: ${{ inputs.java-release }} + version: ${{ inputs.java-version }} - name: Setup JavaFX id: javafx diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index ef2bcb60b..5f7a2420d 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -5,16 +5,18 @@ on: branches: [ master ] env: - JAVAFX_VERSION: '23' - JAVA_VERSION: '23' + JAVA_RELEASE: '23' + JAVA_VERSION: '23.0.1' + JAVAFX_VERSION: '23.0.1' jobs: precheck: runs-on: ubuntu-20.04 if: startsWith(github.event.head_commit.message, 'Releasing version') != true outputs: - JAVAFX_VERSION: ${{ env.JAVAFX_VERSION }} + JAVA_RELEASE: ${{ env.JAVA_RELEASE }} JAVA_VERSION: ${{ env.JAVA_VERSION }} + JAVAFX_VERSION: ${{ env.JAVAFX_VERSION }} APP_VERSION: ${{ steps.vars.outputs.APP_VERSION }} PROJECT_VERSION: ${{ steps.vars.outputs.PROJECT_VERSION }} steps: @@ -25,7 +27,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 with: website: jdk.java.net - release: ${{ env.JAVA_VERSION }} + release: ${{ env.JAVA_RELEASE }} + version: ${{ env.JAVA_VERSION }} - name: Cache Maven packages uses: actions/cache@v4 @@ -129,7 +132,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 with: website: jdk.java.net - release: ${{ needs.precheck.outputs.JAVA_VERSION }} + release: ${{ needs.precheck.outputs.JAVA_RELEASE }} + version: ${{ needs.precheck.outputs.JAVA_VERSION }} - name: Cache Maven packages uses: actions/cache@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 49b800eba..36bf7b2d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,15 +11,17 @@ on: - GA env: - JAVAFX_VERSION: '23' - JAVA_VERSION: '23' + JAVA_RELEASE: '23' + JAVA_VERSION: '23.0.1' + JAVAFX_VERSION: '23.0.1' jobs: precheck: runs-on: ubuntu-20.04 outputs: - JAVAFX_VERSION: ${{ env.JAVAFX_VERSION }} + JAVA_RELEASE: ${{ env.JAVA_RELEASE }} JAVA_VERSION: ${{ env.JAVA_VERSION }} + JAVAFX_VERSION: ${{ env.JAVAFX_VERSION }} APP_VERSION: ${{ steps.vars.outputs.APP_VERSION }} PROJECT_VERSION: ${{ steps.vars.outputs.PROJECT_VERSION }} S3_PATH: ${{ steps.vars.outputs.S3_PATH }} @@ -31,7 +33,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 with: website: jdk.java.net - release: ${{ env.JAVA_VERSION }} + release: ${{ env.JAVA_RELEASE }} + version: ${{ env.JAVA_VERSION }} - name: Cache Maven packages uses: actions/cache@v4 @@ -136,7 +139,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 with: website: jdk.java.net - release: ${{ needs.precheck.outputs.JAVA_VERSION }} + release: ${{ needs.precheck.outputs.JAVA_RELEASE }} + version: ${{ needs.precheck.outputs.JAVA_VERSION }} - name: Cache Maven packages uses: actions/cache@v4 diff --git a/pom.xml b/pom.xml index 03fdbfcd9..c36bd29ec 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ ${java.version} ${java.version} ${java.version} - 23 + 23.0.1 1.1.0 6.2.3 4.0.21