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.
Add update github actions to current versions.
  • Loading branch information
wirew0rm committed Sep 26, 2023
1 parent e841751 commit 7591b41
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 28 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, 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
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
10 changes: 6 additions & 4 deletions chartfx-generate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,19 @@
<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>
<scope>provided</scope>
</dependency>
</dependencies>

Expand All @@ -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>
Expand Down Expand Up @@ -75,4 +77,4 @@
</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
26 changes: 13 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>21</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 +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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 7591b41

Please sign in to comment.