manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1354269 - in /manifoldcf/integration/solr-3.x/trunk: CHANGES.txt README.txt build.xml mcf/ivy.xml
Date Tue, 26 Jun 2012 22:20:53 GMT
Author: kwright
Date: Tue Jun 26 22:20:51 2012
New Revision: 1354269

URL: http://svn.apache.org/viewvc?rev=1354269&view=rev
Log:
Fix for CONNECTORS-485.

Added:
    manifoldcf/integration/solr-3.x/trunk/mcf/ivy.xml   (with props)
Modified:
    manifoldcf/integration/solr-3.x/trunk/CHANGES.txt
    manifoldcf/integration/solr-3.x/trunk/README.txt
    manifoldcf/integration/solr-3.x/trunk/build.xml

Modified: manifoldcf/integration/solr-3.x/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-3.x/trunk/CHANGES.txt?rev=1354269&r1=1354268&r2=1354269&view=diff
==============================================================================
--- manifoldcf/integration/solr-3.x/trunk/CHANGES.txt (original)
+++ manifoldcf/integration/solr-3.x/trunk/CHANGES.txt Tue Jun 26 22:20:51 2012
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 0.2-incubating-dev =====================
 
+CONNECTORS-485: Update to Solr 3.6.
+(Karl Wright)
+
 CONNECTORS-354: Add a parameter to allow the maximum connection pool
 size to be configurated in solrconfig.xml.
 (Karl Wright)

Modified: manifoldcf/integration/solr-3.x/trunk/README.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-3.x/trunk/README.txt?rev=1354269&r1=1354268&r2=1354269&view=diff
==============================================================================
--- manifoldcf/integration/solr-3.x/trunk/README.txt (original)
+++ manifoldcf/integration/solr-3.x/trunk/README.txt Tue Jun 26 22:20:51 2012
@@ -22,12 +22,15 @@ Instructions for Building Apache Manifol
    on your command path.  To test this, issue a "java -version" command from your
    shell and verify that the Java version is 1.5 or greater.
 
-2. Download the Apache Ant binary distribution (1.7.0 or greater) from http://ant.apache.org.
+2. Download the Apache Ant binary distribution (1.8.2 or greater) from http://ant.apache.org.
    You will need Ant installed and the %ANT_HOME%\bin directory included on your
    command path.  To test this, issue a "ant -version" command from your
    shell and verify that Ant is available.
 
-3. In a shell, change to the root directory of the source (where you find the outermost
+3. Download the Apache Ivy binary distribution (2.2.0 or greater) from http://ant.apache.org/ivy.
+    Copy the ivy jar into the ant lib area into the %ANT_HOME%\lib directory.
+
+4. In a shell, change to the root directory of the source (where you find the outermost
    build.xml file), and type "ant" for directions.
 
 

Modified: manifoldcf/integration/solr-3.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-3.x/trunk/build.xml?rev=1354269&r1=1354268&r2=1354269&view=diff
==============================================================================
--- manifoldcf/integration/solr-3.x/trunk/build.xml (original)
+++ manifoldcf/integration/solr-3.x/trunk/build.xml Tue Jun 26 22:20:51 2012
@@ -27,9 +27,9 @@
   
   <target name="download-solr">
     <mkdir dir="solr" />
-    <exec dir="solr" executable="svn" failifexecutionfails="true">
+    <exec dir="solr" executable="svn" failifexecutionfails="true" failonerror="true">
       <arg value="checkout" />
-      <arg value="http://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x" />
+      <arg value="http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_6_0/"
/>
       <arg value="." />
     </exec>
   </target>

Added: manifoldcf/integration/solr-3.x/trunk/mcf/ivy.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-3.x/trunk/mcf/ivy.xml?rev=1354269&view=auto
==============================================================================
--- manifoldcf/integration/solr-3.x/trunk/mcf/ivy.xml (added)
+++ manifoldcf/integration/solr-3.x/trunk/mcf/ivy.xml Tue Jun 26 22:20:51 2012
@@ -0,0 +1,33 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="2.0">
+    <info organisation="org.apache.solr" module="mcf"/>
+    <dependencies>
+      <dependency org="commons-codec" name="commons-codec" rev="1.6" transitive="false"/>
+      <dependency org="commons-fileupload" name="commons-fileupload" rev="1.2.1" transitive="false"/>
+      <dependency org="org.apache.httpcomponents" name="httpcore" rev="4.1.4" transitive="false"/>
+      <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.1.3" transitive="false"/>
+      <dependency org="org.apache.httpcomponents" name="httpmime" rev="4.1.3" transitive="false"/>
+      <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" transitive="false"/>
+      <dependency org="commons-io" name="commons-io" rev="2.1" transitive="false"/>
+      <dependency org="commons-lang" name="commons-lang" rev="2.6" transitive="false"/>
+      <dependency org="junit" name="junit" rev="4.10" transitive="false"/>
+      <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
+    </dependencies>
+</ivy-module>

Propchange: manifoldcf/integration/solr-3.x/trunk/mcf/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/integration/solr-3.x/trunk/mcf/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message