You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2015/03/15 19:34:34 UTC
svn commit: r1666821 - in /manifoldcf/branches/dev_1x: ./ build.xml
connectors/solr/build.xml
Author: kwright
Date: Sun Mar 15 18:34:34 2015
New Revision: 1666821
URL: http://svn.apache.org/r1666821
Log:
Update the solr plugins
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/build.xml
manifoldcf/branches/dev_1x/connectors/solr/build.xml
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 15 18:34:34 2015
@@ -121,4 +121,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163
4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608,1648686,1648976,1649201,1649203,1649529,1649605,1649628,1649794,1650351,1650722,1650741-1650742,1650745,1650747,1650911,1650954,1651332,1651539,1651907,1651921,1652071,1652974,1653175,1653899,1654651,1655205,1655261,1655264,1655377,1655411,1655618,1655914,1657346,1657443,1658004,1658036,1658121,1658155,1658188,1658463,1658476,
1660258,1660276,1661454,1665848,1666160,1666781
+/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163
4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608,1648686,1648976,1649201,1649203,1649529,1649605,1649628,1649794,1650351,1650722,1650741-1650742,1650745,1650747,1650911,1650954,1651332,1651539,1651907,1651921,1652071,1652974,1653175,1653899,1654651,1655205,1655261,1655264,1655377,1655411,1655618,1655914,1657346,1657443,1658004,1658036,1658121,1658155,1658188,1658463,1658476,
1660258,1660276,1661454,1665848,1666160,1666781,1666820
Modified: manifoldcf/branches/dev_1x/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/build.xml?rev=1666821&r1=1666820&r2=1666821&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/build.xml (original)
+++ manifoldcf/branches/dev_1x/build.xml Sun Mar 15 18:34:34 2015
@@ -1644,16 +1644,21 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-solr-plugins">
<mkdir dir="lib/solr-3.x"/>
<mkdir dir="build/download"/>
- <get src="https://www.apache.org/dist/manifoldcf/apache-manifoldcf-solr-3.x-plugin-2.0/apache-manifoldcf-solr-3.x-plugin-2.0-bin.zip" dest="build/download/apache-manifoldcf-solr-3.x-plugin-bin.zip"/>
+ <get src="https://www.apache.org/dist/manifoldcf/apache-manifoldcf-solr-3.x-plugin-2.1/apache-manifoldcf-solr-3.x-plugin-2.1-bin.zip" dest="build/download/apache-manifoldcf-solr-3.x-plugin-bin.zip"/>
<unzip src="build/download/apache-manifoldcf-solr-3.x-plugin-bin.zip" dest="build/download/apache-manifoldcf-solr-3.x-plugin-bin"/>
<copy todir="lib/solr-3.x">
- <fileset dir="build/download/apache-manifoldcf-solr-3.x-plugin-bin/apache-manifoldcf-solr-3.x-plugin-2.0"/>
+ <fileset dir="build/download/apache-manifoldcf-solr-3.x-plugin-bin/apache-manifoldcf-solr-3.x-plugin-2.1"/>
</copy>
<mkdir dir="lib/solr-4.x"/>
- <get src="https://www.apache.org/dist/manifoldcf/apache-manifoldcf-solr-4.x-plugin-2.0/apache-manifoldcf-solr-4.x-plugin-2.0-bin.zip" dest="build/download/apache-manifoldcf-solr-4.x-plugin-bin.zip"/>
+ <get src="https://www.apache.org/dist/manifoldcf/apache-manifoldcf-solr-4.x-plugin-2.1/apache-manifoldcf-solr-4.x-plugin-2.1-bin.zip" dest="build/download/apache-manifoldcf-solr-4.x-plugin-bin.zip"/>
<unzip src="build/download/apache-manifoldcf-solr-4.x-plugin-bin.zip" dest="build/download/apache-manifoldcf-solr-4.x-plugin-bin"/>
<copy todir="lib/solr-4.x">
- <fileset dir="build/download/apache-manifoldcf-solr-4.x-plugin-bin/apache-manifoldcf-solr-4.x-plugin-2.0"/>
+ <fileset dir="build/download/apache-manifoldcf-solr-4.x-plugin-bin/apache-manifoldcf-solr-4.x-plugin-2.1"/>
+ </copy>
+ <get src="https://www.apache.org/dist/manifoldcf/apache-manifoldcf-solr-5.x-plugin-2.1/apache-manifoldcf-solr-5.x-plugin-2.1-bin.zip" dest="build/download/apache-manifoldcf-solr-5.x-plugin-bin.zip"/>
+ <unzip src="build/download/apache-manifoldcf-solr-5.x-plugin-bin.zip" dest="build/download/apache-manifoldcf-solr-5.x-plugin-bin"/>
+ <copy todir="lib/solr-5.x">
+ <fileset dir="build/download/apache-manifoldcf-solr-5.x-plugin-bin/apache-manifoldcf-solr-5.x-plugin-2.1"/>
</copy>
</target>
Modified: manifoldcf/branches/dev_1x/connectors/solr/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/solr/build.xml?rev=1666821&r1=1666820&r2=1666821&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/solr/build.xml (original)
+++ manifoldcf/branches/dev_1x/connectors/solr/build.xml Sun Mar 15 18:34:34 2015
@@ -63,6 +63,10 @@
<copy todir="dist/integration/solr-4.x">
<fileset dir="../../lib/solr-4.x"/>
</copy>
+ <mkdir dir="dist/integration/solr-5.x"/>
+ <copy todir="dist/integration/solr-5.x">
+ <fileset dir="../../lib/solr-5.x"/>
+ </copy>
</target>
<target name="deliver-connector" depends="mcf-connector-build.deliver-connector">