Author: kwright
Date: Wed Jan 30 01:26:11 2013
New Revision: 1440236
URL: http://svn.apache.org/viewvc?rev=1440236&view=rev
Log:
Pull up fix for CONNECTORS-627 from trunk.
Modified:
manifoldcf/branches/release-1.1-branch/ (props changed)
manifoldcf/branches/release-1.1-branch/CHANGES.txt
manifoldcf/branches/release-1.1-branch/build.xml
manifoldcf/branches/release-1.1-branch/connectors/solr/pom.xml
manifoldcf/branches/release-1.1-branch/pom.xml
Propchange: manifoldcf/branches/release-1.1-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1439793
Modified: manifoldcf/branches/release-1.1-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/CHANGES.txt?rev=1440236&r1=1440235&r2=1440236&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.1-branch/CHANGES.txt Wed Jan 30 01:26:11 2013
@@ -3,6 +3,9 @@ $Id$
======================= Release 1.1 =====================
+CONNECTORS-627: Upgrade SolrJ to 4.1.0 from 4.0.0
+(Minoru Osuka)
+
CONNECTORS-623: The stream_size and stream_name can be sent to Solr now.
(Shinichiro Abe)
Modified: manifoldcf/branches/release-1.1-branch/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/build.xml?rev=1440236&r1=1440235&r2=1440236&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/build.xml (original)
+++ manifoldcf/branches/release-1.1-branch/build.xml Wed Jan 30 01:26:11 2013
@@ -3561,14 +3561,14 @@ Use Apache Forrest version forrest-0.9-d
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="org/apache/solr"/>
- <param name="artifact-version" value="4.0.0"/>
+ <param name="artifact-version" value="4.1.0"/>
<param name="artifact-name" value="solr-solrj"/>
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="org/apache/zookeeper"/>
- <param name="artifact-version" value="3.3.6"/>
+ <param name="artifact-version" value="3.4.5"/>
<param name="artifact-name" value="zookeeper"/>
<param name="artifact-type" value="jar"/>
</antcall>
Modified: manifoldcf/branches/release-1.1-branch/connectors/solr/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/connectors/solr/pom.xml?rev=1440236&r1=1440235&r2=1440236&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/connectors/solr/pom.xml (original)
+++ manifoldcf/branches/release-1.1-branch/connectors/solr/pom.xml Wed Jan 30
01:26:11 2013
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
- <version>4.0.0</version>
+ <version>${solr.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Modified: manifoldcf/branches/release-1.1-branch/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/pom.xml?rev=1440236&r1=1440235&r2=1440236&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/pom.xml (original)
+++ manifoldcf/branches/release-1.1-branch/pom.xml Wed Jan 30 01:26:11 2013
@@ -49,6 +49,7 @@
<commons-collections.version>3.2.1</commons-collections.version>
<commons-fileupload.version>1.2.2</commons-fileupload.version>
<httpcomponent.version>4.2.3</httpcomponent.version>
+ <solr.version>4.1.0</solr.version>
<commons-el.version>1.0</commons-el.version>
<commons-lang.version>2.6</commons-lang.version>
<xalan.version>2.7.1</xalan.version>
