Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DEV: JHOVE v1.33.0-SNAPSHOT #962

Merged
merged 3 commits into from
Oct 17, 2024
Merged

DEV: JHOVE v1.33.0-SNAPSHOT #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac4bd86
DEV: JHOVE v1.33.0-SNAPSHOT
carlwilson Sep 4, 2024
5d486a3
Merge branch 'integration' into dev/1.33
carlwilson Sep 4, 2024
08b35f9
Merge branch 'integration' into dev/1.33
carlwilson Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions jhove-apps/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>org.openpreservation.jhove</groupId>
<artifactId>jhove</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>

<artifactId>jhove-apps</artifactId>
<packaging>jar</packaging>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>


<name>JHOVE Applications</name>
Expand Down Expand Up @@ -60,7 +60,7 @@
<dependency>
<groupId>org.openpreservation.jhove</groupId>
<artifactId>jhove-core</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
58 changes: 58 additions & 0 deletions jhove-bbt/scripts/create-1.33-target.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
#!/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}"

2 changes: 1 addition & 1 deletion jhove-bbt/scripts/travis-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.30
BASELINE_VERSION=1.32

# Create the JHOVE test root if it doesn't exist
[[ -d "${TEST_ROOT}" ]] || mkdir -p "${TEST_ROOT}"
Expand Down
2 changes: 1 addition & 1 deletion jhove-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.openpreservation.jhove</groupId>
<artifactId>jhove</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>

<artifactId>jhove-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jhove-ext-modules/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openpreservation.jhove</groupId>
<artifactId>jhove</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>

<artifactId>jhove-ext-modules</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions jhove-installer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.openpreservation.jhove</groupId>
<artifactId>jhove</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>

<artifactId>jhove-installer</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
<name>JHOVE Installer</name>
<description>Maven-built IzPack installer for JHOVE.</description>

Expand Down
2 changes: 1 addition & 1 deletion jhove-modules/aiff-hul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openpreservation.jhove.modules</groupId>
<artifactId>jhove-modules</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>
<artifactId>aiff-hul</artifactId>
<version>1.6.2</version>
Expand Down
2 changes: 1 addition & 1 deletion jhove-modules/ascii-hul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openpreservation.jhove.modules</groupId>
<artifactId>jhove-modules</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>
<artifactId>ascii-hul</artifactId>
<version>1.4.2</version>
Expand Down
2 changes: 1 addition & 1 deletion jhove-modules/gif-hul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openpreservation.jhove.modules</groupId>
<artifactId>jhove-modules</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>
<artifactId>gif-hul</artifactId>
<version>1.4.3</version>
Expand Down
2 changes: 1 addition & 1 deletion jhove-modules/html-hul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openpreservation.jhove.modules</groupId>
<artifactId>jhove-modules</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>
<artifactId>html-hul</artifactId>
<version>1.4.4</version>
Expand Down
2 changes: 1 addition & 1 deletion jhove-modules/jpeg-hul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openpreservation.jhove.modules</groupId>
<artifactId>jhove-modules</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>
<artifactId>jpeg-hul</artifactId>
<version>1.5.4</version>
Expand Down
2 changes: 1 addition & 1 deletion jhove-modules/jpeg2000-hul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openpreservation.jhove.modules</groupId>
<artifactId>jhove-modules</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>
<artifactId>jpeg2000-hul</artifactId>
<version>1.4.4</version>
Expand Down
2 changes: 1 addition & 1 deletion jhove-modules/pdf-hul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openpreservation.jhove.modules</groupId>
<artifactId>jhove-modules</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>
<artifactId>pdf-hul</artifactId>
<version>1.12.7</version>
Expand Down
6 changes: 3 additions & 3 deletions jhove-modules/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
<parent>
<groupId>org.openpreservation.jhove</groupId>
<artifactId>jhove</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>

<groupId>org.openpreservation.jhove.modules</groupId>
<artifactId>jhove-modules</artifactId>
<packaging>pom</packaging>
<version>1.32.0</version>
<version>1.33.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.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jhove-modules/tiff-hul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openpreservation.jhove.modules</groupId>
<artifactId>jhove-modules</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>
<artifactId>tiff-hul</artifactId>
<version>1.9.5</version>
Expand Down
2 changes: 1 addition & 1 deletion jhove-modules/utf8-hul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openpreservation.jhove.modules</groupId>
<artifactId>jhove-modules</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>
<artifactId>utf8-hul</artifactId>
<version>1.7.4</version>
Expand Down
2 changes: 1 addition & 1 deletion jhove-modules/wave-hul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openpreservation.jhove.modules</groupId>
<artifactId>jhove-modules</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>
<artifactId>wave-hul</artifactId>
<version>1.8.3</version>
Expand Down
2 changes: 1 addition & 1 deletion jhove-modules/xml-hul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.openpreservation.jhove.modules</groupId>
<artifactId>jhove-modules</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
</parent>
<artifactId>xml-hul</artifactId>
<version>1.5.5</version>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>org.openpreservation.jhove</groupId>
<artifactId>jhove</artifactId>
<version>1.32.0</version>
<version>1.33.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>JHOVE - JSTOR/Harvard Object Validation Environment</name>
Expand Down
Loading