Author: kwright
Date: Fri Apr 24 17:08:29 2015
New Revision: 1675901
URL: http://svn.apache.org/r1675901
Log:
Pull up fix for CONNECTORS-1190 from trunk
Modified:
manifoldcf/branches/release-2.1-branch/ (props changed)
manifoldcf/branches/release-2.1-branch/CHANGES.txt
manifoldcf/branches/release-2.1-branch/connectors/solr/pom.xml
Propchange: manifoldcf/branches/release-2.1-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 17:08:29 2015
@@ -125,4 +125,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1673722,1675781
+/manifoldcf/trunk:1673722,1675781,1675898
Modified: manifoldcf/branches/release-2.1-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.1-branch/CHANGES.txt?rev=1675901&r1=1675900&r2=1675901&view=diff
==============================================================================
--- manifoldcf/branches/release-2.1-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.1-branch/CHANGES.txt Fri Apr 24 17:08:29 2015
@@ -3,6 +3,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/branches/release-2.1-branch/connectors/solr/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.1-branch/connectors/solr/pom.xml?rev=1675901&r1=1675900&r2=1675901&view=diff
==============================================================================
--- manifoldcf/branches/release-2.1-branch/connectors/solr/pom.xml (original)
+++ manifoldcf/branches/release-2.1-branch/connectors/solr/pom.xml Fri Apr 24
17:08:29 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>
