Merge pull request #938 from openpreserve/dev/1.31

DEV: Development version 1.31
openpreserve · Aug 13, 2024 · d02dc55 · d02dc55
2 parents bf9b7da + 99aa31c
commit d02dc55
Show file tree

Hide file tree

Showing 20 changed files with 88 additions and 26 deletions.
diff --git a/jhove-apps/pom.xml b/jhove-apps/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.openpreservation.jhove</groupId>
     <artifactId>jhove</artifactId>
-    <version>1.30.0</version>
+    <version>1.31.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jhove-apps</artifactId>
   <packaging>jar</packaging>
-  <version>1.30.1</version>
+  <version>1.31.0-SNAPSHOT</version>
 
 
   <name>JHOVE Applications</name>
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>org.openpreservation.jhove</groupId>
       <artifactId>jhove-core</artifactId>
-      <version>1.30.0</version>
+      <version>1.31.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/jhove-bbt/scripts/create-1.31-target.sh 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 <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}"
+# find "${targetRoot}" -type f -name "*.pdf.jhove.xml" -exec sed -i 's/^  <reportingModule release="1.12.5" date="2024-03-05">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.5">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.5<\/release>$/  <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
@@ -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
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.openpreservation.jhove</groupId>
     <artifactId>jhove</artifactId>
-    <version>1.30.0</version>
+    <version>1.31.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jhove-core</artifactId>

diff --git a/jhove-ext-modules/pom.xml b/jhove-ext-modules/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openpreservation.jhove</groupId>
     <artifactId>jhove</artifactId>
-    <version>1.30.0</version>
+    <version>1.31.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jhove-ext-modules</artifactId>

diff --git a/jhove-installer/pom.xml b/jhove-installer/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.openpreservation.jhove</groupId>
     <artifactId>jhove</artifactId>
-    <version>1.30.0</version>
+    <version>1.31.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jhove-installer</artifactId>
-  <version>1.30.1</version>
+  <version>1.31.0-SNAPSHOT</version>
   <name>JHOVE Installer</name>
   <description>Maven-built IzPack installer for JHOVE.</description>
 
@@ -175,7 +175,7 @@
     <dependency>
       <groupId>org.openpreservation.jhove</groupId>
       <artifactId>jhove-ext-modules</artifactId>
-      <version>1.30.0</version>
+      <version>1.31.0-SNAPSHOT</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-1.30.0.jar"/>
-      <executable targetfile="$INSTALL_PATH/bin/jhove-ext-modules-1.30.0.jar"/>
+      <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/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.1</version>
+    <version>1.31.0-SNAPSHOT</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.1</version>
+    <version>1.31.0-SNAPSHOT</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.1</version>
+    <version>1.31.0-SNAPSHOT</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.1</version>
+    <version>1.31.0-SNAPSHOT</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.1</version>
+    <version>1.31.0-SNAPSHOT</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.1</version>
+    <version>1.31.0-SNAPSHOT</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,7 +3,7 @@
   <parent>
     <groupId>org.openpreservation.jhove.modules</groupId>
     <artifactId>jhove-modules</artifactId>
-    <version>1.30.1</version>
+    <version>1.31.0-SNAPSHOT</version>
   </parent>
   <artifactId>pdf-hul</artifactId>
   <version>1.12.6</version>

diff --git a/jhove-modules/pom.xml b/jhove-modules/pom.xml
@@ -5,21 +5,21 @@
   <parent>
     <groupId>org.openpreservation.jhove</groupId>
     <artifactId>jhove</artifactId>
-    <version>1.30.0</version>
+    <version>1.31.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.openpreservation.jhove.modules</groupId>
   <artifactId>jhove-modules</artifactId>
   <packaging>pom</packaging>
-  <version>1.30.1</version>
+  <version>1.31.0-SNAPSHOT</version>
   <name>JHOVE Validation Modules</name>
   <description>The JHOVE HUL validation modules.</description>
 
   <dependencies>
     <dependency>
       <groupId>org.openpreservation.jhove</groupId>
       <artifactId>jhove-core</artifactId>
-      <version>1.30.0</version>
+      <version>1.31.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.junit.vintage</groupId>

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.1</version>
+    <version>1.31.0-SNAPSHOT</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.1</version>
+    <version>1.31.0-SNAPSHOT</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.1</version>
+    <version>1.31.0-SNAPSHOT</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.1</version>
+    <version>1.31.0-SNAPSHOT</version>
   </parent>
   <artifactId>xml-hul</artifactId>
   <version>1.5.4</version>

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.openpreservation.jhove</groupId>
   <artifactId>jhove</artifactId>
-  <version>1.30.0</version>
+  <version>1.31.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>JHOVE - JSTOR/Harvard Object Validation Environment</name>