Return-Path: 
 <commits-return-3746-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 06160E2AF
	for <apmail-manifoldcf-commits-archive@www.apache.org>;
 Wed, 30 Jan 2013 01:26:35 +0000 (UTC)
Received: (qmail 40914 invoked by uid 500); 30 Jan 2013 01:26:35 -0000
Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org
Received: (qmail 40874 invoked by uid 500); 30 Jan 2013 01:26:34 -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 40866 invoked by uid 99); 30 Jan 2013 01:26:34 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jan 2013 01:26:34 +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; Wed, 30 Jan 2013 01:26:32 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 5E8F22388A32;
	Wed, 30 Jan 2013 01:26:12 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1440236 - in /manifoldcf/branches/release-1.1-branch: ./
 CHANGES.txt build.xml connectors/solr/pom.xml pom.xml
Date: Wed, 30 Jan 2013 01:26:12 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130130012612.5E8F22388A32@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>