You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by lf...@apache.org on 2017/04/24 17:12:50 UTC

[tika] branch master updated: Revert "change scope of jai-imageio-core (TIKA-2338)"

This is an automated email from the ASF dual-hosted git repository.

lfcnassif pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git

The following commit(s) were added to refs/heads/master by this push:
       new  34b630b   Revert "change scope of jai-imageio-core (TIKA-2338)"
34b630b is described below

commit 34b630bef34efaef264187935d48c9fcf2e0947e
Author: lfcnassif <lf...@gmail.com>
AuthorDate: Mon Apr 24 14:12:19 2017 -0300

    Revert "change scope of jai-imageio-core (TIKA-2338)"
    
    This reverts commit 80e6991fed9996ce0304be99d088c2124401f813.
---
 tika-parsers/pom.xml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 5e90ef0..ef20139 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -171,14 +171,6 @@
       <artifactId>jempbox</artifactId>
       <version>${jempbox.version}</version>
     </dependency>
-    <!-- TIKA-2338: PDFBox declares the jai-imageio-core dependency
-         as optional, but we prefer to have it always to support
-         tiff and other image formats -->
-    <dependency>
-      <groupId>com.github.jai-imageio</groupId>
-      <artifactId>jai-imageio-core</artifactId>
-      <version>1.3.1</version>
-    </dependency>
     <!-- TIKA-370: PDFBox declares the Bouncy Castle dependencies
          as optional, but we prefer to have them always to avoid
          problems with encrypted PDFs. -->
@@ -376,10 +368,16 @@
       <scope>test</scope>
     </dependency>
     <!-- Copied from PDFBox:
-    For legal reasons (incompatible license), jai-imageio-jpeg2000 is to be used
+    For legal reasons (incompatible license), jai-imageio-core is to be used
     only in the tests and may not be distributed. See also LEGAL-195 -->
     <dependency>
       <groupId>com.github.jai-imageio</groupId>
+      <artifactId>jai-imageio-core</artifactId>
+      <version>1.3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.github.jai-imageio</groupId>
       <artifactId>jai-imageio-jpeg2000</artifactId>
       <version>1.3.0</version>
       <scope>test</scope>

-- 
To stop receiving notification emails like this one, please contact
['"commits@tika.apache.org" <co...@tika.apache.org>'].