From 144ebacf5ae01a29bc9ca6ce4398837ef955e4d2 Mon Sep 17 00:00:00 2001
From: Vadim <69987865+ProxyNexus@users.noreply.github.com>
Date: Fri, 23 Feb 2024 17:36:17 +0300
Subject: [PATCH] Workflow update (#1403)
* Workflow update
- Updated action dependencies
- Added 21 java version support
- Jobs don't fail on error
- Updated build dependencies for tests (Java 21 support)
* Removed .travis.yml
* Updater arlington/jakarta workflow
---
.github/workflows/test-pr.yml | 17 +++++-----
.../workflows/update-arlington-workflow.yml | 11 ++++---
.github/workflows/update-jakarta-workflow.yml | 11 ++++---
.travis.yml | 24 --------------
README.md | 2 +-
pom.xml | 31 ++++++++++++++++++-
6 files changed, 55 insertions(+), 41 deletions(-)
delete mode 100644 .travis.yml
diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
index e33d4bd91..dc00f92e9 100644
--- a/.github/workflows/test-pr.yml
+++ b/.github/workflows/test-pr.yml
@@ -7,16 +7,19 @@ on:
jobs:
build:
name: Checkout and Build
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
+
+ continue-on-error: true
strategy:
+ fail-fast: false
matrix:
- java-version: [8, 11, 16, 17]
+ java-version: [8, 11, 16, 17, 21]
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
- name: JDK setup
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: 'temurin'
@@ -25,18 +28,18 @@ jobs:
run: mvn --batch-mode --update-snapshots verify
- name: Upload coverage report
if: matrix.java-version == 8
- uses: actions/upload-artifact@master
+ uses: actions/upload-artifact@v4
with:
name: coverage-report
path: core/target/site/jacoco/
coverage:
name: Quality Assurance
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
needs: [ build ]
steps:
- name: Download coverage report
- uses: actions/download-artifact@master
+ uses: actions/download-artifact@v4
with:
name: coverage-report
path: core/target/site/jacoco/
diff --git a/.github/workflows/update-arlington-workflow.yml b/.github/workflows/update-arlington-workflow.yml
index cced8b59c..d75b3fb50 100644
--- a/.github/workflows/update-arlington-workflow.yml
+++ b/.github/workflows/update-arlington-workflow.yml
@@ -23,18 +23,21 @@ jobs:
checkout-and-build:
runs-on: ubuntu-latest
+ continue-on-error: true
+
strategy:
+ fail-fast: false
matrix:
- java-version: [11, 16, 17]
+ java-version: [11, 16, 17, 21]
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
fetch-depth: 0
ref: integration
- name: JDK setup
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: 'temurin'
@@ -58,7 +61,7 @@ jobs:
needs: checkout-and-build
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
fetch-depth: 0
ref: integration
diff --git a/.github/workflows/update-jakarta-workflow.yml b/.github/workflows/update-jakarta-workflow.yml
index fb87747d9..8e05273d9 100644
--- a/.github/workflows/update-jakarta-workflow.yml
+++ b/.github/workflows/update-jakarta-workflow.yml
@@ -9,18 +9,21 @@ jobs:
checkout-and-build:
runs-on: ubuntu-latest
+ continue-on-error: true
+
strategy:
+ fail-fast: false
matrix:
- java-version: [11, 16, 17]
+ java-version: [11, 16, 17, 21]
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
fetch-depth: 0
ref: integration
- name: JDK setup
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: 'temurin'
@@ -44,7 +47,7 @@ jobs:
needs: checkout-and-build
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
fetch-depth: 0
ref: integration
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b999ae8a2..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-language: java
-sudo: required
-dist: bionic
-
-jdk:
- - openjdk8
- - openjdk11
-
-branches:
- except:
- - /^v|d\d+\.\d+\.\d+$/
- - /^jenkins-veraPDF-library-v|d\\d+\\.\\d+\\.\\d+$/
-
-notifications:
- slack:
- secure: WgsTp3dk8wNWNJkESk1Hg317W1gNtksHPf8XFv2dzLN6ncv718CNwBg/wcFglLVSQk0AViOtpwdWtf1RO67TlvQV2WZHW2E7NLnJjozTCbXpeheywApou24QbW+i+CJaGVwsP1kFRw0hom3EjhF6o0g+tWJE0W4wVy5yX5u7+GYTfMKkRTRVf42AI/vvD6130AmGRQ8eMWGTyw2NU35q6Q6UGRSqpwx+w5dNWW+SXuL9eI5ZedHRu/mEteh7/jMylxM7W14BkZysXO0TmnfklpshjbOsicdIhdhIQ4SffBPSXdkGoE0XCLtLsEi4b+zTKlRTH/4qzJEiXdO7SwFzFt7uGXPx6gLIpnCGoSciikVMpr06ujz2vukR+tFmwLK6W6+R5PpgNVlfeP4WNHfZHGNbr6alp3loYZEA33BjbTOXKFtv68pPuIQ8LCinPL/J8EGyeIVh8xrxgdiswvO51CxpsuY/G6gm9BxcKbZE14GaZjrOhyPMBylZaBdzbOFkzbrgE7O8tYVt/asItUFQGysfBEQZLvb3eBeMK0p6SVmn0YZ5mqh6o5REr68cy4pK2jwcGQegj5vU61TjCIism+tRGxIanTRkUUfOpobpVa3k2saMTglY7/tnuqQsxYKl6eEg2cPeftr/b+M4o2nOtTBJYik93mTKJo9PmhCGZJ4=
-
-before_install:
- - sudo apt-get install jq
- - wget -O ~/codacy-coverage-reporter-assembly-latest.jar http://resources.openpreservation.org/codacy-coverage-reporter-assembly-latest.jar
-
-after_success:
- - bash <(curl -s https://codecov.io/bash)
- - java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l Java -r target/site/jacoco/jacoco.xml
diff --git a/README.md b/README.md
index 341fc8e71..817226ca0 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Quick Start
In order to build the library you'll need:
- * Java 8 - 17, which can be downloaded [from Oracle](https://www.oracle.com/technetwork/java/javase/downloads/index.html), or for Linux users [OpenJDK](https://openjdk.java.net/install/index.html).
+ * Java 8 - 21, which can be downloaded [from Oracle](https://www.oracle.com/technetwork/java/javase/downloads/index.html), or for Linux users [OpenJDK](https://openjdk.java.net/install/index.html).
* [Maven v3+](https://maven.apache.org/)
Life will be easier if you also use [Git](https://git-scm.com/) to obtain and manage the source.
diff --git a/pom.xml b/pom.xml
index 763b3acaf..4feb31f32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,21 +82,25 @@
org.apache.maven.plugins
maven-compiler-plugin
+ 3.12.1
org.jacoco
jacoco-maven-plugin
+ 0.8.11
org.apache.maven.plugins
maven-surefire-plugin
+ 3.2.5
org.codehaus.mojo
versions-maven-plugin
+ 2.16.2
@@ -104,6 +108,19 @@
+
+ org.junit
+ junit-bom
+ 5.10.2
+ pom
+ import
+
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
junit
@@ -112,10 +129,22 @@
test
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
+
+
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
+
nl.jqno.equalsverifier
equalsverifier
- 3.7.1
+ 3.15.6
test