Return-Path: 
 <commits-return-5431-apmail-manifoldcf-commits-archive=manifoldcf.apache.org@manifoldcf.apache.org>
X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org
Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 69F1B10EF6
	for <apmail-manifoldcf-commits-archive@www.apache.org>;
 Fri, 27 Dec 2013 09:20:22 +0000 (UTC)
Received: (qmail 81556 invoked by uid 500); 27 Dec 2013 09:20:20 -0000
Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org
Received: (qmail 81508 invoked by uid 500); 27 Dec 2013 09:20:16 -0000
Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@manifoldcf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@manifoldcf.apache.org>
List-Post: <mailto:commits@manifoldcf.apache.org>
List-Id: <commits.manifoldcf.apache.org>
Reply-To: dev@manifoldcf.apache.org
Delivered-To: mailing list commits@manifoldcf.apache.org
Received: (qmail 81501 invoked by uid 99); 27 Dec 2013 09:20:15 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Dec 2013 09:20:15 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Dec 2013 09:20:13 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 3462423888E2;
	Fri, 27 Dec 2013 09:19:52 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1553649 - in /manifoldcf/trunk: CHANGES.txt build.xml
 pom.xml
Date: Fri, 27 Dec 2013 09:19:52 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20131227091952.3462423888E2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kwright
Date: Fri Dec 27 09:19:51 2013
New Revision: 1553649

URL: http://svn.apache.org/r1553649
Log:
Upgrade to SolrJ 4.6.0.  Fix for CONNECTORS-847.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/pom.xml

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1553649&r1=1553648&r2=1553649&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Dec 27 09:19:51 2013
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 1.5-dev =====================
 
+CONNECTORS-847: Upgrade to SolrJ 4.6.0.
+(Karl Wright)
+
 CONNECTORS-814: Make File System output connector handle
 directory/file conflicts.
 (Karl Wright)

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1553649&r1=1553648&r2=1553649&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Fri Dec 27 09:19:51 2013
@@ -4200,12 +4200,12 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
     </target>
     
-	  <target name="download-solrj">
+    <target name="download-solrj">
         <mkdir dir="lib"/>
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="org/apache/solr"/>
-            <param name="artifact-version" value="4.3.1"/>
+            <param name="artifact-version" value="4.6.0"/>
             <param name="artifact-name" value="solr-solrj"/>
             <param name="artifact-type" value="jar"/>
         </antcall>

Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1553649&r1=1553648&r2=1553649&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Fri Dec 27 09:19:51 2013
@@ -51,7 +51,7 @@
     <httpcomponent.httpclient.version>4.2.6</httpcomponent.httpclient.version>
     <httpcomponent.httpcore.version>4.2.5</httpcomponent.httpcore.version>
     <httpcomponent.httpmime.version>4.2.6</httpcomponent.httpmime.version>
-    <solr.version>4.3.1</solr.version>
+    <solr.version>4.6.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>