Skip to content

Commit

Permalink
Merge pull request #235 from harvard-lts/dev
Browse files Browse the repository at this point in the history 
Update dependencies; expected test result.
  • Loading branch information
@daveneiman
daveneiman authored Dec 14, 2021
2 parents e8a2adc + 9d16e02 commit 19ff874
Show file tree
Hide file tree
Showing 21 changed files with 631 additions and 621 deletions.
Binary file removed lib-local/edu/harvard/huit/lts/ots/1.0.51/ots-1.0.51.jar
View file
Binary file not shown.
Binary file added lib-local/edu/harvard/huit/lts/ots/1.0.56/ots-1.0.56.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ...arvard/huit/lts/ots/1.0.51/ots-1.0.51.pom → ...arvard/huit/lts/ots/1.0.56/ots-1.0.56.pom
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>edu.harvard.huit.lts</groupId>
<artifactId>ots</artifactId>
<version>1.0.51</version>
<version>1.0.56</version>
<description>POM was created from install:install-file</description>
</project>
6 changes: 3 additions & 3 deletions lib-local/edu/harvard/huit/lts/ots/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<groupId>edu.harvard.huit.lts</groupId>
<artifactId>ots</artifactId>
<versioning>
<release>1.0.51</release>
<release>1.0.56</release>
<versions>
<version>1.0.51</version>
<version>1.0.56</version>
</versions>
<lastUpdated>20190611151235</lastUpdated>
<lastUpdated>20211214193341</lastUpdated>
</versioning>
</metadata>
10 changes: 5 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>edu.harvard.huit.lts</groupId>
<artifactId>fits</artifactId>
<version>1.5.0</version>
<version>1.5.1</version>
<packaging>jar</packaging>

<name>FITS</name>
Expand All @@ -24,23 +24,23 @@
<xmlunit.version>1.6</xmlunit.version>
<stax2.version>3.0.2</stax2.version>
<staxmate.version>2.0.1</staxmate.version>
<junit.version>4.12</junit.version>
<junit.version>4.13.2</junit.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-logging.version>1.2</commons-logging.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-io.version>2.4</commons-io.version>
<commons-io.version>2.11.0</commons-io.version>
<commons-cli.version>1.2</commons-cli.version>
<commons-configuration.version>1.8</commons-configuration.version>
<droid.version>6.4</droid.version>
<ots-schemas.version>1.0.53</ots-schemas.version>
<ots-schemas.version>1.0.56</ots-schemas.version>
<jhove.version>1.20.1</jhove.version>
<jna.version>4.1.0</jna.version>
<hclaps.version>2.1</hclaps.version>
<fast-md5.version>2.7.1</fast-md5.version>
<aes31.version>31.3</aes31.version>
<gson.version>2.4</gson.version>
<nzmetool.version>3.6GA</nzmetool.version>
<xerces-impl.version>2.9.1</xerces-impl.version>
<xerces-impl.version>2.12.1</xerces-impl.version>
<saxon.version>9.8.0-10</saxon.version>
<mvn-compiler-plgn.version>3.0</mvn-compiler-plgn.version>
</properties>
Expand Down
60 changes: 30 additions & 30 deletions testfiles/output/4072820.tif_XmlUnitExpectedOutput.xml
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="1.4.2-SNAPSHOT" timestamp="5/1/19 10:50 AM">
<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="1.5.0" timestamp="12/6/21 3:32 PM">
<identification>
<identity format="TIFF EXIF" mimetype="image/tiff" toolname="FITS" toolversion="1.4.2-SNAPSHOT">
<identity format="TIFF EXIF" mimetype="image/tiff" toolname="FITS" toolversion="1.5.0">
<tool toolname="Droid" toolversion="6.4" />
<tool toolname="Jhove" toolversion="1.20.1" />
<tool toolname="Exiftool" toolversion="11.14" />
<tool toolname="Exiftool" toolversion="11.54" />
<version toolname="Droid" toolversion="6.4" status="CONFLICT">2.2</version>
<version toolname="Jhove" toolversion="1.20.1" status="CONFLICT">6.0</version>
<externalIdentifier toolname="Droid" toolversion="6.4" type="puid">x-fmt/387</externalIdentifier>
</identity>
</identification>
<fileinfo>
<size toolname="Jhove" toolversion="1.20.1">13941032</size>
<creatingApplicationName toolname="Exiftool" toolversion="11.14" status="SINGLE_RESULT">Adobe Photoshop CS Macintosh</creatingApplicationName>
<lastmodified toolname="Exiftool" toolversion="11.14" status="CONFLICT">2005:12:15 12:46:50</lastmodified>
<lastmodified toolname="Tika" toolversion="1.20" status="CONFLICT">2005-12-15T07:46:50</lastmodified>
<created toolname="Exiftool" toolversion="11.14" status="SINGLE_RESULT">2005:12:15 10:56:19-05:00</created>
<filepath toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/4072820.tif</filepath>
<filename toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">4072820.tif</filename>
<md5checksum toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">4a333061a5619b94aa5afc3bb106eb54</md5checksum>
<fslastmodified toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">1516117982000</fslastmodified>
<creatingApplicationName toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">Adobe Photoshop CS Macintosh</creatingApplicationName>
<lastmodified toolname="Exiftool" toolversion="11.54" status="CONFLICT">2005:12:15 12:46:50</lastmodified>
<lastmodified toolname="Tika" toolversion="1.21" status="CONFLICT">2005-12-15T07:46:50</lastmodified>
<created toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2005:12:15 10:56:19-05:00</created>
<filepath toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/4072820.tif</filepath>
<filename toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">4072820.tif</filename>
<md5checksum toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">4a333061a5619b94aa5afc3bb106eb54</md5checksum>
<fslastmodified toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">1516117982000</fslastmodified>
</fileinfo>
<filestatus>
<well-formed toolname="Jhove" toolversion="1.20.1" status="SINGLE_RESULT">true</well-formed>
Expand All @@ -43,23 +43,23 @@
<bitsPerSample toolname="Jhove" toolversion="1.20.1">8 8 8</bitsPerSample>
<samplesPerPixel toolname="Jhove" toolversion="1.20.1">3</samplesPerPixel>
<scanningSoftwareName toolname="Jhove" toolversion="1.20.1">Adobe Photoshop CS Macintosh</scanningSoftwareName>
<digitalCameraModelName toolname="Exiftool" toolversion="11.14" status="SINGLE_RESULT">NIKON D100</digitalCameraModelName>
<digitalCameraModelName toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">NIKON D100</digitalCameraModelName>
<fNumber toolname="Jhove" toolversion="1.20.1">8</fNumber>
<exposureTime toolname="Jhove" toolversion="1.20.1" status="CONFLICT">0.033</exposureTime>
<exposureTime toolname="Exiftool" toolversion="11.14" status="CONFLICT">0.0333</exposureTime>
<exposureTime toolname="Exiftool" toolversion="11.54" status="CONFLICT">0.0333</exposureTime>
<exposureBiasValue toolname="Jhove" toolversion="1.20.1">0</exposureBiasValue>
<lightSource toolname="Jhove" toolversion="1.20.1">unknown</lightSource>
<meteringMode toolname="Jhove" toolversion="1.20.1">Pattern</meteringMode>
<flash toolname="Jhove" toolversion="1.20.1">Flash did not fire</flash>
<focalLength toolname="Exiftool" toolversion="11.14" status="SINGLE_RESULT">28.0</focalLength>
<iccProfileVersion toolname="Exiftool" toolversion="11.14" status="SINGLE_RESULT">2.1.0</iccProfileVersion>
<captureDevice toolname="Exiftool" toolversion="11.14" status="SINGLE_RESULT">digital still camera</captureDevice>
<digitalCameraManufacturer toolname="Exiftool" toolversion="11.14" status="SINGLE_RESULT">NIKON CORPORATION</digitalCameraManufacturer>
<exposureProgram toolname="Exiftool" toolversion="11.14" status="SINGLE_RESULT">Manual</exposureProgram>
<exifVersion toolname="Exiftool" toolversion="11.14" status="SINGLE_RESULT">0220</exifVersion>
<maxApertureValue toolname="Exiftool" toolversion="11.14" status="SINGLE_RESULT">2.8</maxApertureValue>
<sensingMethod toolname="Exiftool" toolversion="11.14" status="SINGLE_RESULT">One-chip color area sensor</sensingMethod>
<cfaPattern toolname="Exiftool" toolversion="11.14" status="SINGLE_RESULT">[Green,Red][Blue,Green]</cfaPattern>
<focalLength toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">28.0</focalLength>
<iccProfileVersion toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2.1.0</iccProfileVersion>
<captureDevice toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">digital still camera</captureDevice>
<digitalCameraManufacturer toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">NIKON CORPORATION</digitalCameraManufacturer>
<exposureProgram toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">Manual</exposureProgram>
<exifVersion toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">0220</exifVersion>
<maxApertureValue toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2.8</maxApertureValue>
<sensingMethod toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">One-chip color area sensor</sensingMethod>
<cfaPattern toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">[Green,Red][Blue,Green]</cfaPattern>
<standard>
<mix:mix xmlns:mix="http://www.loc.gov/mix/v20">
<mix:BasicDigitalObjectInformation>
Expand Down Expand Up @@ -183,20 +183,20 @@
</standard>
</image>
</metadata>
<statistics fitsExecutionTime="380">
<statistics fitsExecutionTime="309">
<tool toolname="MediaInfo" toolversion="0.7.75" status="did not run" />
<tool toolname="OIS Audio Information" toolversion="0.1" status="did not run" />
<tool toolname="ADL Tool" toolversion="0.1" status="did not run" />
<tool toolname="VTT Tool" toolversion="0.1" status="did not run" />
<tool toolname="Droid" toolversion="6.4" executionTime="180" />
<tool toolname="Jhove" toolversion="1.20.1" executionTime="369" />
<tool toolname="file utility" toolversion="5.31" executionTime="64" />
<tool toolname="Exiftool" toolversion="11.14" executionTime="246" />
<tool toolname="Droid" toolversion="6.4" executionTime="199" />
<tool toolname="Jhove" toolversion="1.20.1" executionTime="304" />
<tool toolname="file utility" toolversion="5.39" executionTime="36" />
<tool toolname="Exiftool" toolversion="11.54" executionTime="277" />
<tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="did not run" />
<tool toolname="OIS File Information" toolversion="0.2" executionTime="100" />
<tool toolname="OIS File Information" toolversion="1.0" executionTime="116" />
<tool toolname="OIS XML Metadata" toolversion="0.2" status="did not run" />
<tool toolname="ffident" toolversion="0.2" executionTime="7" />
<tool toolname="Tika" toolversion="1.20" executionTime="157" />
<tool toolname="ffident" toolversion="0.2" executionTime="3" />
<tool toolname="Tika" toolversion="1.21" executionTime="162" />
</statistics>
</fits>

85 changes: 43 additions & 42 deletions testfiles/output/HasAnnotations.pdf_XmlUnitExpectedOutput.xml
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="1.2.1" timestamp="3/30/18 1:04 PM">
<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="1.5.0" timestamp="12/6/21 4:05 PM">
<identification>
<identity format="Portable Document Format" mimetype="application/pdf" toolname="FITS" toolversion="1.2.1">
<tool toolname="Droid" toolversion="6.3" />
<tool toolname="Jhove" toolversion="1.20" />
<tool toolname="file utility" toolversion="5.31" />
<tool toolname="Exiftool" toolversion="10.00" />
<identity format="Portable Document Format" mimetype="application/pdf" toolname="FITS" toolversion="1.5.0">
<tool toolname="Droid" toolversion="6.4" />
<tool toolname="Jhove" toolversion="1.20.1" />
<tool toolname="file utility" toolversion="5.39" />
<tool toolname="Exiftool" toolversion="11.54" />
<tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" />
<tool toolname="ffident" toolversion="0.2" />
<tool toolname="Tika" toolversion="1.10" />
<version toolname="Droid" toolversion="6.3">1.5</version>
<externalIdentifier toolname="Droid" toolversion="6.3" type="puid">fmt/19</externalIdentifier>
<tool toolname="Tika" toolversion="1.21" />
<version toolname="Droid" toolversion="6.4" status="CONFLICT">1.5</version>
<version toolname="file utility" toolversion="5.39" status="CONFLICT">1.5 (password protected)</version>
<externalIdentifier toolname="Droid" toolversion="6.4" type="puid">fmt/19</externalIdentifier>
</identity>
</identification>
<fileinfo>
<size toolname="Jhove" toolversion="1.20">103323</size>
<creatingApplicationName toolname="Exiftool" toolversion="10.00">Adobe PDF Library 11.0/Acrobat PDFMaker 11 for Word</creatingApplicationName>
<lastmodified toolname="Exiftool" toolversion="10.00" status="CONFLICT">2015:08:19 17:12:03-04:00</lastmodified>
<lastmodified toolname="Tika" toolversion="1.10" status="CONFLICT">2015-08-19T21:12:03Z</lastmodified>
<created toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">2015:08:19 17:10:14-04:00</created>
<filepath toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/HasAnnotations.pdf</filepath>
<filename toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">HasAnnotations.pdf</filename>
<md5checksum toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">4475c0c78050f41718837eb3f8069cbd</md5checksum>
<fslastmodified toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">1516117983000</fslastmodified>
<size toolname="Jhove" toolversion="1.20.1">103323</size>
<creatingApplicationName toolname="Exiftool" toolversion="11.54">Adobe PDF Library 11.0/Acrobat PDFMaker 11 for Word</creatingApplicationName>
<lastmodified toolname="Exiftool" toolversion="11.54" status="CONFLICT">2015:08:19 17:12:03-04:00</lastmodified>
<lastmodified toolname="Tika" toolversion="1.21" status="CONFLICT">2015-08-19T21:12:03Z</lastmodified>
<created toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">2015:08:19 17:10:14-04:00</created>
<filepath toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/HasAnnotations.pdf</filepath>
<filename toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">HasAnnotations.pdf</filename>
<md5checksum toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">4475c0c78050f41718837eb3f8069cbd</md5checksum>
<fslastmodified toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">1516117983000</fslastmodified>
</fileinfo>
<filestatus>
<well-formed toolname="Jhove" toolversion="1.20" status="SINGLE_RESULT">true</well-formed>
<valid toolname="Jhove" toolversion="1.20" status="SINGLE_RESULT">true</valid>
<well-formed toolname="Jhove" toolversion="1.20.1" status="SINGLE_RESULT">true</well-formed>
<valid toolname="Jhove" toolversion="1.20.1" status="SINGLE_RESULT">true</valid>
</filestatus>
<metadata>
<document>
<title toolname="Exiftool" toolversion="10.00">Program Announcement</title>
<author toolname="Exiftool" toolversion="10.00">OUSD(AT&amp;L)</author>
<language toolname="Jhove" toolversion="1.20">EN-US</language>
<pageCount toolname="Jhove" toolversion="1.20">6</pageCount>
<isTagged toolname="Jhove" toolversion="1.20" status="CONFLICT">yes</isTagged>
<title toolname="Exiftool" toolversion="11.54">Program Announcement</title>
<author toolname="Exiftool" toolversion="11.54">OUSD(AT&amp;L)</author>
<language toolname="Jhove" toolversion="1.20.1">EN-US</language>
<pageCount toolname="Jhove" toolversion="1.20.1">6</pageCount>
<isTagged toolname="Jhove" toolversion="1.20.1" status="CONFLICT">yes</isTagged>
<isTagged toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">no</isTagged>
<hasOutline toolname="Jhove" toolversion="1.20">no</hasOutline>
<hasAnnotations toolname="Jhove" toolversion="1.20" status="SINGLE_RESULT">yes</hasAnnotations>
<font toolname="Jhove" toolversion="1.20" status="SINGLE_RESULT">
<hasOutline toolname="Jhove" toolversion="1.20.1">no</hasOutline>
<hasAnnotations toolname="Jhove" toolversion="1.20.1" status="SINGLE_RESULT">yes</hasAnnotations>
<font toolname="Jhove" toolversion="1.20.1" status="SINGLE_RESULT">
<fontName>ArialMT</fontName>
</font>
<font toolname="Jhove" toolversion="1.20" status="SINGLE_RESULT">
<font toolname="Jhove" toolversion="1.20.1" status="SINGLE_RESULT">
<fontName>Cambria</fontName>
</font>
<font toolname="Jhove" toolversion="1.20" status="SINGLE_RESULT">
<font toolname="Jhove" toolversion="1.20.1" status="SINGLE_RESULT">
<fontName>Cambria-Bold</fontName>
</font>
<font toolname="Jhove" toolversion="1.20" status="SINGLE_RESULT">
<font toolname="Jhove" toolversion="1.20.1" status="SINGLE_RESULT">
<fontName>Tahoma-Bold</fontName>
</font>
<font toolname="Jhove" toolversion="1.20" status="SINGLE_RESULT">
<font toolname="Jhove" toolversion="1.20.1" status="SINGLE_RESULT">
<fontName>TimesNewRomanPS-BoldMT</fontName>
</font>
<font toolname="Jhove" toolversion="1.20" status="SINGLE_RESULT">
<font toolname="Jhove" toolversion="1.20.1" status="SINGLE_RESULT">
<fontName>TimesNewRomanPSMT</fontName>
</font>
<hasForms toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="SINGLE_RESULT">no</hasForms>
Expand All @@ -73,20 +74,20 @@
</standard>
</document>
</metadata>
<statistics fitsExecutionTime="252">
<statistics fitsExecutionTime="294">
<tool toolname="MediaInfo" toolversion="0.7.75" status="did not run" />
<tool toolname="OIS Audio Information" toolversion="0.1" status="did not run" />
<tool toolname="ADL Tool" toolversion="0.1" status="did not run" />
<tool toolname="VTT Tool" toolversion="0.1" status="did not run" />
<tool toolname="Droid" toolversion="6.3" executionTime="6" />
<tool toolname="Jhove" toolversion="1.20" executionTime="111" />
<tool toolname="file utility" toolversion="5.31" executionTime="70" />
<tool toolname="Exiftool" toolversion="10.00" executionTime="242" />
<tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" executionTime="26" />
<tool toolname="OIS File Information" toolversion="0.2" executionTime="3" />
<tool toolname="Droid" toolversion="6.4" executionTime="9" />
<tool toolname="Jhove" toolversion="1.20.1" executionTime="88" />
<tool toolname="file utility" toolversion="5.39" executionTime="60" />
<tool toolname="Exiftool" toolversion="11.54" executionTime="284" />
<tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" executionTime="18" />
<tool toolname="OIS File Information" toolversion="1.0" executionTime="4" />
<tool toolname="OIS XML Metadata" toolversion="0.2" status="did not run" />
<tool toolname="ffident" toolversion="0.2" executionTime="6" />
<tool toolname="Tika" toolversion="1.10" executionTime="63" />
<tool toolname="ffident" toolversion="0.2" executionTime="9" />
<tool toolname="Tika" toolversion="1.21" executionTime="50" />
</statistics>
</fits>

Loading

0 comments on commit 19ff874

Please sign in to comment.