Merge branch 'master' into object-rec-and-embedded

# Conflicts:
#	project.clj

Author: dtsukiji

ChangeLog.md

@@ -1,3 +1,20 @@
+## Changes between Pantomime 2.11.0 and 2.12.0 (unreleased)
+
+No changes yet.
+
+
+## Changes between Pantomime 2.10.0 and 2.11.0 (March 6th, 2019)
+
+### Apache Tika 1.19.1
+
+Apache Tika dependency has been upgraded to [1.19.1](https://tika.apache.org/1.19.1/index.html).
+
+GitHub issue: [#29](https://github.com/michaelklishin/pantomime/issues/29)
+
+### Clojure 1.10
+
+The library now depends on Clojure 1.10.
+
 ## Changes between Pantomime 2.9.0 and 2.10.0 (Jan 19th, 2018)
 
 ### Apache Tika 1.17
@@ -21,12 +38,10 @@ Several functions now accept `TikaConfig` instances.
 
 Contributed by ejshoen.
 
-
-## Clojure 1.8
+### Clojure 1.8
 
 The library now depends on Clojure 1.8.
 
-
 ### Namespaced Keys
 
 Extraction functions now return namespaced keywords.

README.md

@@ -26,21 +26,23 @@ using Maven, add the following repository definition to your
 With Leiningen:
 
 ```clojure
-[com.novemberain/pantomime "2.9.0"]
+[com.novemberain/pantomime "2.11.0"]
 ```
 
 With Maven:
 
-    <dependency>
-      <groupId>com.novemberain</groupId>
-      <artifactId>pantomime</artifactId>
-      <version>2.9.0</version>
-    </dependency>
+``` xml
+<dependency>
+  <groupId>com.novemberain</groupId>
+  <artifactId>pantomime</artifactId>
+  <version>2.11.0</version>
+</dependency>
+```
 
 
 ## Supported Clojure versions
 
-Pantomime requires Clojure 1.6+. The most recent stable
+Pantomime requires Clojure 1.8+. The most recent stable
 release is highly recommended.
 
 
@@ -266,6 +268,6 @@ tests pass, submit a pull request on Github.
 
 ## License
 
-Copyright (C) 2011-2016 Michael S. Klishin, and the ClojureWerkz team.
+Copyright (C) 2011-2019 Michael S. Klishin, and the ClojureWerkz team.
 
 Distributed under the Eclipse Public License, the same as Clojure.

project.clj

@@ -1,22 +1,22 @@
-(defproject com.novemberain/pantomime "2.10.1"
+(defproject com.novemberain/pantomime "2.12.0-SNAPSHOT"
   :min-lein-version "2.5.1"
   :description "A minimalistic Clojure interface to Apache Tika"
   :url "http://github.com/michaelklishin/pantomime"
   :license { :name "Eclipse Public License" }
   :source-paths ["src/clojure"]
-  :dependencies [[org.clojure/clojure "1.9.0"]
-                 [org.apache.tika/tika-parsers "1.17"]
-                 [org.apache.tika/tika-dl "1.17"]
-                 [org.apache.commons/commons-compress "1.15"]]
+  :dependencies [[org.clojure/clojure "1.10.0"]
+                 [org.apache.tika/tika-parsers "1.19.1"]
+                 [org.apache.tika/tika-dl "1.19.1"]
+                 [org.apache.commons/commons-compress "1.18"]]
   :profiles {:dev {:resource-paths ["test/resources"]
-                   :dependencies [[clj-http "3.7.0"]]}
-             :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}
-             :master {:dependencies [[org.clojure/clojure "1.10.0-master-SNAPSHOT"]]}
+                   :dependencies [[clj-http "3.9.1"]]}
+             :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
+             :master {:dependencies [[org.clojure/clojure "1.11.0-master-SNAPSHOT"]]}
              }
-  :repositories {"sonatype" {:url "http://oss.sonatype.org/content/repositories/releases"
+  :repositories {"sonatype" {:url "https://oss.sonatype.org/content/repositories/releases"
                              :snapshots false
                              :releases {:checksum :fail :update :always}}
-                 "sonatype-snapshots" {:url "http://oss.sonatype.org/content/repositories/snapshots"
+                 "sonatype-snapshots" {:url "https://oss.sonatype.org/content/repositories/snapshots"
                                        :snapshots true
                                        :releases {:checksum :fail :update :always}}}
   :aliases  {"all" ["with-profile" "+dev:+1.8:+master"]}

src/clojure/pantomime/extract.clj

@@ -3,7 +3,6 @@
             [clojure.string :as string]
             [clojure.java.io :refer [input-stream copy]])
   (:import [java.io File InputStream ByteArrayInputStream]
-           [org.apache.tika Tika]
            [java.net URL]
            [org.apache.tika.metadata Metadata]
            [org.apache.tika.sax BodyContentHandler]