Repository: any23 Updated Branches: refs/heads/master 304e9d442 -> 2e396fff3
ANY23-250 Upgrade to Tika 1.7 Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/e47563ec Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/e47563ec Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/e47563ec Branch: refs/heads/master Commit: e47563ecc72572a97b612cded2717b2db4c5be72 Parents: cab71ae Author: Lewis John McGibbney <[email protected]> Authored: Fri Feb 27 10:44:41 2015 -0800 Committer: Lewis John McGibbney <[email protected]> Committed: Fri Feb 27 10:44:41 2015 -0800 ---------------------------------------------------------------------- .../java/org/apache/any23/mime/NaiveMIMETypeDetector.java | 5 +++++ .../java/org/apache/any23/mime/TikaMIMETypeDetectorTest.java | 2 +- .../apache/any23/plugin/officescraper/ExcelExtractor.java | 3 --- pom.xml | 8 ++++---- 4 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/e47563ec/mime/src/main/java/org/apache/any23/mime/NaiveMIMETypeDetector.java ---------------------------------------------------------------------- diff --git a/mime/src/main/java/org/apache/any23/mime/NaiveMIMETypeDetector.java b/mime/src/main/java/org/apache/any23/mime/NaiveMIMETypeDetector.java index 5e5108c..3a2c939 100644 --- a/mime/src/main/java/org/apache/any23/mime/NaiveMIMETypeDetector.java +++ b/mime/src/main/java/org/apache/any23/mime/NaiveMIMETypeDetector.java @@ -33,6 +33,11 @@ import java.util.regex.Pattern; public class NaiveMIMETypeDetector implements MIMETypeDetector { private final static Map<String, String> extensions = new HashMap<String, String>() { + /** + * + */ + private static final long serialVersionUID = 1L; + { // extension -> mime type put("html" , "text/html" ); http://git-wip-us.apache.org/repos/asf/any23/blob/e47563ec/mime/src/test/java/org/apache/any23/mime/TikaMIMETypeDetectorTest.java ---------------------------------------------------------------------- diff --git a/mime/src/test/java/org/apache/any23/mime/TikaMIMETypeDetectorTest.java b/mime/src/test/java/org/apache/any23/mime/TikaMIMETypeDetectorTest.java index f8e8cc2..688a55a 100644 --- a/mime/src/test/java/org/apache/any23/mime/TikaMIMETypeDetectorTest.java +++ b/mime/src/test/java/org/apache/any23/mime/TikaMIMETypeDetectorTest.java @@ -17,7 +17,7 @@ package org.apache.any23.mime; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.any23.mime.purifier.WhiteSpacesPurifier; import org.junit.After; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/any23/blob/e47563ec/plugins/office-scraper/src/main/java/org/apache/any23/plugin/officescraper/ExcelExtractor.java ---------------------------------------------------------------------- diff --git a/plugins/office-scraper/src/main/java/org/apache/any23/plugin/officescraper/ExcelExtractor.java b/plugins/office-scraper/src/main/java/org/apache/any23/plugin/officescraper/ExcelExtractor.java index 758d25e..4978581 100644 --- a/plugins/office-scraper/src/main/java/org/apache/any23/plugin/officescraper/ExcelExtractor.java +++ b/plugins/office-scraper/src/main/java/org/apache/any23/plugin/officescraper/ExcelExtractor.java @@ -23,8 +23,6 @@ import org.apache.any23.extractor.ExtractionParameters; import org.apache.any23.extractor.ExtractionResult; import org.apache.any23.extractor.Extractor; import org.apache.any23.extractor.ExtractorDescription; -import org.apache.any23.extractor.ExtractorFactory; -import org.apache.any23.extractor.SimpleExtractorFactory; import org.apache.any23.rdf.RDFUtils; import org.apache.any23.vocab.Excel; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -39,7 +37,6 @@ import org.openrdf.model.vocabulary.RDF; import java.io.IOException; import java.io.InputStream; -import java.util.Arrays; /** * Implementation of {@link org.apache.any23.extractor.Extractor.ContentExtractor} able to process http://git-wip-us.apache.org/repos/asf/any23/blob/e47563ec/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3a74e48..04fc613 100644 --- a/pom.xml +++ b/pom.xml @@ -280,7 +280,7 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.8</version> + <version>1.10</version> </dependency> <dependency> <groupId>commons-cli</groupId> @@ -290,7 +290,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.5</version> + <version>1.9</version> </dependency> <dependency> <groupId>net.sourceforge.nekohtml</groupId> @@ -302,12 +302,12 @@ <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-core</artifactId> - <version>1.4</version> + <version>1.7</version> </dependency> <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-parsers</artifactId> - <version>1.4</version> + <version>1.7</version> </dependency> <dependency> <groupId>org.apache.poi</groupId>
