diff --git a/jhove-apps/pom.xml b/jhove-apps/pom.xml index 96610605e..fb5c427dc 100644 --- a/jhove-apps/pom.xml +++ b/jhove-apps/pom.xml @@ -5,12 +5,12 @@ org.openpreservation.jhove jhove - 1.30.0 + 1.31.0-SNAPSHOT jhove-apps jar - 1.30.1 + 1.31.0-SNAPSHOT JHOVE Applications @@ -60,7 +60,7 @@ org.openpreservation.jhove jhove-core - 1.30.0 + 1.31.0-SNAPSHOT diff --git a/jhove-bbt/scripts/create-1.31-target.sh b/jhove-bbt/scripts/create-1.31-target.sh new file mode 100755 index 000000000..f94d7a97c --- /dev/null +++ b/jhove-bbt/scripts/create-1.31-target.sh @@ -0,0 +1,62 @@ +#!/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 ] [-c ] [-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}" +# 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.5<\/release>$/ 1.12.6<\/release>/' {} \; +# find "${targetRoot}" -type f -name "audit-PDF-hul.jhove.xml" -exec sed -i 's/2024-03-05/2024-07-31/' {} \; + diff --git a/jhove-bbt/scripts/travis-test.sh b/jhove-bbt/scripts/travis-test.sh index 94ace84e3..c2ee948d6 100755 --- a/jhove-bbt/scripts/travis-test.sh +++ b/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.28 +BASELINE_VERSION=1.30 # Create the JHOVE test root if it doesn't exist [[ -d "${TEST_ROOT}" ]] || mkdir -p "${TEST_ROOT}" diff --git a/jhove-core/pom.xml b/jhove-core/pom.xml index c7e17204c..e09a033a4 100644 --- a/jhove-core/pom.xml +++ b/jhove-core/pom.xml @@ -5,7 +5,7 @@ org.openpreservation.jhove jhove - 1.30.0 + 1.31.0-SNAPSHOT jhove-core diff --git a/jhove-ext-modules/pom.xml b/jhove-ext-modules/pom.xml index 97ed7377b..d52517052 100644 --- a/jhove-ext-modules/pom.xml +++ b/jhove-ext-modules/pom.xml @@ -3,7 +3,7 @@ org.openpreservation.jhove jhove - 1.30.0 + 1.31.0-SNAPSHOT jhove-ext-modules diff --git a/jhove-installer/pom.xml b/jhove-installer/pom.xml index df9b0e891..76dc74c70 100644 --- a/jhove-installer/pom.xml +++ b/jhove-installer/pom.xml @@ -5,11 +5,11 @@ org.openpreservation.jhove jhove - 1.30.0 + 1.31.0-SNAPSHOT jhove-installer - 1.30.1 + 1.31.0-SNAPSHOT JHOVE Installer Maven-built IzPack installer for JHOVE. @@ -175,7 +175,7 @@ org.openpreservation.jhove jhove-ext-modules - 1.30.0 + 1.31.0-SNAPSHOT org.openpreservation.jhove.modules diff --git a/jhove-installer/src/main/izpack/install.xml b/jhove-installer/src/main/izpack/install.xml index 41ea703d1..f8ec2b446 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/aiff-hul/pom.xml b/jhove-modules/aiff-hul/pom.xml index 1395924e3..72180500d 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.1 + 1.31.0-SNAPSHOT aiff-hul 1.6.2 diff --git a/jhove-modules/ascii-hul/pom.xml b/jhove-modules/ascii-hul/pom.xml index fbdaf3f6e..250678d7b 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.1 + 1.31.0-SNAPSHOT ascii-hul 1.4.2 diff --git a/jhove-modules/gif-hul/pom.xml b/jhove-modules/gif-hul/pom.xml index 2abd4cec3..ad7998d18 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.1 + 1.31.0-SNAPSHOT gif-hul 1.4.3 diff --git a/jhove-modules/html-hul/pom.xml b/jhove-modules/html-hul/pom.xml index 03ae60382..a8af3637b 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.1 + 1.31.0-SNAPSHOT html-hul 1.4.3 diff --git a/jhove-modules/jpeg-hul/pom.xml b/jhove-modules/jpeg-hul/pom.xml index 1b1d663bc..ab0eebcaf 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.1 + 1.31.0-SNAPSHOT jpeg-hul 1.5.4 diff --git a/jhove-modules/jpeg2000-hul/pom.xml b/jhove-modules/jpeg2000-hul/pom.xml index 1d4557036..77ed54d56 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.1 + 1.31.0-SNAPSHOT jpeg2000-hul 1.4.4 diff --git a/jhove-modules/pdf-hul/pom.xml b/jhove-modules/pdf-hul/pom.xml index b7102d68d..3e5a435ec 100644 --- a/jhove-modules/pdf-hul/pom.xml +++ b/jhove-modules/pdf-hul/pom.xml @@ -3,7 +3,7 @@ org.openpreservation.jhove.modules jhove-modules - 1.30.1 + 1.31.0-SNAPSHOT pdf-hul 1.12.6 diff --git a/jhove-modules/pom.xml b/jhove-modules/pom.xml index be67b6629..cbdf843cd 100644 --- a/jhove-modules/pom.xml +++ b/jhove-modules/pom.xml @@ -5,13 +5,13 @@ org.openpreservation.jhove jhove - 1.30.0 + 1.31.0-SNAPSHOT org.openpreservation.jhove.modules jhove-modules pom - 1.30.1 + 1.31.0-SNAPSHOT JHOVE Validation Modules The JHOVE HUL validation modules. @@ -19,7 +19,7 @@ org.openpreservation.jhove jhove-core - 1.30.0 + 1.31.0-SNAPSHOT org.junit.vintage diff --git a/jhove-modules/tiff-hul/pom.xml b/jhove-modules/tiff-hul/pom.xml index 1bae3e28d..34ae9f03d 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.1 + 1.31.0-SNAPSHOT tiff-hul 1.9.4 diff --git a/jhove-modules/utf8-hul/pom.xml b/jhove-modules/utf8-hul/pom.xml index b8b5c2d19..3798fb6fd 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.1 + 1.31.0-SNAPSHOT utf8-hul 1.7.3 diff --git a/jhove-modules/wave-hul/pom.xml b/jhove-modules/wave-hul/pom.xml index 33a5a90c6..b03bf26cb 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.1 + 1.31.0-SNAPSHOT wave-hul 1.8.3 diff --git a/jhove-modules/xml-hul/pom.xml b/jhove-modules/xml-hul/pom.xml index 41cbd791c..cf18c4cca 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.1 + 1.31.0-SNAPSHOT xml-hul 1.5.4 diff --git a/pom.xml b/pom.xml index 053b0f762..f63ee57db 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.openpreservation.jhove jhove - 1.30.0 + 1.31.0-SNAPSHOT pom JHOVE - JSTOR/Harvard Object Validation Environment