From ee109d98a39f32d6864bebe27fbbb9244b7d9837 Mon Sep 17 00:00:00 2001
From: Alexander Krimm <A.Krimm@gsi.de>
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       | 19 ++++++++++++++-----
 chartfx-math/pom.xml           |  2 +-
 chartfx-samples/pom.xml        |  2 +-
 pom.xml                        | 26 +++++++++++++-------------
 7 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d55132434..620d4752f 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, 20]
       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 @@
         <dependency>
             <groupId>org.testfx</groupId>
             <artifactId>testfx-junit5</artifactId>
-            <version>4.0.16-alpha</version>
+            <version>4.0.17</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/chartfx-generate/pom.xml b/chartfx-generate/pom.xml
index 3e219a20e..19c45bdcf 100644
--- a/chartfx-generate/pom.xml
+++ b/chartfx-generate/pom.xml
@@ -27,18 +27,20 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.6.3</version>
+            <version>3.9.4</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.6.0</version>
+            <version>3.9.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-project</artifactId>
             <version>2.2.1</version>
-        </dependency>
+            <scope>provided</scope>
+         </dependency>
     </dependencies>
 
     <build>
@@ -46,7 +48,7 @@
             <plugin> <!-- move descriptor goal from process-classes to compile phase so that `mvn clean compile` works -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.9.0</version>
                 <executions>
                     <execution>
                         <id>earlierPluginXML</id>
@@ -73,6 +75,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin> <!-- attaching the javadoc fails the build because maven-project introduces a dependency with an invalid module descriptor -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
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 @@
         <dependency>
             <groupId>net.jafama</groupId>
             <artifactId>jafama</artifactId>
-            <version>2.3.1</version>
+            <version>2.3.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
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 @@
         <dependency>
             <groupId>net.jafama</groupId>
             <artifactId>jafama</artifactId>
-            <version>2.3.1</version>
+            <version>2.3.2</version>
         </dependency>
         <dependency> <!-- Hierarchy debugging -->
             <groupId>net.raumzeitfalle.fx</groupId>
diff --git a/pom.xml b/pom.xml
index 8e4b96809..2692f1c1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,22 +35,22 @@
         <sha1 />
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.moduleName>io.fair_acc.chartfx_parent</project.moduleName>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
 
-        <chartfx.javafx.version>13.0.1</chartfx.javafx.version>
+        <chartfx.javafx.version>17</chartfx.javafx.version>
         <chartfx.controlsfx.version>11.1.2</chartfx.controlsfx.version>
         <chartfx.ikonli.version>12.3.1</chartfx.ikonli.version>
         <chartfx.javafxsvg.version>1.3.0</chartfx.javafxsvg.version>
-        <version.commons-lang3>3.12.0</version.commons-lang3>
+        <version.commons-lang3>3.13.0</version.commons-lang3>
 
-        <chartfx.slf4j.version>2.0.6</chartfx.slf4j.version>
-        <chartfx.junit.jupiter.version>5.9.2</chartfx.junit.jupiter.version>
+        <chartfx.slf4j.version>2.0.9</chartfx.slf4j.version>
+        <chartfx.junit.jupiter.version>5.10.0</chartfx.junit.jupiter.version>
         <chartfx.awaitility.version>4.2.0</chartfx.awaitility.version>
         <chartfx.jacoco.version>0.8.8</chartfx.jacoco.version>
         <chartfx.surefire.version>3.0.0-M9</chartfx.surefire.version>
 
-        <version.jetbrains.annotations>21.0.1</version.jetbrains.annotations>
+        <version.jetbrains.annotations>24.0.1</version.jetbrains.annotations>
         <version.maven-gpg-plugin>3.0.1</version.maven-gpg-plugin>
     </properties>
 
@@ -115,12 +115,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.3.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.11.0</version>
                     <configuration>
                         <!-- put your configurations here -->
                     </configuration>
@@ -144,12 +144,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.6.0</version>
                     <configuration>
                         <links>
                             <link>https://openjfx.io/javadoc/12/</link>
@@ -180,7 +180,7 @@
                 <plugin> <!-- Use current plugin version because of MNG-5346-->
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>
-                    <version>3.6.0</version>
+                    <version>3.9.0</version>
                 </plugin>
                 <plugin>
                     <groupId>io.fair-acc</groupId>
@@ -355,7 +355,7 @@
         <dependency>
             <groupId>de.sandec</groupId>
             <artifactId>JMemoryBuddy</artifactId>
-            <version>0.2.6</version>
+            <version>0.5.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>