manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1675898 - in /manifoldcf/trunk: CHANGES.txt connectors/solr/pom.xml
Date Fri, 24 Apr 2015 17:03:19 GMT
Author: kwright
Date: Fri Apr 24 17:03:19 2015
New Revision: 1675898

URL: http://svn.apache.org/r1675898
Log:
Fix for CONNECTORS-1190.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/connectors/solr/pom.xml

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1675898&r1=1675897&r2=1675898&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Apr 24 17:03:19 2015
@@ -6,6 +6,10 @@ $Id$
 
 ======================= Release 2.1 =====================
 
+CONNECTORS-1190: Broken dependencies in solr connector maven build
+caused tests to fail under maven.
+(Piergiorgio Lucidi, Karl Wright)
+
 CONNECTORS-1187: Handle "File in Use" error properly in JCIFS connector.
 (Karl Wright)
 

Modified: manifoldcf/trunk/connectors/solr/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/pom.xml?rev=1675898&r1=1675897&r2=1675898&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/pom.xml (original)
+++ manifoldcf/trunk/connectors/solr/pom.xml Fri Apr 24 17:03:19 2015
@@ -205,6 +205,21 @@
       <groupId>org.apache.solr</groupId>
       <artifactId>solr-solrj</artifactId>
       <version>${solr.version}</version>
+      <exclusions>
+        <!--  Solrj pulls in an older httpclient -->
+        <exclusion>
+          <artifactId>httpclient</artifactId>
+          <groupId>org.apache.httpcomponents</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>httpcore</artifactId>
+          <groupId>org.apache.httpcomponents</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>httpmime</artifactId>
+          <groupId>org.apache.httpcomponents</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.noggit</groupId>
@@ -222,6 +237,16 @@
       <version>${httpcomponent.httpclient.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>${httpcomponent.httpcore.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpmime</artifactId>
+      <version>${httpcomponent.httpmime.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>${slf4j.version}</version>



Mime
View raw message