You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2011/03/03 15:21:47 UTC

svn commit: r1076635 - in /jackrabbit/trunk: jackrabbit-core/pom.xml jackrabbit-jca/pom.xml jackrabbit-parent/pom.xml jackrabbit-webapp/pom.xml

Author: jukka
Date: Thu Mar  3 14:21:47 2011
New Revision: 1076635

URL: http://svn.apache.org/viewvc?rev=1076635&view=rev
Log:
JCR-2885: Move tika-parsers dependency to deployment packages

Remove tika-parsers from jackrabbit-core (but still use it for testing)
and add it to jackrabbit-webapp and jackrabbit-jca.

Also exclude many of the lesser used or unneeded transitive dependencies.

Modified:
    jackrabbit/trunk/jackrabbit-core/pom.xml
    jackrabbit/trunk/jackrabbit-jca/pom.xml
    jackrabbit/trunk/jackrabbit-parent/pom.xml
    jackrabbit/trunk/jackrabbit-webapp/pom.xml

Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?rev=1076635&r1=1076634&r2=1076635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Thu Mar  3 14:21:47 2011
@@ -229,31 +229,13 @@ org.apache.jackrabbit.test.api.Shareable
     </dependency>
     <dependency>
       <groupId>org.apache.tika</groupId>
-      <artifactId>tika-parsers</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>edu.ucar</groupId>
-          <artifactId>netcdf</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xml-apis</groupId>
-          <artifactId>xml-apis</artifactId>
-        </exclusion>
-      </exclusions>
+      <artifactId>tika-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
     </dependency>
@@ -278,6 +260,21 @@ org.apache.jackrabbit.test.api.Shareable
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-parsers</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
       <scope>test</scope>

Modified: jackrabbit/trunk/jackrabbit-jca/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/pom.xml?rev=1076635&r1=1076634&r2=1076635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jca/pom.xml Thu Mar  3 14:21:47 2011
@@ -111,6 +111,16 @@
       <version>2.3-SNAPSHOT</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-parsers</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
     </dependency>

Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=1076635&r1=1076634&r2=1076635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Thu Mar  3 14:21:47 2011
@@ -268,6 +268,58 @@
         <groupId>org.apache.tika</groupId>
         <artifactId>tika-parsers</artifactId>
         <version>${tika.version}</version>
+        <exclusions>
+          <!-- Exclude the NetCDF and the related commons-httpclient -->
+          <!-- libraries since the related NetCDF and HDF file       -->
+          <!-- formats are not widely used beyond scientific data.   -->
+          <exclusion>
+            <groupId>edu.ucar</groupId>
+            <artifactId>netcdf</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+          </exclusion>
+          <!-- Exclude the Apache MIME4J library as it's used for    -->
+          <!-- parsing raw email messages and mbox files, which are  -->
+          <!-- typically only needed by a file-based email system.   -->
+          <exclusion>
+            <groupId>org.apache.james</groupId>
+            <artifactId>apache-mime4j</artifactId>
+          </exclusion>
+          <!-- Exclude the Commons Compress library as we don't want -->
+          <!-- to parse compressed archives like zips by default.    -->
+          <exclusion>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+          </exclusion>
+          <!-- Exclude the ASM library as it's only used for parsing -->
+          <!-- Java class files, for which there's typically no need -->
+          <!-- in a content repository.                              -->
+          <exclusion>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+          </exclusion>
+          <!-- Exclude the extractor library for EXIF and other      -->
+          <!-- image metadata as we normally don't want to parse     -->
+          <!-- images for full text indexing.                        -->
+          <exclusion>
+            <groupId>com.drewnoakes</groupId>
+            <artifactId>metadata-extractor</artifactId>
+          </exclusion>
+          <!-- Exclude the Rome library as we normally don't want to -->
+          <!-- parse RSS and Atom feeds for full text indexing.      -->
+          <exclusion>
+            <groupId>rome</groupId>
+            <artifactId>rome</artifactId>
+          </exclusion>
+          <!-- Exclude the Boilerpipe library as we don't use the    -->
+          <!-- BoilerpipeContentHandler functionality from Tika.     -->
+          <exclusion>
+            <groupId>de.l3s.boilerpipe</groupId>
+            <artifactId>boilerpipe</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.derby</groupId>

Modified: jackrabbit/trunk/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/pom.xml?rev=1076635&r1=1076634&r2=1076635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-webapp/pom.xml Thu Mar  3 14:21:47 2011
@@ -47,17 +47,20 @@
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
       <version>2.3-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-parsers</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>log4j-over-slf4j</artifactId>
-      <version>${slf4j.version}</version>
+      <artifactId>jcl-over-slf4j</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
@@ -122,11 +125,6 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
       <artifactId>jul-to-slf4j</artifactId>
       <version>${slf4j.version}</version>
       <scope>test</scope>