Merge pull request #931 from openpreserve/rel/1.30.1

carlwilson · web-flow · commit 70aefcd501de · 2024-08-01T10:15:30.000+01:00
FIX: Update the GH Actions upload task
diff --git 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/
@@ -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/
diff --git a/jhove-apps/pom.xml b/jhove-apps/pom.xml
@@ -10,6 +10,8 @@
 
   <artifactId>jhove-apps</artifactId>
   <packaging>jar</packaging>
+  <version>1.30.1</version>
+
 
   <name>JHOVE Applications</name>
   <description>Classes and fat JAR packaging for CLI and GUI app.</description>
@@ -58,7 +60,7 @@
     <dependency>
       <groupId>org.openpreservation.jhove</groupId>
       <artifactId>jhove-core</artifactId>
-      <version>${project.version}</version>
+      <version>1.30.0</version>
     </dependency>
   </dependencies>
 
diff --git 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/^  <reportingModule release="1.12.4" date="2023-03-16">PDF-hul<\/reportingModule>$/  <reportingModule release="1.12.5" date="2024-03-05">PDF-hul<\/reportingModule>/' {} \;
-find "${targetRoot}" -type f -name "audit.jhove.xml" -exec sed -i 's/^   <module release="1.12.4">PDF-hul<\/module>$/   <module release="1.12.5">PDF-hul<\/module>/' {} \;
-find "${targetRoot}" -type f -name "audit-PDF-hul.jhove.xml" -exec sed -i 's/^  <release>1.12.4<\/release>$/  <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/^  <reportingModule release="1.12.4" date="2023-03-16">PDF-hul<\/reportingModule>$/  <reportingModule release="1.12.6" date="2024-07-31">PDF-hul<\/reportingModule>/' {} \;
+find "${targetRoot}" -type f -name "audit.jhove.xml" -exec sed -i 's/^   <module release="1.12.4">PDF-hul<\/module>$/   <module release="1.12.6">PDF-hul<\/module>/' {} \;
+find "${targetRoot}" -type f -name "audit-PDF-hul.jhove.xml" -exec sed -i 's/^  <release>1.12.4<\/release>$/  <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/^  <reportingModule release="1.2" date="2023-03-16">PNG-gdm<\/reportingModule>$/  <reportingModule release="1.3" date="2024-03-05">PNG-gdm<\/reportingModule>/' {} \;
diff --git 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"
 
diff --git a/jhove-installer/pom.xml b/jhove-installer/pom.xml
@@ -9,6 +9,7 @@
   </parent>
 
   <artifactId>jhove-installer</artifactId>
+  <version>1.30.1</version>
   <name>JHOVE Installer</name>
   <description>Maven-built IzPack installer for JHOVE.</description>
 
@@ -24,7 +25,7 @@
     <html.hul.version>1.4.3</html.hul.version>
     <jpeg2000.hul.version>1.4.4</jpeg2000.hul.version>
     <jpeg.hul.version>1.5.4</jpeg.hul.version>
-    <pdf.hul.version>1.12.5</pdf.hul.version>
+    <pdf.hul.version>1.12.6</pdf.hul.version>
     <tiff.hul.version>1.9.4</tiff.hul.version>
     <utf8.hul.version>1.7.3</utf8.hul.version>
     <wave.hul.version>1.8.3</wave.hul.version>
@@ -174,7 +175,7 @@
     <dependency>
       <groupId>org.openpreservation.jhove</groupId>
       <artifactId>jhove-ext-modules</artifactId>
-      <version>${project.version}</version>
+      <version>1.30.0</version>
     </dependency>
     <dependency>
       <groupId>org.openpreservation.jhove.modules</groupId>
diff --git a/jhove-installer/src/main/izpack/install.xml b/jhove-installer/src/main/izpack/install.xml
@@ -107,8 +107,8 @@
     </pack>
     <pack name="JHOVE External Modules" required="no">
       <description>Third-party validation modules developed for JHOVE, currently GZIP, PNG and WARC.</description>
-      <file targetdir="$INSTALL_PATH/bin" src="bin/jhove-ext-modules-${project.version}.jar"/>
-      <executable targetfile="$INSTALL_PATH/bin/jhove-ext-modules-${project.version}.jar"/>
+      <file targetdir="$INSTALL_PATH/bin" src="bin/jhove-ext-modules-1.30.0.jar"/>
+      <executable targetfile="$INSTALL_PATH/bin/jhove-ext-modules-1.30.0.jar"/>
       <file targetdir="$INSTALL_PATH/conf" override="true" src="config/ext-modules/jhove.conf"/>
       <parsable targetfile="$INSTALL_PATH/conf/jhove.conf" type="xml"/>
     </pack>
diff --git a/jhove-modules/aiff-hul/pom.xml b/jhove-modules/aiff-hul/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openpreservation.jhove.modules</groupId>
     <artifactId>jhove-modules</artifactId>
-    <version>1.30.0</version>
+    <version>1.30.1</version>
   </parent>
   <artifactId>aiff-hul</artifactId>
   <version>1.6.2</version>
diff --git a/jhove-modules/ascii-hul/pom.xml b/jhove-modules/ascii-hul/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openpreservation.jhove.modules</groupId>
     <artifactId>jhove-modules</artifactId>
-    <version>1.30.0</version>
+    <version>1.30.1</version>
   </parent>
   <artifactId>ascii-hul</artifactId>
   <version>1.4.2</version>
diff --git a/jhove-modules/gif-hul/pom.xml b/jhove-modules/gif-hul/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openpreservation.jhove.modules</groupId>
     <artifactId>jhove-modules</artifactId>
-    <version>1.30.0</version>
+    <version>1.30.1</version>
   </parent>
   <artifactId>gif-hul</artifactId>
   <version>1.4.3</version>
diff --git a/jhove-modules/html-hul/pom.xml b/jhove-modules/html-hul/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openpreservation.jhove.modules</groupId>
     <artifactId>jhove-modules</artifactId>
-    <version>1.30.0</version>
+    <version>1.30.1</version>
   </parent>
   <artifactId>html-hul</artifactId>
   <version>1.4.3</version>
diff --git a/jhove-modules/jpeg-hul/pom.xml b/jhove-modules/jpeg-hul/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openpreservation.jhove.modules</groupId>
     <artifactId>jhove-modules</artifactId>
-    <version>1.30.0</version>
+    <version>1.30.1</version>
   </parent>
   <artifactId>jpeg-hul</artifactId>
   <version>1.5.4</version>
diff --git a/jhove-modules/jpeg2000-hul/pom.xml b/jhove-modules/jpeg2000-hul/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openpreservation.jhove.modules</groupId>
     <artifactId>jhove-modules</artifactId>
-    <version>1.30.0</version>
+    <version>1.30.1</version>
   </parent>
   <artifactId>jpeg2000-hul</artifactId>
   <version>1.4.4</version>
diff --git a/jhove-modules/pdf-hul/pom.xml b/jhove-modules/pdf-hul/pom.xml
@@ -3,10 +3,10 @@
   <parent>
     <groupId>org.openpreservation.jhove.modules</groupId>
     <artifactId>jhove-modules</artifactId>
-    <version>1.30.0</version>
+    <version>1.30.1</version>
   </parent>
   <artifactId>pdf-hul</artifactId>
-  <version>1.12.5</version>
+  <version>1.12.6</version>
   <name>JHOVE PDF Module HUL</name>
   <description>PDF module developed by Harvard University Library</description>
 </project>
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
@@ -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; "
@@ -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) {
 
diff --git a/jhove-modules/pom.xml b/jhove-modules/pom.xml
@@ -11,6 +11,7 @@
   <groupId>org.openpreservation.jhove.modules</groupId>
   <artifactId>jhove-modules</artifactId>
   <packaging>pom</packaging>
+  <version>1.30.1</version>
   <name>JHOVE Validation Modules</name>
   <description>The JHOVE HUL validation modules.</description>
 
diff --git a/jhove-modules/tiff-hul/pom.xml b/jhove-modules/tiff-hul/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openpreservation.jhove.modules</groupId>
     <artifactId>jhove-modules</artifactId>
-    <version>1.30.0</version>
+    <version>1.30.1</version>
   </parent>
   <artifactId>tiff-hul</artifactId>
   <version>1.9.4</version>
diff --git a/jhove-modules/utf8-hul/pom.xml b/jhove-modules/utf8-hul/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openpreservation.jhove.modules</groupId>
     <artifactId>jhove-modules</artifactId>
-    <version>1.30.0</version>
+    <version>1.30.1</version>
   </parent>
   <artifactId>utf8-hul</artifactId>
   <version>1.7.3</version>
diff --git a/jhove-modules/wave-hul/pom.xml b/jhove-modules/wave-hul/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openpreservation.jhove.modules</groupId>
     <artifactId>jhove-modules</artifactId>
-    <version>1.30.0</version>
+    <version>1.30.1</version>
   </parent>
   <artifactId>wave-hul</artifactId>
   <version>1.8.3</version>
diff --git a/jhove-modules/xml-hul/pom.xml b/jhove-modules/xml-hul/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openpreservation.jhove.modules</groupId>
     <artifactId>jhove-modules</artifactId>
-    <version>1.30.0</version>
+    <version>1.30.1</version>
   </parent>
   <artifactId>xml-hul</artifactId>
   <version>1.5.4</version>
