Merge branch 'integration' into EncryptDictIndirectRef

jhove-bbt/scripts/create-1.27-target.sh

@@ -55,3 +55,9 @@ echo "TEST BASELINE: Creating baseline"
 # Simply copy baseline for now we're not making any changes
 echo " - copying ${baselineRoot} baseline to ${targetRoot}"
 cp -R "${baselineRoot}" "${targetRoot}"
+
+# Update release details for PDF module
+find "${targetRoot}" -type f -name "*.pdf.jhove.xml" -exec sed -i 's/^  <reportingModule release="1.12.3" date="2022-04-22">PDF-hul<\/reportingModule>$/  <reportingModule release="1.12.4" date="2023-01-31">PDF-hul<\/reportingModule>/' {} \;
+find "${targetRoot}" -type f -name "audit.jhove.xml" -exec sed -i 's/^   <module release="1.12.3">PDF-hul<\/module>$/   <module release="1.12.4">PDF-hul<\/module>/' {} \;
+find "${targetRoot}" -type f -name "audit-PDF-hul.jhove.xml" -exec sed -i 's/^  <release>1.12.3<\/release>$/  <release>1.12.4<\/release>/' {} \;
+find "${targetRoot}" -type f -name "audit-PDF-hul.jhove.xml" -exec sed -i 's/2022-04-22/2023-01-31/' {} \;

jhove-installer/pom.xml

@@ -198,7 +198,7 @@
     <dependency>
       <groupId>org.openpreservation.jhove.modules</groupId>
       <artifactId>pdf-hul</artifactId>
-      <version>1.12.3</version>
+      <version>1.12.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.openpreservation.jhove.modules</groupId>

jhove-installer/src/main/izpack/install.xml

@@ -71,8 +71,8 @@
       <executable targetfile="$INSTALL_PATH/bin/jpeg2000-hul-1.4.3.jar"/>
       <file targetdir="$INSTALL_PATH/bin" src="bin/jpeg-hul-1.5.3.jar"/>
       <executable targetfile="$INSTALL_PATH/bin/jpeg-hul-1.5.3.jar"/>
-      <file targetdir="$INSTALL_PATH/bin" src="bin/pdf-hul-1.12.3.jar"/>
-      <executable targetfile="$INSTALL_PATH/bin/pdf-hul-1.12.3.jar"/>
+      <file targetdir="$INSTALL_PATH/bin" src="bin/pdf-hul-1.12.4-SNAPSHOT.jar"/>
+      <executable targetfile="$INSTALL_PATH/bin/pdf-hul-1.12.4-SNAPSHOT.jar"/>
       <file targetdir="$INSTALL_PATH/bin" src="bin/tiff-hul-1.9.3.jar"/>
       <executable targetfile="$INSTALL_PATH/bin/tiff-hul-1.9.3.jar"/>
       <file targetdir="$INSTALL_PATH/bin" src="bin/utf8-hul-1.7.2.jar"/>

jhove-modules/pdf-hul/pom.xml

@@ -6,7 +6,7 @@
     <version>1.27.0-SNAPSHOT</version>
   </parent>
   <artifactId>pdf-hul</artifactId>
-  <version>1.12.3</version>
+  <version>1.12.4-SNAPSHOT</version>
   <name>JHOVE PDF Module HUL</name>
   <description>PDF module developed by Harvard University Library</description>
 </project>

jhove-modules/pdf-hul/src/main/java/edu/harvard/hul/ois/jhove/module/PdfModule.java

@@ -382,8 +382,8 @@ public class PdfModule extends ModuleBase {
 	 ******************************************************************/
 
 	private static final String NAME = "PDF-hul";
-	private static final String RELEASE = "1.12.3";
-	private static final int[] DATE = { 2022, 04, 22 };
+    private static final String RELEASE = "1.12.4";
+    private static final int[] DATE = { 2023, 1, 31 };
 	private static final String[] FORMAT = { "PDF",
 			"Portable Document Format" };
 	private static final String COVERAGE = "PDF 1.0-1.6; "

jhove-modules/pdf-hul/src/main/java/edu/harvard/hul/ois/jhove/module/pdf/PdfStrings.java

@@ -105,56 +105,78 @@ public class PdfStrings
      *  Maintained in: https://github.com/adobe/pdf-names-list
      * . */
     public final static List<String> PREFIXNAMESREGISTY = new ArrayList<String>() {{
-		add("ADBE"); // Adobe
-    	add("ITXT"); // 1T3XT BVBA
-    	add("CIP4"); // International Cooperation for the Integration of Process in Prepress, Press and Postpress Association
-    	add("FOPN"); // FileOpen Systems Inc.
-    	add("SNLF"); // SNL Financial, LC
-    	add("K3SD"); // Kanrikogaku Kenkyusho, Ltd.,  Meguro Office
-    	add("CRDF"); // Autonomy Cardiff
-    	add("PDTH"); // PDF Thingys
-    	add("GURG"); // Gurnet Group LLC
-    	add("USCT"); // Administrative Office of the U.S. Courts
-    	add("MTSJ"); // Mekentosj BV
-    	add("AJIc"); // Aji, LLC
-    	add("GFSw"); // Goofyfootsoftware
-    	add("LTUd"); // Office of the Chief Archivist of Lithuania
-    	add("MSFT"); // Microsoft Corporation
-    	add("wgss"); // Wacom Co, Ltd
-    	add("bPRO"); // BiPRO e.V.
-    	add("HEBD"); // H-E-B Grocery
-    	add("iPDF"); // InteractivePDF.org
-    	add("CALS"); // Callas Software gmbh
-    	add("OOPS"); // JNJ
-    	add("KWSQ"); // Kawseq Consulting Pty Ltd
-    	add("PIER"); // Pierre Choutet
-    	add("SCIN"); // Scinaptic Communications
-    	add("VSMA"); // Visma Software International AS
-    	add("MSMO"); // Mortgage Industry Standards Maintenance Organization
-    	add("DUFF"); // Adlib Publishing Systems
-    	add("ADLB"); // ALSTOM (Switzerland) Ltd
-    	add("FNBC"); // Andrea Vacandio, Sejda.org
-    	add("sjda"); // ZETO Sp. z o.o. w Lublinie
-    	add("ZETO"); // Setasign
-    	add("SETA"); // SOFHA Gmbh
-    	add("SOFH"); // AcroScript
-    	add("ASGJ"); // UAB "Superita"
-    	add("WRPC"); // Instituto Nacional de Tecnologia da Informação
-    	add("PBAD"); // China Finacial Certification Authority Co.Ltd
-    	add("cfca"); // China Finacial Certification Authority Co.Ltd
-    	add("CFCA"); // Timeslice Ltd
-    	add("TMSL"); // Wacom Co, Ltd
-    	add("WGSS"); // Reindl-IT
-    	add("SRIT"); // Global Graphics
-    	add("GGSL"); // Evansco, LLC
-    	add("EVSC"); // PDFlib GmbH
-    	add("Plib"); // Walters Kluwer TeamMate
-    	add("WKTM"); // Normex s.r.o.
-    	add("NORM"); // PDF Association
-    	add("pdfa"); // Michael Klink
-    	add("MKLx"); // ISO (via the 3D PDF Consortium)
-    	add("ISO_"); // ISO TC130/WG2 as described in ISO 21812
-    	add("GTSm"); // 1T3XT BVBA
+	add("ADBE"); // Adobe
+	add("ABCp"); //Zandent Ltd
+	add("ADLB"); //Adlib Publishing Systems
+	add("AJIc"); //Aji, LLC
+	add("ASGJ"); //AcroScript
+	add("BECI"); //BEC GmbH & Co KG
+	add("BFOO"); //BFO
+	add("bPRO"); //BiPRO e.V.
+	add("CALS"); //Callas Software gmbh
+	add("cfca"); //China Finacial Certification Authority Co.Ltd
+	add("CFCA"); //China Finacial Certification Authority Co.Ltd
+	add("CIP4"); //International Cooperation for the Integration of Process in Prepress, Press and Postpress Association
+	add("CLWN"); //pdfclown.org
+	add("CRDF"); //Autonomy Cardiff
+	add("diTe"); //disphere tech GmbH
+	add("DMSK"); //DMS One Zrt.
+	add("DUFF"); //Duff Johnson Consulting
+	add("Esko"); //Esko Software bv
+	add("EVSC"); //Evansco, LLC
+	add("FICL"); //Enfocus BV
+	add("FNBC"); //ALSTOM (Switzerland) Ltd
+	add("FOPN"); //FileOpen Systems Inc.
+	add("GeoD"); //Mapthematics LLC
+	add("GFSw"); //Goofyfootsoftware
+	add("GGSL"); //Global Graphics
+	add("GLAU"); //AS207960 Cyfyngedig
+	add("glTF"); //ISO (via the 3D PDF Consortium)
+	add("GTSm"); //ISO TC130/WG2 as described in ISO 21812
+	add("GURG"); //Gurnet Group LLC
+	add("GWG_"); //Ghent Workgroup
+	add("HEBD"); //H-E-B Grocery
+	add("HYBR"); //HYBRID Software Development NV
+	add("ICTI"); //iCerti
+	add("iPDF"); //InteractivePDF.org
+	add("ISO_"); //ISO (via the 3D PDF Consortium)
+	add("ITXT"); //1T3XT BVBA
+	add("K3SD"); //Kanrikogaku Kenkyusho, Ltd.,  Meguro Office
+	add("KWSQ"); //Kawseq Consulting Pty Ltd
+	add("LTUd"); //Office of the Chief Archivist of Lithuania
+	add("MKLx"); //Michael Klink
+	add("MSFT"); //Microsoft Corporation
+	add("MSMO"); //Mortgage Industry Standards Maintenance Organization
+	add("MTSJ"); //Mekentosj BV
+	add("NORM"); //Normex s.r.o.
+	add("NPTC"); //nepatec GmbH
+	add("nptc"); //nepatec GmbH
+	add("OOPS"); //JNJ
+	add("PBAD"); //Instituto Nacional de Tecnologia da Informação
+	add("pdfa"); //PDF Association
+	add("PDTH"); //PDF Thingys
+	add("PIER"); //Pierre Choutet
+	add("Plib"); //PDFlib GmbH
+	add("PTEX"); //PRAGMA ADE
+	add("S4Cx"); //Sense4code s.r.o.
+	add("SCIN"); //Scinaptic Communications
+	add("SETA"); //Setasign
+	add("sjda"); //Andrea Vacandio, Sejda.org
+	add("slns"); //OneSpan
+	add("SNLF"); //SNL Financial, LC
+	add("SOFH"); //SOFHA Gmbh
+	add("SRIT"); //Reindl-IT
+	add("STEP"); //ISO (via the 3D PDF Consortium)
+	add("TGSI"); //Telegenisys Inc.
+	add("TMSL"); //Timeslice Ltd
+	add("USCT"); //Administrative Office of the U.S. Courts
+	add("VSMA"); //Visma Software International AS
+	add("wgss"); //Wacom Co, Ltd
+	add("WGSS"); //Wacom Co, Ltd
+	add("WKTM"); //Walters Kluwer TeamMate
+	add("WRPC"); //UAB "Superita"
+	add("ZETO"); //ZETO Sp. z o.o. w Lublinie
+
     }};
 
     /** A private constructor just to make sure nobody