REL 1.26 - Merge release to master branch

.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,42 +28,42 @@ jobs:
         run: mvn --batch-mode --update-snapshots -Dmaven.javadoc.skip=true -V -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2 -Dmaven.wagon.http.pool=false verify
       - name: Upload greenfield coverage report
         if: matrix.java-version == 8
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
           name: greenfield-report
           path: greenfield-apps/target/site/jacoco/
       - name: Upload GUI coverage report
         if: matrix.java-version == 8
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
           name: gui-report
           path: gui/target/site/jacoco/
       - name: Upload PDFBox coverage report
         if: matrix.java-version == 8
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
           name: pdfbox-report
           path: pdfbox-apps/target/site/jacoco/
 
   coverage:
     name: Quality Assurance
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [ build ]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Download greenfield coverage report
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v4
         with:
           name: greenfield-report
           path: greenfield-apps/target/site/jacoco/
       - name: Download GUI coverage report
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v4
         with:
           name: gui-report
           path: gui/target/site/jacoco/
       - name: Download PDFBox coverage report
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v4
         with:
           name: pdfbox-report
           path: pdfbox-apps/target/site/jacoco/

.github/workflows/trigger-increment-workflow.yml

@@ -9,7 +9,7 @@ jobs:
   trigger_build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Set up JDK 1.11
@@ -22,8 +22,8 @@ jobs:
           github-token: ${{ secrets.WORKFLOW_TOKEN }}
           script: |
             await github.rest.actions.createWorkflowDispatch({
-             owner: 'veraPDF',
-             repo: 'verapdf-webapp-server',
+             owner: 'duallab',
+             repo: 'pdf4wcag-webapp-server',
              workflow_id: 'version-auto-increment.yml',
-             ref: 'master'
+             ref: 'integration'
             })

.github/workflows/trigger-regression-tests-workflow.yml

@@ -9,7 +9,7 @@ jobs:
   trigger_build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Set up JDK 1.11
@@ -25,5 +25,5 @@ jobs:
              owner: 'veraPDF',
              repo: 'verapdf-integration-tests',
              workflow_id: 'run-pdfa-tests-workflow.yml',
-             ref: 'rel/1.24'
+             ref: 'rel/1.26'
             })

.github/workflows/update-arlington-workflow.yml

@@ -0,0 +1,90 @@
+name: Update arlington branch
+
+on:
+  push:
+    branches:
+      - integration
+
+jobs:
+  checkout-and-build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java-version: [11, 16, 17, 21]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: integration
+      - name: JDK setup
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: 'temurin'
+          cache: maven
+      - name: Fetch arlington branch and checkout
+        run: |
+          git fetch origin arlington:arlington
+          git checkout -b test-branch arlington
+      - name: Configure user name
+        run: |
+          git config user.name "Git User"
+          git config user.email "[email protected]"
+      - name: Add commit to the test branch
+        run: git cherry-pick -m 1 ${{ github.sha }}
+      - name: Build project with Maven
+        if: success()
+        run: mvn --batch-mode --update-snapshots verify
+
+  merge:
+    runs-on: ubuntu-latest
+    needs: checkout-and-build
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: integration
+      - name: Generate new branch name
+        id: new-branch-name
+        run: echo "branch_name=new-branch-$(date +%s)" >> "$GITHUB_OUTPUT"
+      - name: Fetch arlington branch and checkout
+        run: |
+          git fetch origin arlington:arlington
+          git checkout -b ${{ steps.new-branch-name.outputs.branch_name }} arlington
+      - name: Configure user name
+        run: |
+          git config user.name "Git User"
+          git config user.email "[email protected]"
+      - name: Add commit to new branch
+        run: git cherry-pick -m 1 ${{ github.sha }}
+      - name: Merge branch into arlington
+        if: success()
+        run: |
+          git push origin ${{ steps.new-branch-name.outputs.branch_name }}
+          git checkout arlington
+          git merge ${{ steps.new-branch-name.outputs.branch_name }}
+          git push origin arlington
+      - name: Delete new branch
+        run: git push origin --delete ${{ steps.new-branch-name.outputs.branch_name }}
+
+  send-notification:
+    runs-on: ubuntu-latest
+    needs: [checkout-and-build, merge]
+    if: |
+      always() &&
+      (contains(needs.*.result, 'failure') ||
+      contains(needs.*.result, 'skipped') ||
+      contains(needs.*.result, 'cancelled'))
+    steps:
+      - name: Send notification if build or merge failed
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_NOTIFICATIONS_BOT_TOKEN }}
+        uses: voxmedia/github-action-slack-notify-build@v1
+        with:
+          channel_id: C03E3JJGLQL
+          status: FAILED
+          color: danger

README.md

@@ -2,7 +2,7 @@ veraPDF-apps
 ===============
 *Command line and GUI industry supported PDF/A and PDF/UA Validation*
 
-[![Build Status](https://jenkins.openpreservation.org/job/veraPDF/job/1.24/job/apps/badge/icon)](https://jenkins.openpreservation.org/job/veraPDF/job/1.24/job/apps/ "OPF Jenkins")
+[![Build Status](https://jenkins.openpreservation.org/job/veraPDF/job/1.26/job/apps/badge/icon)](https://jenkins.openpreservation.org/job/veraPDF/job/1.26/job/apps/ "OPF Jenkins")
 [![Maven Central](https://img.shields.io/maven-central/v/org.verapdf/verapdf-apps.svg)](https://repo1.maven.org/maven2/org/verapdf/verapdf-apps/ "Maven central")
 [![CodeCov Coverage](https://img.shields.io/codecov/c/github/veraPDF/veraPDF-apps.svg)](https://codecov.io/gh/veraPDF/veraPDF-apps/ "CodeCov coverage")
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/ac55527c6ac04c3ab57c932c85c9be4d)](https://app.codacy.com/gh/veraPDF/veraPDF-apps/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade "Codacy grade")
@@ -28,7 +28,7 @@ Quick Start
 
 ### veraPDF GUI
 #### Download release version
-You can download a Java-based installer for the latest veraPDF GUI release [from our download site](https://software.verapdf.org/rel/verapdf-installer.zip). The current installation process requires Java 8 - 17 to be pre-installed.
+You can download a Java-based installer for the latest veraPDF GUI release [from our download site](https://software.verapdf.org/rel/verapdf-installer.zip). The current installation process requires Java 8 - 21 to be pre-installed.
 
 #### Download latest development version
 If you want to try the latest development version you can obtain it from our [development download site](https://software.verapdf.org/dev/verapdf-installer.zip). Be aware that we release development snapshots regularly, often more than once a day. While we try to ensure that development builds are well tested there are no guarantees.
@@ -37,22 +37,22 @@ If you want to try the latest development version you can obtain it from our [de
 Once downloaded unzip the archive which contains the installer jar with batch and shell scripts to launch, the zip contents are as follows:
 
     verapdf-${project.version}/verapdf-install.bat
-    verapdf-${project.version}/verapdf-install.sh
+    verapdf-${project.version}/verapdf-install
     verapdf-${project.version}/verapdf-izpack-installer-${project.version}.jar
 
 Where `${project.version}` is the last development or release version.
 
-Windows users should run the 'verapdf-install.bat' dos batch file, while Linux and OSX users should run the shell script, `verapdf-install.sh`. It's possible to run the installer directly on any platform:
+Windows users should run the 'verapdf-install.bat' batch file, while Linux and OSX users should run the shell script, `verapdf-install`. It's possible to run the installer directly on any platform:
 
-    java - jar <path-to-installer-jar>/verapdf-izpack-installer-${project.version}.jar
+    java -jar <path-to-installer-jar>/verapdf-izpack-installer-${project.version}.jar
 
 #### Linux full command line download and install
 Linux users can download and execute the veraPDF installer using the following commands:
 
     wget http://downloads.verapdf.org/rel/verapdf-installer.zip
     unzip verapdf-installer.zip
     cd verapdf-<version>
-    ./verapdf-install.sh
+    ./verapdf-install
 
 #### veraPDF GUI manual
 We've prepared a manual for the GUI which is included in the library project and can be [downloaded from GitHub](https://github.com/veraPDF/veraPDF-apps/raw/integration/veraPDFPDFAConformanceCheckerGUI.pdf).
@@ -68,33 +68,35 @@ Building the veraPDF-apps from Source
 
 In order to build this project 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.
 
 ### Building veraPDF
 First you'll need to obtain a version of the veraPDF-apps source code. You can compile either the latest release version or the latest development source.
+
 #### Downloading the latest release source
 Use Git to clone the repository and ensure that the `master` branch is checked out:
-```
-git clone https://github.com/veraPDF/veraPDF-apps
-git checkout master
-```
+
+    git clone https://github.com/veraPDF/veraPDF-apps
+    cd veraPDF-apps
+    git checkout master
+
 or download the latest [tar archive](https://github.com/veraPDF/veraPDF-apps/archive/master.tar.gz "veraPDF-apps latest GitHub tar archive") or [zip archive](https://github.com/veraPDF/veraPDF-apps/archive/master.zip "veraPDF-apps latest GitHub zip archive") from GitHub.
 
 #### Downloading the latest development source
 Use Git to clone the repository and ensure that the `integration` branch is checked out:
 
     git clone https://github.com/veraPDF/veraPDF-apps
+    cd veraPDF-apps
     git checkout integration
 
 or download the latest [tar archive](https://github.com/veraPDF/veraPDF-apps/archive/integration.tar.gz "veraPDF-apps latest GitHub tar archive") or [zip archive](https://github.com/veraPDF/veraPDF-apps/archive/integration.zip "veraPDF-apps latest GitHub zip archive") from GitHub.
 
 #### Use Maven to compile the source
-Move to the downloaded project directory and call Maven install:
+Call Maven install:
 
-    cd veraPDF-apps
     mvn clean install
 
 #### Testing the build

RELEASENOTES.md

@@ -1 +1 @@
-See https://github.com/veraPDF/veraPDF-library/blob/rel/1.24/RELEASENOTES.md
+See https://github.com/veraPDF/veraPDF-library/blob/integration/RELEASENOTES.md

greenfield-apps/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.verapdf</groupId>
     <artifactId>verapdf-apps</artifactId>
-    <version>1.24.0</version>
+    <version>1.26.0</version>
   </parent>
   <groupId>org.verapdf.apps</groupId>
   <artifactId>greenfield-apps</artifactId>

greenfield-apps/src/test/java/org/verapdf/apps/test/MultithreadingTest.java

@@ -32,7 +32,7 @@ public void shouldCreateXmlReportsInGivenDirectory() throws Exception {
 		List<Future<ValidationResult>> futureResult = startValidation(fileToValidate, numberOfThreads);
 		List<ValidationResult> validationResults = getValidationResult(futureResult);
 
-		Boolean isExpectedResults = compareResultsFromDifferentThreads(validationResults);
+		boolean isExpectedResults = compareResultsFromDifferentThreads(validationResults);
 
 		assertTrue(isExpectedResults);
 	}

greenfield-apps/src/test/java/org/verapdf/pdfa/validation/validators/test/CallableValidatorForTest.java

@@ -10,7 +10,7 @@
 import java.util.concurrent.Callable;
 
 public class CallableValidatorForTest implements Callable<ValidationResult> {
-	private File fileToValidate;
+	private final File fileToValidate;
 
 	public CallableValidatorForTest(File fileToValidate) {
 		this.fileToValidate = fileToValidate;

gui/pom.xml

@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.verapdf</groupId>
     <artifactId>verapdf-apps</artifactId>
-    <version>1.24.0</version>
+    <version>1.26.0</version>
   </parent>
 
   <groupId>org.verapdf.apps</groupId>

gui/src/main/java/org/verapdf/apps/Applications.java

@@ -202,9 +202,6 @@ private static boolean areDirectoryFilesWritable(File directory) {
 		if (files == null) {
 			return Files.isWritable(directory.toPath());
 		}
-		if (files.length == 0) {
-			return true;
-		}
 		for (String fileName : files) {
 			if (!Files.isWritable(new File(directory + File.separator + fileName).toPath())) {
 				return false;