Merge branch 'integration' into depend-on-current-jwat

LICENSE

@@ -1,5 +1,6 @@
 JHOVE - JSTOR/Harvard Object Validation Environment
-Copyright 2003-2008 by JSTOR and the President and Fellows of Harvard College
+Copyright 2003-2015 by JSTOR and the President and Fellows of Harvard College
+Copyright 2015-2023 by Open Preservation Foundation
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lessor General Public License as

RELEASENOTES.md

@@ -1,7 +1,8 @@
 # RELEASE NOTES
 
 JHOVE - JSTOR/Harvard Object Validation Environment
-Copyright 2003-2009 by JSTOR and the President and Fellows of Harvard College.
+Copyright 2003-2015 by JSTOR and the President and Fellows of Harvard College.
+Copyright 2015-2023 by [The Open Preservation Foundation](https://openpreservation.org).
 JHOVE is made available under the GNU Lesser General Public License (LGPL;
 see the file LICENSE for details).
 
@@ -10,7 +11,7 @@ Versions 1.12 onwards released by the Open Preservation Foundation.
 
 ## JHOVE 1.28.0
 
-2023-03-16
+2023-05-19
 
 ### General
 
@@ -22,6 +23,7 @@ Versions 1.12 onwards released by the Open Preservation Foundation.
 - NISO Image metadata gets a new GPSHPositioningError tag [[#801][]], fixes [[#787][]]
 - NISO Image metadata, date validation [[#800][]], fixes [[#799][]]
 - Array added to JSON reporting to support multi file reporting [[#728][]], fixes [[#667][]]
+- Fixed small issue in generated reports where schema version wasn't incremented to 1.9. [[#849][]]
 
 ### JPEG Module 1.54
 
@@ -70,6 +72,7 @@ Versions 1.12 onwards released by the Open Preservation Foundation.
 ### XML Module 1.5.3
 
 - Purged string constant message [[#827][]]
+- Reverted reporting of XmlParseExceptions so that exception detail is part of message body. [[#850][]]
 
 ### EPUB Module 1.2
 
@@ -79,7 +82,6 @@ Versions 1.12 onwards released by the Open Preservation Foundation.
 
 - Added mechanism to mint errors with IDs and removed plain text messages [[#836][]]
 
-
 [#630]: https://github.com/openpreserve/jhove/pull/630
 [#672]: https://github.com/openpreserve/jhove/pull/672
 [#728]: https://github.com/openpreserve/jhove/pull/728
@@ -125,6 +127,8 @@ Versions 1.12 onwards released by the Open Preservation Foundation.
 [#835]: https://github.com/openpreserve/jhove/pull/835
 [#836]: https://github.com/openpreserve/jhove/pull/836
 [#839]: https://github.com/openpreserve/jhove/pull/839
+[#849]: https://github.com/openpreserve/jhove/pull/849
+[#850]: https://github.com/openpreserve/jhove/pull/850
 [#817]: https://github.com/openpreserve/jhove/issues/817
 [#809]: https://github.com/openpreserve/jhove/issues/809
 [#799]: https://github.com/openpreserve/jhove/issues/799

jhove-apps/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.openpreservation.jhove</groupId>
     <artifactId>jhove</artifactId>
-    <version>1.28.0-RC1</version>
+    <version>1.29.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jhove-apps</artifactId>

jhove-bbt/scripts/bbt-jhove.sh

@@ -127,7 +127,7 @@ showHelp() {
 checkParams "$@"
 candidate="${paramOutputLoc:?}/${MAJOR_MINOR_VER}"
 tempInstallLoc="/tmp/to-test"
-sed -i 's/^java.*/java -javaagent:${HOME}\/\.m2\/repository\/org\/jacoco\/org\.jacoco\.agent\/0.8.7\/org\.jacoco.agent-0\.8\.7-runtime\.jar=destfile=jhove-apps\/target\/jacoco\.exec -Xss2048k  -classpath "$CP" edu.harvard.hul.ois.jhove.Jhove -c "${CONFIG}" "${@}"/g' "${tempInstallLoc}/jhove"
+sed -i 's/^java.*/java -javaagent:${HOME}\/\.m2\/repository\/org\/jacoco\/org\.jacoco\.agent\/0.8.10\/org\.jacoco.agent-0\.8\.10-runtime\.jar=destfile=jhove-apps\/target\/jacoco\.exec -Xss2048k  -classpath "$CP" edu.harvard.hul.ois.jhove.Jhove -c "${CONFIG}" "${@}"/g' "${tempInstallLoc}/jhove"
 bash "$SCRIPT_DIR/baseline-jhove.sh" -j "${tempInstallLoc}" -c "${paramCorpusLoc}" -o "${candidate}"
 
 if [[ -f "${SCRIPT_DIR}/create-${MAJOR_MINOR_VER}-target.sh" ]]

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

@@ -239,3 +239,7 @@ fi
 if [[ -f "${candidateRoot}/examples/modules/TIFF-hul/zackthecat.tif.jhove.xml" ]]; then
 	cp "${candidateRoot}/examples/modules/TIFF-hul/zackthecat.tif.jhove.xml" "${targetRoot}/examples/modules/TIFF-hul/zackthecat.tif.jhove.xml"
 fi
+
+# Patch release details of the reporting module.
+find "${targetRoot}" -type f -name "*.jhove.xml" -exec sed -i 's/jhove\/1.8\/jhove.xsd/jhove\/1.9\/jhove.xsd/' {} \;
+find "${targetRoot}" -type f -name "audit.jhove.xml" -exec sed -i 's/outputHandler release="1.9"/outputHandler release="1.10"/' {} \;

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

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+testRoot="test-root"
+paramCandidateVersion=""
+paramBaselineVersion=""
+baselineRoot="${testRoot}/baselines"
+candidateRoot="${testRoot}/candidates"
+targetRoot="${testRoot}/targets"
+# Check the passed params to avoid disapointment
+checkParams () {
+	OPTIND=1	# Reset in case getopts previously used
+
+	while getopts "h?b:c:" opt; do	# Grab the options
+		case "$opt" in
+		h|\?)
+			showHelp
+			exit 0
+			;;
+		b)	paramBaselineVersion=$OPTARG
+			;;
+		c)	paramCandidateVersion=$OPTARG
+			;;
+		esac
+	done
+
+	if [ -z "$paramBaselineVersion" ] || [ -z "$paramCandidateVersion" ]
+	then
+		showHelp
+		exit 0
+	fi
+
+	baselineRoot="${baselineRoot}/${paramBaselineVersion}"
+	candidateRoot="${candidateRoot}/${paramCandidateVersion}"
+	targetRoot="${targetRoot}/${paramCandidateVersion}"
+}
+
+# Show usage message
+showHelp() {
+	echo "usage: create-target [-b <baselineVersion>] [-c <candidateVersion>] [-h|?]"
+	echo ""
+	echo "  baselineVersion  : The version number id for the baseline data."
+	echo "  candidateVersion : The version number id for the candidate data."
+	echo ""
+	echo "  -h|? : This message."
+}
+
+# Execution starts here
+checkParams "$@";
+if [[ -d "${targetRoot}" ]]; then
+	echo " - removing existing baseline at ${targetRoot}."
+	rm -rf "${targetRoot}"
+fi
+
+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}"

jhove-bbt/scripts/travis-test.sh

@@ -13,7 +13,7 @@ TEST_BASELINES_ROOT="${TEST_ROOT}/baselines"
 TEST_INSTALL_ROOT="${TEST_ROOT}/jhove"
 CANDIDATE_ROOT="${TEST_ROOT}/candidates"
 TARGET_ROOT="${TEST_ROOT}/targets"
-BASELINE_VERSION=1.26
+BASELINE_VERSION=1.28
 
 # Create the JHOVE test root if it doesn't exist
 [[ -d "${TEST_ROOT}" ]] || mkdir -p "${TEST_ROOT}"

jhove-core/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.openpreservation.jhove</groupId>
     <artifactId>jhove</artifactId>
-    <version>1.28.0-RC1</version>
+    <version>1.29.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jhove-core</artifactId>