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 2013/12/27 14:35:31 UTC
svn commit: r1553673 - in /manifoldcf/trunk: CHANGES.txt build.xml
connectors/hdfs/build.xml connectors/hdfs/pom.xml lib-license/LICENSE.txt
Author: kwright
Date: Fri Dec 27 13:35:31 2013
New Revision: 1553673
URL: http://svn.apache.org/r1553673
Log:
Fix for CONNECTORS-849. Upgrade to Hadoop 2.2.0 for the HDFS connector.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/hdfs/build.xml
manifoldcf/trunk/connectors/hdfs/pom.xml
manifoldcf/trunk/lib-license/LICENSE.txt
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1553673&r1=1553672&r2=1553673&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Dec 27 13:35:31 2013
@@ -3,6 +3,9 @@ $Id$
======================= 1.5-dev =====================
+CONNECTORS-849: Upgrade to Hadoop 2.2.0.
+(Karl Wright)
+
CONNECTORS-847: Upgrade to SolrJ 4.6.0.
(Karl Wright)
Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1553673&r1=1553672&r2=1553673&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Fri Dec 27 13:35:31 2013
@@ -4189,17 +4189,41 @@ Use Apache Forrest version forrest-0.9-d
</copy>
</target>
- <target name="download-hadoop">
+ <target name="download-hadoop" depends="download-guava">
<mkdir dir="lib"/>
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="org/apache/hadoop"/>
- <param name="artifact-version" value="1.1.2"/>
- <param name="artifact-name" value="hadoop-core"/>
+ <param name="artifact-version" value="2.2.0"/>
+ <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-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-name" value="hadoop-auth"/>
<param name="artifact-type" value="jar"/>
</antcall>
</target>
+ <target name="download-guava">
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="com/google/guava"/>
+ <param name="artifact-version" value="r09"/>
+ <param name="artifact-name" value="guava"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
<target name="download-solrj">
<mkdir dir="lib"/>
<antcall target="download-via-maven">
Modified: manifoldcf/trunk/connectors/hdfs/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/hdfs/build.xml?rev=1553673&r1=1553672&r2=1553673&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/hdfs/build.xml (original)
+++ manifoldcf/trunk/connectors/hdfs/build.xml Fri Dec 27 13:35:31 2013
@@ -23,7 +23,10 @@
<path refid="mcf-connector-build.connector-classpath"/>
<fileset dir="../../lib">
<include name="commons-configuration*.jar"/>
- <include name="hadoop-core*.jar"/>
+ <include name="hadoop-common*.jar"/>
+ <include name="hadoop-annotations*.jar"/>
+ <include name="hadoop-auth*.jar"/>
+ <include name="guava*.jar"/>
</fileset>
</path>
@@ -32,7 +35,10 @@
<copy todir="dist/lib">
<fileset dir="../../lib">
<include name="commons-configuration*.jar"/>
- <include name="hadoop-core*.jar"/>
+ <include name="hadoop-common*.jar"/>
+ <include name="hadoop-annotations*.jar"/>
+ <include name="hadoop-auth*.jar"/>
+ <include name="guava*.jar"/>
</fileset>
</copy>
</target>
Modified: manifoldcf/trunk/connectors/hdfs/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/hdfs/pom.xml?rev=1553673&r1=1553672&r2=1553673&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/hdfs/pom.xml (original)
+++ manifoldcf/trunk/connectors/hdfs/pom.xml Fri Dec 27 13:35:31 2013
@@ -158,8 +158,8 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>1.1.2</version>
+ <artifactId>hadoop-common</artifactId>
+ <version>2.2.0</version>
</dependency>
</dependencies>
</project>
Modified: manifoldcf/trunk/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/lib-license/LICENSE.txt?rev=1553673&r1=1553672&r2=1553673&view=diff
==============================================================================
--- manifoldcf/trunk/lib-license/LICENSE.txt (original)
+++ manifoldcf/trunk/lib-license/LICENSE.txt Fri Dec 27 13:35:31 2013
@@ -320,6 +320,9 @@ License: Apache 2 (http://www.apache.org
This product includes a google-http-client-jackson2-1.14.1-beta.jar.
License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+This product includes a guava.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
This product may include pdf files that embed IPA-licensed fonts.
License: IPA Font License Agreement v1.0 (http://ossipedia.ipa.go.jp/ipafont/index.html#LicenseEng)