lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r1380915 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ dev-tools/maven/ dev-tools/maven/lucene/benchmark/ dev-tools/maven/solr/contrib/clustering/ dev-tools/maven/solr/contrib/extraction/ dev-tools/maven/solr/contrib/uima/ dev-tools/ma...
Date Tue, 04 Sep 2012 22:04:56 GMT
Author: rmuir
Date: Tue Sep  4 22:04:55 2012
New Revision: 1380915

URL: http://svn.apache.org/viewvc?rev=1380915&view=rev
Log:
LUCENE-4354: fix maven dependencies to be consistent with binary package (selckin's patch)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/clustering/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/extraction/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/uima/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/pom.xml.template

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template?rev=1380915&r1=1380914&r2=1380915&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template Tue Sep
 4 22:04:55 2012
@@ -91,6 +91,12 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.tukaani</groupId>
+          <artifactId>xz</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template?rev=1380915&r1=1380914&r2=1380915&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template Tue Sep  4 22:04:55 2012
@@ -47,7 +47,7 @@
     <java.compat.version>1.6</java.compat.version>
     <jetty.version>8.1.2.v20120308</jetty.version>
     <slf4j.version>1.6.4</slf4j.version>
-    <tika.version>1.1</tika.version>
+    <tika.version>1.2</tika.version>
     <httpcomponents.version>4.1.3</httpcomponents.version>
 
     <!-- RandomizedTesting library system properties -->
@@ -148,6 +148,12 @@
         <groupId>commons-digester</groupId>
         <artifactId>commons-digester</artifactId>
         <version>1.7</version>
+        <exclusions>
+          <exclusion>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>commons-fileupload</groupId>
@@ -168,6 +174,12 @@
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpmime</artifactId>
         <version>${httpcomponents.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>commons-lang</groupId>
@@ -208,11 +220,23 @@
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>4.10</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.ant</groupId>
         <artifactId>ant</artifactId>
         <version>1.8.2</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant-launcher</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
@@ -238,6 +262,28 @@
         <groupId>org.apache.tika</groupId>
         <artifactId>tika-parsers</artifactId>
         <version>${tika.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.gagravarr</groupId>
+            <artifactId>vorbis-java-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.uima</groupId>
@@ -363,6 +409,12 @@
         <groupId>xerces</groupId>
         <artifactId>xercesImpl</artifactId>
         <version>2.9.1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>com.carrotsearch.randomizedtesting</groupId>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1380915&r1=1380914&r2=1380915&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/clustering/pom.xml.template
(original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/clustering/pom.xml.template
Tue Sep  4 22:04:55 2012
@@ -86,6 +86,26 @@
           <groupId>org.apache.lucene</groupId>
           <artifactId>lucene-smartcn</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>net.java.dev.rome</groupId>
+          <artifactId>rome</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>net.java.dev.rome</groupId>
+          <artifactId>rome-fetcher</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jdom</groupId>
+          <artifactId>jdom</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>net.sf.ehcache</groupId>
+          <artifactId>ehcache-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.carrot2</groupId>
+          <artifactId>morfologik-stemming</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1380915&r1=1380914&r2=1380915&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/extraction/pom.xml.template
(original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/extraction/pom.xml.template
Tue Sep  4 22:04:55 2012
@@ -76,7 +76,6 @@
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
-      <version>2.8.1</version>
     </dependency>
     <dependency>
       <!-- SOLR-3263: Test scope dep is required to avoid jar signing conflicts -->

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1380915&r1=1380914&r2=1380915&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/uima/pom.xml.template Tue Sep
 4 22:04:55 2012
@@ -68,16 +68,18 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-digester</groupId>
-      <artifactId>commons-digester</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>AlchemyAPIAnnotator</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-digester</groupId>
+          <artifactId>commons-digester</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template?rev=1380915&r1=1380914&r2=1380915&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template Tue Sep  4 22:04:55
2012
@@ -140,10 +140,6 @@
       <artifactId>commons-fileupload</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
     </dependency>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/pom.xml.template?rev=1380915&r1=1380914&r2=1380915&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/pom.xml.template Tue Sep  4 22:04:55
2012
@@ -80,10 +80,6 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>



Mime
View raw message