Skip to content

Commit

Permalink
upgrade to tika 2.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pwinckles authored and awoods committed Nov 30, 2022
1 parent db36b22 commit 7eb66d4
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 23 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
- File 5.43
- Jhove 1.26.1
- MediaInfo 22.09
- Tika 2.3.0
- Tika 2.6.0
- Add FITS config option `consolidate-first-identity`, defaulted to `false`. This means that metadata from
all tools that identify a file is included, even if the identified format is _not_ the highest ranked
identity. This is a behavior change from previous versions. If you prefer the old behavior, set the value
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<embarc.version>0.2</embarc.version>

<!-- Tool properties -->
<tika.version>2.3.0</tika.version>
<tika.version>2.6.0</tika.version>
<tika.dir>lib/tika</tika.dir>
<droid.version>6.5.2</droid.version>
<droid.dir>lib/droid</droid.dir>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ private enum TikaProperty {

private static final Namespace fitsNS = Namespace.getNamespace(Fits.XML_NAMESPACE);
private static final String TOOL_NAME = "Tika";
private static final String TOOL_VERSION = "2.3.0"; // Hard-coded version till we can do better
private static final String TOOL_VERSION = "2.6.0"; // Hard-coded version till we can do better

private static final MimeTypes mimeTypes = MimeTypes.getDefaultMimeTypes();
private final Parser tikaParser;
Expand Down
5 changes: 2 additions & 3 deletions testfiles/output/4072820.tif_XmlUnitExpectedOutput.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
<fileinfo>
<size toolname="Jhove" toolversion="1.20.1">13941032</size>
<creatingApplicationName toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">Adobe Photoshop CS Macintosh</creatingApplicationName>
<lastmodified toolname="Exiftool" toolversion="12.40" status="CONFLICT">2005-12-15T12:46:50</lastmodified>
<lastmodified toolname="Tika" toolversion="2.3.0" status="CONFLICT">2005-12-15T07:46:50</lastmodified>
<lastmodified toolname="Exiftool" toolversion="12.50">2005-12-15T12:46:50</lastmodified>
<created toolname="Exiftool" toolversion="12.40" status="CONFLICT">2005-12-15T15:56:19Z</created>
<created toolname="Tika" toolversion="2.3.0" status="CONFLICT">2005-12-15T05:56:19</created>
<created toolname="Tika" toolversion="2.3.0" status="CONFLICT">2005-12-15T10:56:19</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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@
<size toolname="Jhove" toolversion="1.20.1">38829</size>
<creatingApplicationName toolname="Exiftool" toolversion="11.54" status="CONFLICT">Canon EOS 5D Mark II</creatingApplicationName>
<creatingApplicationName toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">Adobe Photoshop CS6 (Windows)</creatingApplicationName>
<lastmodified toolname="Exiftool" toolversion="12.40" status="CONFLICT">2017-01-30T11:39:51</lastmodified>
<lastmodified toolname="Tika" toolversion="2.3.0" status="CONFLICT">2017-01-30T06:39:51</lastmodified>
<lastmodified toolname="Exiftool" toolversion="12.50">2017-01-30T11:39:51</lastmodified>
<created toolname="Exiftool" toolversion="12.40" status="CONFLICT">2010-07-07T14:22:53</created>
<created toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">2017-01-30T11:39:51</created>
<created toolname="Tika" toolversion="2.3.0" status="CONFLICT">2010-07-07T10:22:53</created>
<filepath toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/ICFA.KC.BIA.1524-small.jpg</filepath>
<filename toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">ICFA.KC.BIA.1524-small.jpg</filename>
<md5checksum toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">0108175c9153da1d41278066a2e3c1a2</md5checksum>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@
<size toolname="Jhove" toolversion="1.20.1">4324778</size>
<creatingApplicationName toolname="Exiftool" toolversion="11.54" status="CONFLICT">HERO3+ Black Edition</creatingApplicationName>
<creatingApplicationName toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">Adobe Photoshop CS6 (Macintosh)</creatingApplicationName>
<lastmodified toolname="Exiftool" toolversion="12.40" status="CONFLICT">2015-06-25T11:03:38</lastmodified>
<lastmodified toolname="Tika" toolversion="2.3.0" status="CONFLICT">2015-06-25T07:03:38</lastmodified>
<lastmodified toolname="Exiftool" toolversion="12.50">2015-06-25T11:03:38</lastmodified>
<created toolname="Exiftool" toolversion="12.40" status="CONFLICT">2014-10-27T12:34:43</created>
<created toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">2015-06-25T11:03:38</created>
<created toolname="Tika" toolversion="2.3.0" status="CONFLICT">2014-10-27T08:34:43</created>
<filepath toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/JPEGTest_20170591--JPEGTest_20170591.jpeg</filepath>
<filename toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">JPEGTest_20170591--JPEGTest_20170591.jpeg</filename>
<md5checksum toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">3c5a86c471809d347e99d19c51bd1b94</md5checksum>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
<fileinfo>
<size toolname="Jhove" toolversion="1.20">35130</size>
<creatingApplicationName toolname="Exiftool" toolversion="11.01" status="SINGLE_RESULT">ImageMagick 6.5.4-9 2009-09-15 Q16 http://www.imagemagick.org</creatingApplicationName>
<lastmodified toolname="Exiftool" toolversion="12.40" status="CONFLICT">2006-12-19T15:08:15</lastmodified>
<lastmodified toolname="Tika" toolversion="2.3.0" status="CONFLICT">2006-12-19T10:08:15</lastmodified>
<created toolname="Tika" toolversion="2.3.0" status="SINGLE_RESULT">2006-12-19T10:08:15</created>
<lastmodified toolname="Exiftool" toolversion="12.50">2006-12-19T15:08:15</lastmodified>
<created toolname="Tika" toolversion="2.3.0" status="SINGLE_RESULT">2006-12-19T15:08:15</created>
<filepath toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/W00EGS1016782-I01JW30--I01JW300001__0001.tif</filepath>
<filename toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">W00EGS1016782-I01JW30--I01JW300001__0001.tif</filename>
<md5checksum toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">90f9a85c04e1bc2c5c1f689c110b1588</md5checksum>
Expand Down Expand Up @@ -64,7 +63,7 @@
</mix:BasicImageInformation>
<mix:ImageCaptureMetadata>
<mix:GeneralCaptureInformation>
<mix:dateTimeCreated>2006-12-19T10:08:15</mix:dateTimeCreated>
<mix:dateTimeCreated>2006-12-19T15:08:15</mix:dateTimeCreated>
</mix:GeneralCaptureInformation>
<mix:ScannerCapture>
<mix:ScanningSystemSoftware>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<subject toolname="Tika" toolversion="2.3.0" status="SINGLE_RESULT">fiction</subject>
<identifier toolname="Tika" toolversion="2.3.0" status="SINGLE_RESULT">urn:uuid:1a16ce38-82bd-4e9b-861e-773c2e787a50</identifier>
<language toolname="Tika" toolversion="2.3.0" status="SINGLE_RESULT">en-GB</language>
<title toolname="Tika" toolversion="2.3.0" status="SINGLE_RESULT">Alice's Adventures in Wonderland</title>
<author toolname="Tika" toolversion="2.3.0" status="SINGLE_RESULT">Lewis Carroll</author>
<title toolname="Tika" toolversion="2.3.0" status="SINGLE_RESULT">Alice's Adventures in Wonderland</title>
<standard>
<docmd:document xmlns:docmd="http://www.fcla.edu/docmd">
<docmd:Language>en-GB</docmd:Language>
Expand Down
4 changes: 1 addition & 3 deletions testfiles/output/gps.jpg_XmlUnitExpectedOutput.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@
<size toolname="Jhove" toolversion="1.20.1">41851</size>
<creatingApplicationName toolname="Exiftool" toolversion="11.54" status="CONFLICT">FinePix F30</creatingApplicationName>
<creatingApplicationName toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">Digital Camera FinePix F30 Ver1.02</creatingApplicationName>
<lastmodified toolname="Exiftool" toolversion="12.40" status="CONFLICT">2006-11-03T02:26:02</lastmodified>
<lastmodified toolname="Tika" toolversion="2.3.0" status="CONFLICT">2006-11-02T21:26:02</lastmodified>
<lastmodified toolname="Exiftool" toolversion="12.50">2006-11-03T02:26:02</lastmodified>
<created toolname="Exiftool" toolversion="12.40" status="CONFLICT">2006-11-03T07:14:39</created>
<created toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">2006-11-03T02:26:02</created>
<created toolname="Tika" toolversion="2.3.0" status="CONFLICT">2006-11-03T02:14:39</created>
<filepath toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/gps.jpg</filepath>
<filename toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">gps.jpg</filename>
<md5checksum toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">201f1db44775631d307b3ffd62acb3ac</md5checksum>
Expand Down
5 changes: 2 additions & 3 deletions testfiles/output/topazscanner.tif_XmlUnitExpectedOutput.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
<fileinfo>
<size toolname="Jhove" toolversion="1.20.1">5146108</size>
<creatingApplicationName toolname="Exiftool" toolversion="11.54" status="SINGLE_RESULT">Adobe Photoshop CS Macintosh</creatingApplicationName>
<lastmodified toolname="Exiftool" toolversion="12.40" status="CONFLICT">2006-11-28T13:30:06</lastmodified>
<lastmodified toolname="Tika" toolversion="2.3.0" status="CONFLICT">2006-11-28T08:30:06</lastmodified>
<lastmodified toolname="Exiftool" toolversion="12.50">2006-11-28T13:30:06</lastmodified>
<created toolname="Exiftool" toolversion="12.40" status="CONFLICT">2006-11-28T17:22:59Z</created>
<created toolname="Tika" toolversion="2.3.0" status="CONFLICT">2006-11-28T08:30:06</created>
<created toolname="Tika" toolversion="2.3.0" status="CONFLICT">2006-11-28T13:30:06</created>
<filepath toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/topazscanner.tif</filepath>
<filename toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">topazscanner.tif</filename>
<md5checksum toolname="OIS File Information" toolversion="1.0" status="SINGLE_RESULT">c2c36f561b1da65ff74ea2b22fe3fba0</md5checksum>
Expand Down

0 comments on commit 7eb66d4

Please sign in to comment.