Skip to content

Commit

Permalink
Bump versions and CI
Browse files Browse the repository at this point in the history
Bump the main java version from 11 to 17 and add a 21 build.

Bump javafx to version 16, as starting with 17 the memory leak tests
start to fail. This happens as soon as a plugin is present in the chart
and it seems to be related to the listener on the chart property.

Add update github actions to current versions.
  • Loading branch information
wirew0rm committed Sep 27, 2023
1 parent 64ac97d commit 776a94f
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 29 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ name: Java CI

on: [push, pull_request]
env:
JAVA_REFERENCE_VERSION: 11
JAVA_REFERENCE_VERSION: 17

jobs:
test:
runs-on: ${{ matrix.os }}
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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion chartfx-chart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
19 changes: 14 additions & 5 deletions chartfx-generate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,28 @@
<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>
<plugins>
<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>
Expand All @@ -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>
</project>
2 changes: 1 addition & 1 deletion chartfx-math/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion chartfx-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
27 changes: 14 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,23 @@
<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>
<!-- starting with javafx 17, the chart will not be garbage collected as soon as a plugin is present -->
<chartfx.javafx.version>16</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>

Expand Down Expand Up @@ -115,12 +116,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>
Expand All @@ -144,12 +145,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.0.1</version> <!-- use old version to ignore module system errors -->
<configuration>
<links>
<link>https://openjfx.io/javadoc/12/</link>
Expand Down Expand Up @@ -180,7 +181,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>
Expand Down Expand Up @@ -355,7 +356,7 @@
<dependency>
<groupId>de.sandec</groupId>
<artifactId>JMemoryBuddy</artifactId>
<version>0.2.6</version>
<version>0.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit 776a94f

Please sign in to comment.