From 5b9affb79c5f1290def02e72eb10032991000350 Mon Sep 17 00:00:00 2001 From: Sam Alloing Date: Fri, 24 May 2024 15:39:07 +0200 Subject: [PATCH 1/6] fixes #924 This commit fixes a bug where I forgot to set the invalid flag after an newly added Exception. --- .../main/java/edu/harvard/hul/ois/jhove/module/PdfModule.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jhove-modules/pdf-hul/src/main/java/edu/harvard/hul/ois/jhove/module/PdfModule.java b/jhove-modules/pdf-hul/src/main/java/edu/harvard/hul/ois/jhove/module/PdfModule.java index 0b861987d..7d3442007 100644 --- a/jhove-modules/pdf-hul/src/main/java/edu/harvard/hul/ois/jhove/module/PdfModule.java +++ b/jhove-modules/pdf-hul/src/main/java/edu/harvard/hul/ois/jhove/module/PdfModule.java @@ -3502,6 +3502,7 @@ protected void addDestination(PdfObject itemObj, String propName, JhoveMessages.getMessageInstance( e.getJhoveMessage().getId(), e.getJhoveMessage().getMessage(), e.getJhoveMessage().getSubMessage()))); + info.setValid(false); } } catch (Exception e) { From dd0b8d4d077153f71a9fff089731bfab55fc6c2c Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Fri, 26 Jul 2024 12:18:00 +0100 Subject: [PATCH 2/6] FIX: Update the GH Actions upload task --- .github/workflows/test-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 9fae005cf..d08877620 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -45,7 +45,7 @@ jobs: run: mvn --batch-mode verify -DjacocoAgg - name: Upload coverage report if: (matrix.java-version == 8) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: coverage-report path: jhove-apps/target/site/jacoco-aggregate/ From 938209d0a9cb9b6477cfe850d5d79b06295f8eee Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Fri, 26 Jul 2024 12:32:00 +0100 Subject: [PATCH 3/6] FIX: Use latest download version --- .github/workflows/test-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index d08877620..e182bf094 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -60,7 +60,7 @@ jobs: - name: Codacy analysis reporting uses: codacy/codacy-analysis-cli-action@4.0.0 - name: Download coverage report - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: coverage-report path: jhove-apps/target/site/jacoco-aggregate/ From eff1a1ec996538d79325f88dd8396cbf618f39ba Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Wed, 31 Jul 2024 12:40:35 +0100 Subject: [PATCH 4/6] REL: JHOVE 1.30.1 - bumped modules, apps and installer to 1.30.1; - bumped PDF HUL to 1.12.6 to incorporate fix for [#929](https://github.com/openpreserve/jhove/issues/929); and - installer dependencies. --- jhove-apps/pom.xml | 4 +++- jhove-installer/pom.xml | 5 +++-- jhove-modules/aiff-hul/pom.xml | 2 +- jhove-modules/ascii-hul/pom.xml | 2 +- jhove-modules/gif-hul/pom.xml | 2 +- jhove-modules/html-hul/pom.xml | 2 +- jhove-modules/jpeg-hul/pom.xml | 2 +- jhove-modules/jpeg2000-hul/pom.xml | 2 +- jhove-modules/pdf-hul/pom.xml | 4 ++-- jhove-modules/pom.xml | 1 + jhove-modules/tiff-hul/pom.xml | 2 +- jhove-modules/utf8-hul/pom.xml | 2 +- jhove-modules/wave-hul/pom.xml | 2 +- jhove-modules/xml-hul/pom.xml | 2 +- 14 files changed, 19 insertions(+), 15 deletions(-) diff --git a/jhove-apps/pom.xml b/jhove-apps/pom.xml index 489c43ac1..96610605e 100644 --- a/jhove-apps/pom.xml +++ b/jhove-apps/pom.xml @@ -10,6 +10,8 @@ jhove-apps jar + 1.30.1 + JHOVE Applications Classes and fat JAR packaging for CLI and GUI app. @@ -58,7 +60,7 @@ org.openpreservation.jhove jhove-core - ${project.version} + 1.30.0 diff --git a/jhove-installer/pom.xml b/jhove-installer/pom.xml index 54b7480c7..df9b0e891 100644 --- a/jhove-installer/pom.xml +++ b/jhove-installer/pom.xml @@ -9,6 +9,7 @@ jhove-installer + 1.30.1 JHOVE Installer Maven-built IzPack installer for JHOVE. @@ -24,7 +25,7 @@ 1.4.3 1.4.4 1.5.4 - 1.12.5 + 1.12.6 1.9.4 1.7.3 1.8.3 @@ -174,7 +175,7 @@ org.openpreservation.jhove jhove-ext-modules - ${project.version} + 1.30.0 org.openpreservation.jhove.modules diff --git a/jhove-modules/aiff-hul/pom.xml b/jhove-modules/aiff-hul/pom.xml index 812c1e804..1395924e3 100644 --- a/jhove-modules/aiff-hul/pom.xml +++ b/jhove-modules/aiff-hul/pom.xml @@ -3,7 +3,7 @@ org.openpreservation.jhove.modules jhove-modules - 1.30.0 + 1.30.1 aiff-hul 1.6.2 diff --git a/jhove-modules/ascii-hul/pom.xml b/jhove-modules/ascii-hul/pom.xml index affc69f35..fbdaf3f6e 100644 --- a/jhove-modules/ascii-hul/pom.xml +++ b/jhove-modules/ascii-hul/pom.xml @@ -3,7 +3,7 @@ org.openpreservation.jhove.modules jhove-modules - 1.30.0 + 1.30.1 ascii-hul 1.4.2 diff --git a/jhove-modules/gif-hul/pom.xml b/jhove-modules/gif-hul/pom.xml index dbf20950d..2abd4cec3 100644 --- a/jhove-modules/gif-hul/pom.xml +++ b/jhove-modules/gif-hul/pom.xml @@ -3,7 +3,7 @@ org.openpreservation.jhove.modules jhove-modules - 1.30.0 + 1.30.1 gif-hul 1.4.3 diff --git a/jhove-modules/html-hul/pom.xml b/jhove-modules/html-hul/pom.xml index ee8f81239..03ae60382 100644 --- a/jhove-modules/html-hul/pom.xml +++ b/jhove-modules/html-hul/pom.xml @@ -3,7 +3,7 @@ org.openpreservation.jhove.modules jhove-modules - 1.30.0 + 1.30.1 html-hul 1.4.3 diff --git a/jhove-modules/jpeg-hul/pom.xml b/jhove-modules/jpeg-hul/pom.xml index 6314ee588..1b1d663bc 100644 --- a/jhove-modules/jpeg-hul/pom.xml +++ b/jhove-modules/jpeg-hul/pom.xml @@ -3,7 +3,7 @@ org.openpreservation.jhove.modules jhove-modules - 1.30.0 + 1.30.1 jpeg-hul 1.5.4 diff --git a/jhove-modules/jpeg2000-hul/pom.xml b/jhove-modules/jpeg2000-hul/pom.xml index 192c9c82c..1d4557036 100644 --- a/jhove-modules/jpeg2000-hul/pom.xml +++ b/jhove-modules/jpeg2000-hul/pom.xml @@ -3,7 +3,7 @@ org.openpreservation.jhove.modules jhove-modules - 1.30.0 + 1.30.1 jpeg2000-hul 1.4.4 diff --git a/jhove-modules/pdf-hul/pom.xml b/jhove-modules/pdf-hul/pom.xml index 4286d869a..b7102d68d 100644 --- a/jhove-modules/pdf-hul/pom.xml +++ b/jhove-modules/pdf-hul/pom.xml @@ -3,10 +3,10 @@ org.openpreservation.jhove.modules jhove-modules - 1.30.0 + 1.30.1 pdf-hul - 1.12.5 + 1.12.6 JHOVE PDF Module HUL PDF module developed by Harvard University Library diff --git a/jhove-modules/pom.xml b/jhove-modules/pom.xml index 6b26b4a41..be67b6629 100644 --- a/jhove-modules/pom.xml +++ b/jhove-modules/pom.xml @@ -11,6 +11,7 @@ org.openpreservation.jhove.modules jhove-modules pom + 1.30.1 JHOVE Validation Modules The JHOVE HUL validation modules. diff --git a/jhove-modules/tiff-hul/pom.xml b/jhove-modules/tiff-hul/pom.xml index 97c531a89..1bae3e28d 100644 --- a/jhove-modules/tiff-hul/pom.xml +++ b/jhove-modules/tiff-hul/pom.xml @@ -3,7 +3,7 @@ org.openpreservation.jhove.modules jhove-modules - 1.30.0 + 1.30.1 tiff-hul 1.9.4 diff --git a/jhove-modules/utf8-hul/pom.xml b/jhove-modules/utf8-hul/pom.xml index e74887f06..b8b5c2d19 100644 --- a/jhove-modules/utf8-hul/pom.xml +++ b/jhove-modules/utf8-hul/pom.xml @@ -3,7 +3,7 @@ org.openpreservation.jhove.modules jhove-modules - 1.30.0 + 1.30.1 utf8-hul 1.7.3 diff --git a/jhove-modules/wave-hul/pom.xml b/jhove-modules/wave-hul/pom.xml index c7fd6bbb0..33a5a90c6 100644 --- a/jhove-modules/wave-hul/pom.xml +++ b/jhove-modules/wave-hul/pom.xml @@ -3,7 +3,7 @@ org.openpreservation.jhove.modules jhove-modules - 1.30.0 + 1.30.1 wave-hul 1.8.3 diff --git a/jhove-modules/xml-hul/pom.xml b/jhove-modules/xml-hul/pom.xml index 99de10a6d..41cbd791c 100644 --- a/jhove-modules/xml-hul/pom.xml +++ b/jhove-modules/xml-hul/pom.xml @@ -3,7 +3,7 @@ org.openpreservation.jhove.modules jhove-modules - 1.30.0 + 1.30.1 xml-hul 1.5.4 From 420e4c96aee6f3200fbd4d70d668776a72b8acbe Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Wed, 31 Jul 2024 13:53:00 +0100 Subject: [PATCH 5/6] FIX: 1.30.1 Tests - Updated PDF module details; and - changed testing scripts to reflect this. --- jhove-bbt/scripts/create-1.30-target.sh | 8 ++++---- jhove-installer/src/main/izpack/install.xml | 4 ++-- .../java/edu/harvard/hul/ois/jhove/module/PdfModule.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jhove-bbt/scripts/create-1.30-target.sh b/jhove-bbt/scripts/create-1.30-target.sh index 990f16d09..0f7b94d28 100755 --- a/jhove-bbt/scripts/create-1.30-target.sh +++ b/jhove-bbt/scripts/create-1.30-target.sh @@ -64,10 +64,10 @@ find "${targetRoot}" -type f -name "audit.jhove.xml" -exec sed -i 's/outputHandl find "${targetRoot}" -type f -name "audit.jhove.xml" -exec sed -i 's/outputHandler release="1.1">JSON/outputHandler release="1.2">JSON/' {} \; # Update release details for PDF module -find "${targetRoot}" -type f -name "*.pdf.jhove.xml" -exec sed -i 's/^ PDF-hul<\/reportingModule>$/ PDF-hul<\/reportingModule>/' {} \; -find "${targetRoot}" -type f -name "audit.jhove.xml" -exec sed -i 's/^ PDF-hul<\/module>$/ PDF-hul<\/module>/' {} \; -find "${targetRoot}" -type f -name "audit-PDF-hul.jhove.xml" -exec sed -i 's/^ 1.12.4<\/release>$/ 1.12.5<\/release>/' {} \; -find "${targetRoot}" -type f -name "audit-PDF-hul.jhove.xml" -exec sed -i 's/2023-03-16/2024-03-05/' {} \; +find "${targetRoot}" -type f -name "*.pdf.jhove.xml" -exec sed -i 's/^ PDF-hul<\/reportingModule>$/ PDF-hul<\/reportingModule>/' {} \; +find "${targetRoot}" -type f -name "audit.jhove.xml" -exec sed -i 's/^ PDF-hul<\/module>$/ PDF-hul<\/module>/' {} \; +find "${targetRoot}" -type f -name "audit-PDF-hul.jhove.xml" -exec sed -i 's/^ 1.12.4<\/release>$/ 1.12.6<\/release>/' {} \; +find "${targetRoot}" -type f -name "audit-PDF-hul.jhove.xml" -exec sed -i 's/2023-03-16/2024-07-31/' {} \; # Update release details for PNG module find "${targetRoot}" -type f -name "*.png.jhove.xml" -exec sed -i 's/^ PNG-gdm<\/reportingModule>$/ PNG-gdm<\/reportingModule>/' {} \; diff --git a/jhove-installer/src/main/izpack/install.xml b/jhove-installer/src/main/izpack/install.xml index f8ec2b446..41ea703d1 100644 --- a/jhove-installer/src/main/izpack/install.xml +++ b/jhove-installer/src/main/izpack/install.xml @@ -107,8 +107,8 @@ Third-party validation modules developed for JHOVE, currently GZIP, PNG and WARC. - - + + diff --git a/jhove-modules/pdf-hul/src/main/java/edu/harvard/hul/ois/jhove/module/PdfModule.java b/jhove-modules/pdf-hul/src/main/java/edu/harvard/hul/ois/jhove/module/PdfModule.java index 7d3442007..2c25fd0c3 100644 --- a/jhove-modules/pdf-hul/src/main/java/edu/harvard/hul/ois/jhove/module/PdfModule.java +++ b/jhove-modules/pdf-hul/src/main/java/edu/harvard/hul/ois/jhove/module/PdfModule.java @@ -380,8 +380,8 @@ public class PdfModule extends ModuleBase { ******************************************************************/ private static final String NAME = "PDF-hul"; - private static final String RELEASE = "1.12.5"; - private static final int[] DATE = { 2024, 03, 05 }; + private static final String RELEASE = "1.12.6"; + private static final int[] DATE = { 2024, 07, 31 }; private static final String[] FORMAT = { "PDF", "Portable Document Format" }; private static final String COVERAGE = "PDF 1.0-1.6; " From 2ee5622cdf1a1448ca8878555fec25dcbbd3c0f5 Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Wed, 31 Jul 2024 15:12:00 +0100 Subject: [PATCH 6/6] FIX: Use installer version --- jhove-bbt/scripts/travis-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jhove-bbt/scripts/travis-test.sh b/jhove-bbt/scripts/travis-test.sh index efd4788b5..94ace84e3 100755 --- a/jhove-bbt/scripts/travis-test.sh +++ b/jhove-bbt/scripts/travis-test.sh @@ -54,7 +54,7 @@ fi [[ -d "${TARGET_ROOT}" ]] || mkdir -p "${TARGET_ROOT}" # Grab the Major and Minor versions from the full Maven project version string -MVN_VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec) +MVN_VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec -f jhove-installer/pom.xml) MAJOR_MINOR_VER="${MVN_VERSION%.*}" JHOVE_INSTALLER="./jhove-installer/target/jhove-xplt-installer-${MVN_VERSION}.jar"