Skip to content

Commit 9880643

Browse files
carlwilsoncarlwilson
authored
Merge pull request #962 from openpreserve/dev/1.33
DEV: JHOVE v1.33.0-SNAPSHOT
2 parents d424af7 + 08b35f9 commit 9880643

File tree

19 files changed

+81
-23
lines changed

19 files changed

+81
-23
lines changed

‎jhove-apps/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<groupId>org.openpreservation.jhove</groupId>
77
<artifactId>jhove</artifactId>
8-
<version>1.32.0</version>
8+
<version>1.33.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>jhove-apps</artifactId>
1212
<packaging>jar</packaging>
13-
<version>1.32.0</version>
13+
<version>1.33.0-SNAPSHOT</version>
1414

1515

1616
<name>JHOVE Applications</name>
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>org.openpreservation.jhove</groupId>
6262
<artifactId>jhove-core</artifactId>
63-
<version>1.32.0</version>
63+
<version>1.33.0-SNAPSHOT</version>
6464
</dependency>
6565
</dependencies>
6666

‎jhove-bbt/scripts/create-1.33-target.sh

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
#!/usr/bin/env bash
2+
3+
testRoot="test-root"
4+
paramCandidateVersion=""
5+
paramBaselineVersion=""
6+
baselineRoot="${testRoot}/baselines"
7+
candidateRoot="${testRoot}/candidates"
8+
targetRoot="${testRoot}/targets"
9+
# Check the passed params to avoid disapointment
10+
checkParams () {
11+
OPTIND=1 # Reset in case getopts previously used
12+
13+
while getopts "h?b:c:" opt; do # Grab the options
14+
case "$opt" in
15+
h|\?)
16+
showHelp
17+
exit 0
18+
;;
19+
b) paramBaselineVersion=$OPTARG
20+
;;
21+
c) paramCandidateVersion=$OPTARG
22+
;;
23+
esac
24+
done
25+
26+
if [ -z "$paramBaselineVersion" ] || [ -z "$paramCandidateVersion" ]
27+
then
28+
showHelp
29+
exit 0
30+
fi
31+
32+
baselineRoot="${baselineRoot}/${paramBaselineVersion}"
33+
candidateRoot="${candidateRoot}/${paramCandidateVersion}"
34+
targetRoot="${targetRoot}/${paramCandidateVersion}"
35+
}
36+
37+
# Show usage message
38+
showHelp() {
39+
echo "usage: create-target [-b <baselineVersion>] [-c <candidateVersion>] [-h|?]"
40+
echo ""
41+
echo " baselineVersion : The version number id for the baseline data."
42+
echo " candidateVersion : The version number id for the candidate data."
43+
echo ""
44+
echo " -h|? : This message."
45+
}
46+
47+
# Execution starts here
48+
checkParams "$@";
49+
if [[ -d "${targetRoot}" ]]; then
50+
echo " - removing existing baseline at ${targetRoot}."
51+
rm -rf "${targetRoot}"
52+
fi
53+
54+
echo "TEST BASELINE: Creating baseline"
55+
# Simply copy baseline for now we're not making any changes
56+
echo " - copying ${baselineRoot} baseline to ${targetRoot}"
57+
cp -R "${baselineRoot}" "${targetRoot}"
58+

‎jhove-bbt/scripts/travis-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ TEST_BASELINES_ROOT="${TEST_ROOT}/baselines"
1313
TEST_INSTALL_ROOT="${TEST_ROOT}/jhove"
1414
CANDIDATE_ROOT="${TEST_ROOT}/candidates"
1515
TARGET_ROOT="${TEST_ROOT}/targets"
16-
BASELINE_VERSION=1.30
16+
BASELINE_VERSION=1.32
1717

1818
# Create the JHOVE test root if it doesn't exist
1919
[[ -d "${TEST_ROOT}" ]] || mkdir -p "${TEST_ROOT}"

‎jhove-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.openpreservation.jhove</groupId>
77
<artifactId>jhove</artifactId>
8-
<version>1.32.0</version>
8+
<version>1.33.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>jhove-core</artifactId>

‎jhove-ext-modules/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.openpreservation.jhove</groupId>
55
<artifactId>jhove</artifactId>
6-
<version>1.32.0</version>
6+
<version>1.33.0-SNAPSHOT</version>
77
</parent>
88

99
<artifactId>jhove-ext-modules</artifactId>

‎jhove-installer/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<parent>
66
<groupId>org.openpreservation.jhove</groupId>
77
<artifactId>jhove</artifactId>
8-
<version>1.32.0</version>
8+
<version>1.33.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>jhove-installer</artifactId>
12-
<version>1.32.0</version>
12+
<version>1.33.0-SNAPSHOT</version>
1313
<name>JHOVE Installer</name>
1414
<description>Maven-built IzPack installer for JHOVE.</description>
1515

‎jhove-modules/aiff-hul/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.openpreservation.jhove.modules</groupId>
55
<artifactId>jhove-modules</artifactId>
6-
<version>1.32.0</version>
6+
<version>1.33.0-SNAPSHOT</version>
77
</parent>
88
<artifactId>aiff-hul</artifactId>
99
<version>1.6.2</version>

‎jhove-modules/ascii-hul/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.openpreservation.jhove.modules</groupId>
55
<artifactId>jhove-modules</artifactId>
6-
<version>1.32.0</version>
6+
<version>1.33.0-SNAPSHOT</version>
77
</parent>
88
<artifactId>ascii-hul</artifactId>
99
<version>1.4.2</version>

‎jhove-modules/gif-hul/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.openpreservation.jhove.modules</groupId>
55
<artifactId>jhove-modules</artifactId>
6-
<version>1.32.0</version>
6+
<version>1.33.0-SNAPSHOT</version>
77
</parent>
88
<artifactId>gif-hul</artifactId>
99
<version>1.4.3</version>

‎jhove-modules/html-hul/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.openpreservation.jhove.modules</groupId>
55
<artifactId>jhove-modules</artifactId>
6-
<version>1.32.0</version>
6+
<version>1.33.0-SNAPSHOT</version>
77
</parent>
88
<artifactId>html-hul</artifactId>
99
<version>1.4.4</version>

‎jhove-modules/jpeg-hul/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.openpreservation.jhove.modules</groupId>
55
<artifactId>jhove-modules</artifactId>
6-
<version>1.32.0</version>
6+
<version>1.33.0-SNAPSHOT</version>
77
</parent>
88
<artifactId>jpeg-hul</artifactId>
99
<version>1.5.4</version>

‎jhove-modules/jpeg2000-hul/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.openpreservation.jhove.modules</groupId>
55
<artifactId>jhove-modules</artifactId>
6-
<version>1.32.0</version>
6+
<version>1.33.0-SNAPSHOT</version>
77
</parent>
88
<artifactId>jpeg2000-hul</artifactId>
99
<version>1.4.4</version>

‎jhove-modules/pdf-hul/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.openpreservation.jhove.modules</groupId>
55
<artifactId>jhove-modules</artifactId>
6-
<version>1.32.0</version>
6+
<version>1.33.0-SNAPSHOT</version>
77
</parent>
88
<artifactId>pdf-hul</artifactId>
99
<version>1.12.7</version>

‎jhove-modules/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
<parent>
66
<groupId>org.openpreservation.jhove</groupId>
77
<artifactId>jhove</artifactId>
8-
<version>1.32.0</version>
8+
<version>1.33.0-SNAPSHOT</version>
99
</parent>
1010

1111
<groupId>org.openpreservation.jhove.modules</groupId>
1212
<artifactId>jhove-modules</artifactId>
1313
<packaging>pom</packaging>
14-
<version>1.32.0</version>
14+
<version>1.33.0-SNAPSHOT</version>
1515
<name>JHOVE Validation Modules</name>
1616
<description>The JHOVE HUL validation modules.</description>
1717

1818
<dependencies>
1919
<dependency>
2020
<groupId>org.openpreservation.jhove</groupId>
2121
<artifactId>jhove-core</artifactId>
22-
<version>1.32.0</version>
22+
<version>1.33.0-SNAPSHOT</version>
2323
</dependency>
2424
<dependency>
2525
<groupId>org.junit.vintage</groupId>

‎jhove-modules/tiff-hul/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.openpreservation.jhove.modules</groupId>
55
<artifactId>jhove-modules</artifactId>
6-
<version>1.32.0</version>
6+
<version>1.33.0-SNAPSHOT</version>
77
</parent>
88
<artifactId>tiff-hul</artifactId>
99
<version>1.9.5</version>

‎jhove-modules/utf8-hul/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.openpreservation.jhove.modules</groupId>
55
<artifactId>jhove-modules</artifactId>
6-
<version>1.32.0</version>
6+
<version>1.33.0-SNAPSHOT</version>
77
</parent>
88
<artifactId>utf8-hul</artifactId>
99
<version>1.7.4</version>

‎jhove-modules/wave-hul/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.openpreservation.jhove.modules</groupId>
55
<artifactId>jhove-modules</artifactId>
6-
<version>1.32.0</version>
6+
<version>1.33.0-SNAPSHOT</version>
77
</parent>
88
<artifactId>wave-hul</artifactId>
99
<version>1.8.3</version>

‎jhove-modules/xml-hul/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.openpreservation.jhove.modules</groupId>
55
<artifactId>jhove-modules</artifactId>
6-
<version>1.32.0</version>
6+
<version>1.33.0-SNAPSHOT</version>
77
</parent>
88
<artifactId>xml-hul</artifactId>
99
<version>1.5.5</version>

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<groupId>org.openpreservation.jhove</groupId>
1212
<artifactId>jhove</artifactId>
13-
<version>1.32.0</version>
13+
<version>1.33.0-SNAPSHOT</version>
1414
<packaging>pom</packaging>
1515

1616
<name>JHOVE - JSTOR/Harvard Object Validation Environment</name>

0 commit comments

Comments
 (0)