You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2016/03/02 16:49:18 UTC

[5/5] james-project git commit: fix tika exclusions into server/pom.xml to prevent tika version downgrade

fix tika exclusions into server/pom.xml to prevent tika version downgrade


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7460ce87
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7460ce87
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7460ce87

Branch: refs/heads/master
Commit: 7460ce879d68bbc7d18d9f93d0bb24d0c3ccc02a
Parents: 337a2bb
Author: Matthieu Baechler <ma...@linagora.com>
Authored: Fri Feb 19 16:58:09 2016 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Wed Mar 2 16:03:57 2016 +0100

----------------------------------------------------------------------
 server/pom.xml | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/7460ce87/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index a236a0e..a10084d 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -162,7 +162,6 @@
         <openjpa.version>2.2.1</openjpa.version>
         <geronimo-jpa-spec.version>1.1</geronimo-jpa-spec.version>
         <jcr.version>2.0</jcr.version>
-        <tika-parsers.version>1.2</tika-parsers.version>
         <xbean-spring.version>3.12</xbean-spring.version>
         <netty.version>3.10.5.Final</netty.version>
         <geronimo-annotation-spec.version>1.0.1</geronimo-annotation-spec.version>
@@ -613,6 +612,24 @@
                 <groupId>org.apache.james</groupId>
                 <artifactId>apache-james-mailbox-tika</artifactId>
                 <version>${mailbox.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.pdfbox</groupId>
+                        <artifactId>pdfbox</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.poi</groupId>
+                        <artifactId>poi-ooxml</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.poi</groupId>
+                        <artifactId>poi-scratchpad</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>edu.ucar</groupId>
+                        <artifactId>netcdf</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.james</groupId>
@@ -1129,30 +1146,6 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.tika</groupId>
-                <artifactId>tika-parsers</artifactId>
-                <version>${tika-parsers.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.pdfbox</groupId>
-                        <artifactId>pdfbox</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.poi</groupId>
-                        <artifactId>poi-ooxml</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.poi</groupId>
-                        <artifactId>poi-scratchpad</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>edu.ucar</groupId>
-                        <artifactId>netcdf</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-core</artifactId>
                 <version>${camel.version}</version>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org