From 7591b41421dfffd9cfd2bf7d670fff6a08cd9d57 Mon Sep 17 00:00:00 2001 From: Alexander Krimm Date: Tue, 26 Sep 2023 14:29:54 +0200 Subject: [PATCH] Bump versions and CI bump the main java version from 11 to 17 and add a 21 build. Add update github actions to current versions. --- .github/workflows/ci.yml | 6 +++--- .github/workflows/coverity.yml | 10 +++++----- chartfx-chart/pom.xml | 2 +- chartfx-generate/pom.xml | 10 ++++++---- chartfx-math/pom.xml | 2 +- chartfx-samples/pom.xml | 2 +- pom.xml | 26 +++++++++++++------------- 7 files changed, 30 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d55132434..c8bea2612 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: Java CI on: [push, pull_request] env: - JAVA_REFERENCE_VERSION: 11 + JAVA_REFERENCE_VERSION: 17 jobs: test: @@ -11,13 +11,13 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - java: [11, 17, 19] + java: [17, 21] fail-fast: false max-parallel: 4 name: Test JDK ${{ matrix.java }}, ${{ matrix.os }} environment: coverage # open environment, no critical secrets steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 25 - name: Set version environment for version string diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index a5c27eac7..026b44a01 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -19,12 +19,12 @@ jobs: environment: coverity # environment needs to be manually triggered only use on demand steps: - name: Checkout branch on that the Coverity scan was dispatched - uses: actions/checkout@v2 + uses: actions/checkout@v3 if: ${{ github.event_name == 'workflow_run' }} with: ref: ${{ github.event.workflow_run.head_branch }} fetch-depth: 25 - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 if: ${{ github.event_name != 'workflow_run' }} with: fetch-depth: 25 @@ -41,15 +41,15 @@ jobs: echo "setting env:" cat ${GITHUB_ENV} - name: Cache the Maven packages to speed up build - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Set up JDK11 - uses: actions/setup-java@v2.1.0 + uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'adopt' - name: Download Coverity Build Tool run: | diff --git a/chartfx-chart/pom.xml b/chartfx-chart/pom.xml index e8efb26c4..8182e117f 100644 --- a/chartfx-chart/pom.xml +++ b/chartfx-chart/pom.xml @@ -52,7 +52,7 @@ org.testfx testfx-junit5 - 4.0.16-alpha + 4.0.17 test diff --git a/chartfx-generate/pom.xml b/chartfx-generate/pom.xml index 3e219a20e..02bf1d975 100644 --- a/chartfx-generate/pom.xml +++ b/chartfx-generate/pom.xml @@ -27,17 +27,19 @@ org.apache.maven maven-plugin-api - 3.6.3 + 3.9.4 + provided org.apache.maven.plugin-tools maven-plugin-annotations - 3.6.0 + 3.9.0 org.apache.maven maven-project 2.2.1 + provided @@ -46,7 +48,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.6.0 + 3.9.0 earlierPluginXML @@ -75,4 +77,4 @@ - \ No newline at end of file + diff --git a/chartfx-math/pom.xml b/chartfx-math/pom.xml index 1814e6dcf..5eb3c48db 100644 --- a/chartfx-math/pom.xml +++ b/chartfx-math/pom.xml @@ -39,7 +39,7 @@ net.jafama jafama - 2.3.1 + 2.3.2 test diff --git a/chartfx-samples/pom.xml b/chartfx-samples/pom.xml index f8814f09d..142c2dfb2 100644 --- a/chartfx-samples/pom.xml +++ b/chartfx-samples/pom.xml @@ -47,7 +47,7 @@ net.jafama jafama - 2.3.1 + 2.3.2 net.raumzeitfalle.fx diff --git a/pom.xml b/pom.xml index 8e4b96809..d3958e0d2 100644 --- a/pom.xml +++ b/pom.xml @@ -35,22 +35,22 @@ UTF-8 io.fair_acc.chartfx_parent - 11 - 11 + 17 + 17 - 13.0.1 + 21 11.1.2 12.3.1 1.3.0 - 3.12.0 + 3.13.0 - 2.0.6 - 5.9.2 + 2.0.9 + 5.10.0 4.2.0 0.8.8 3.0.0-M9 - 21.0.1 + 24.0.1 3.0.1 @@ -115,12 +115,12 @@ org.apache.maven.plugins maven-clean-plugin - 3.1.0 + 3.3.1 org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 @@ -144,12 +144,12 @@ org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.3.0 org.apache.maven.plugins maven-javadoc-plugin - 3.0.1 + 3.6.0 https://openjfx.io/javadoc/12/ @@ -180,7 +180,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.6.0 + 3.9.0 io.fair-acc @@ -355,7 +355,7 @@ de.sandec JMemoryBuddy - 0.2.6 + 0.5.2 test