Author: kwright
Date: Fri Jul 31 22:54:49 2015
New Revision: 1693666
URL: http://svn.apache.org/r1693666
Log:
Pull up fix for CONNECTORS-1224 from trunk
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/CHANGES.txt
manifoldcf/branches/dev_1x/build.xml
manifoldcf/branches/dev_1x/connectors/hdfs/build.xml
manifoldcf/branches/dev_1x/connectors/hdfs/pom.xml
manifoldcf/branches/dev_1x/pom.xml
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 31 22:54:49 2015
@@ -124,4 +124,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,1666820,1668312,1669100,1669238,1669487,1669523,1669586,1669660,1670614,1670625,1670715,1671496,1672169,1672301,1672616,1672737,1673559,1673573,1673579,1673722,1675781,1675898,1676094,1676882,1676910,1678300,1678329,1678471,1678551,1679730,1679826,1681390,1681735,1682232,1682252,1682410,1682602,1682622,1682719,1683208,1683506,1683529,1683768,1684015,1684017,1684153,1684156,1684712,1684866,1685547,1687097,1687303,1687768,1688070,1688348,1688432,1689608,1690665,1692679
+/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,1668312,1669100,1669238,1669487,1669523,1669586,1669660,1670614,1670625,1670715,1671496,1672169,1672301,1672616,1672737,1673559,1673573,1673579,1673722,1675781,1675898,1676094,1676882,1676910,1678300,1678329,1678471,1678551,1679730,1679826,1681390,1681735,1682232,1682252,1682410,1682602,1682622,1682719,1683208,1683506,1683529,1683768,1684015,1684017,1684153,1684156,1684712,1684866,1685547,1687097,1687303,1687768,1688070,1688348,1688432,1689608,1690665,1692679,1693653
Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1693666&r1=1693665&r2=1693666&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Fri Jul 31 22:54:49 2015
@@ -3,6 +3,9 @@ $Id$
======================= 1.10-dev =====================
+CONNECTORS-1224: Upgrade to Hadoop 2.6.0.
+(Shinichiro Abe)
+
CONNECTORS-1222: Handle unregistered connector class in getActivitiesList().
(Thomas Daniel, Karl Wright)
Modified: manifoldcf/branches/dev_1x/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/build.xml?rev=1693666&r1=1693665&r2=1693666&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/build.xml (original)
+++ manifoldcf/branches/dev_1x/build.xml Fri Jul 31 22:54:49 2015
@@ -129,6 +129,7 @@
<property name="jackson-annotations.version" value="2.1.2"/>
<property name="resteasy.client.version" value="3.0.8.Final"/>
<property name="jsoup.version" value="1.8.1"/>
+ <property name="hadoop.version" value="2.6.0"/>
<target name="downloaded-condition">
@@ -1721,32 +1722,43 @@ 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/hadoop"/>
- <param name="artifact-version" value="2.2.0"/>
+ <param name="artifact-version" value="${hadoop.version}"/>
<param name="artifact-name" value="hadoop-common"/>
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="org/apache/hadoop"/>
- <param name="artifact-version" value="2.2.0"/>
+ <param name="artifact-version" value="${hadoop.version}"/>
<param name="artifact-name" value="hadoop-annotations"/>
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="org/apache/hadoop"/>
- <param name="artifact-version" value="2.2.0"/>
+ <param name="artifact-version" value="${hadoop.version}"/>
<param name="artifact-name" value="hadoop-auth"/>
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="org/apache/hadoop"/>
- <param name="artifact-version" value="2.2.0"/>
+ <param name="artifact-version" value="${hadoop.version}"/>
<param name="artifact-name" value="hadoop-hdfs"/>
<param name="artifact-type" value="jar"/>
</antcall>
</target>
+
+ <target name="download-htrace">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="org/htrace"/>
+ <param name="artifact-version" value="3.0.4"/>
+ <param name="artifact-name" value="htrace-core"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
<target name="download-protobuf">
<mkdir dir="lib"/>
@@ -2054,7 +2066,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps"
depends="download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-woodstox,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,downloa
d-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
+ <target name="make-core-deps"
depends="download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-woodstox,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,downloa
d-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Modified: manifoldcf/branches/dev_1x/connectors/hdfs/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/hdfs/build.xml?rev=1693666&r1=1693665&r2=1693666&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/hdfs/build.xml (original)
+++ manifoldcf/branches/dev_1x/connectors/hdfs/build.xml Fri Jul 31 22:54:49
2015
@@ -40,6 +40,7 @@
<include name="hadoop-auth*.jar"/>
<include name="hadoop-hdfs*.jar"/>
<include name="guava*.jar"/>
+ <include name="htrace-core*.jar"/>
<include name="protobuf-java*.jar"/>
</fileset>
</path>
@@ -55,6 +56,7 @@
<include name="hadoop-auth*.jar"/>
<include name="hadoop-hdfs*.jar"/>
<include name="guava*.jar"/>
+ <include name="htrace-core*.jar"/>
<include name="protobuf-java*.jar"/>
</fileset>
</copy>
Modified: manifoldcf/branches/dev_1x/connectors/hdfs/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/hdfs/pom.xml?rev=1693666&r1=1693665&r2=1693666&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/hdfs/pom.xml (original)
+++ manifoldcf/branches/dev_1x/connectors/hdfs/pom.xml Fri Jul 31 22:54:49 2015
@@ -364,7 +364,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>2.2.0</version>
+ <version>${hadoop.version}</version>
</dependency>
</dependencies>
</project>
Modified: manifoldcf/branches/dev_1x/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/pom.xml?rev=1693666&r1=1693665&r2=1693666&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/pom.xml (original)
+++ manifoldcf/branches/dev_1x/pom.xml Fri Jul 31 22:54:49 2015
@@ -87,6 +87,7 @@
<tika.version>1.7</tika.version>
<jhighlight.version>1.0.2</jhighlight.version>
<boilerpipe.version>1.1.0</boilerpipe.version>
+ <hadoop.version>2.6.0</hadoop.version>
</properties>
<modules>
