hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r949089 - in /hadoop/hdfs/branches/branch-0.21: CHANGES.txt build.xml ivy.xml ivy/hadoop-hdfs-template.xml ivy/libraries.properties src/contrib/hdfsproxy/build.xml src/contrib/hdfsproxy/ivy.xml src/contrib/thriftfs/ivy.xml
Date Fri, 28 May 2010 03:35:51 GMT
Author: tomwhite
Date: Fri May 28 03:35:51 2010
New Revision: 949089

URL: http://svn.apache.org/viewvc?rev=949089&view=rev
Log:
Merge -r 949083:949084 from trunk to branch 0.21. Fixes: HDFS-1126.

Modified:
    hadoop/hdfs/branches/branch-0.21/CHANGES.txt
    hadoop/hdfs/branches/branch-0.21/build.xml
    hadoop/hdfs/branches/branch-0.21/ivy.xml
    hadoop/hdfs/branches/branch-0.21/ivy/hadoop-hdfs-template.xml
    hadoop/hdfs/branches/branch-0.21/ivy/libraries.properties
    hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy/build.xml
    hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy/ivy.xml
    hadoop/hdfs/branches/branch-0.21/src/contrib/thriftfs/ivy.xml

Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=949089&r1=949088&r2=949089&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Fri May 28 03:35:51 2010
@@ -497,6 +497,9 @@ Release 0.21.0 - Unreleased
     HDFS-1089. Remove uses of FileContext#isFile, isDirectory, and exists.
     (Eli Collins via hairong)
 
+    HDFS-1126. Change HDFS to depend on Hadoop 'common' artifacts instead
+    of 'core'. (tomwhite)
+
   OPTIMIZATIONS
 
     HDFS-946. NameNode should not return full path name when lisitng a

Modified: hadoop/hdfs/branches/branch-0.21/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/build.xml?rev=949089&r1=949088&r2=949089&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/build.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/build.xml Fri May 28 03:35:51 2010
@@ -200,7 +200,7 @@
     <pathelement path="${clover.jar}"/>
     <path refid="ivy-test.classpath"/>
     <fileset dir="${lib.dir}">
-      <include name="hadoop-core-test-${hadoop-core.version}.jar" />
+      <include name="hadoop-common-test-${hadoop-common.version}.jar" />
       <exclude name="**/excluded/" />
     </fileset>
     <path refid="classpath"/>
@@ -593,7 +593,7 @@
   <target name="test-contrib" depends="compile-hdfs-test" description="Run contrib unit
tests">
     <subant target="test">
        <property name="version" value="${version}"/>
-       <property name="hadoop-version" value="${hadoop-core.version}"/>
+       <property name="hadoop-version" value="${hadoop-common.version}"/>
        <property name="clover.jar" value="${clover.jar}"/>
        <fileset file="${contrib.dir}/build.xml"/>
     </subant> 

Modified: hadoop/hdfs/branches/branch-0.21/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/ivy.xml?rev=949089&r1=949088&r2=949089&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/ivy.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/ivy.xml Fri May 28 03:35:51 2010
@@ -55,7 +55,7 @@
   </publications>
   <dependencies>
     
-    <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}"
conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="common->default"/>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
conf="common->master"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
     <dependency org="org.apache.hadoop" name="avro" rev="${avro.version}" conf="common->default"/>
@@ -64,7 +64,7 @@
 
     <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}" conf="test->master"/>
     <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}" conf="test->master"/>
-    <dependency org="org.apache.hadoop" name="hadoop-core-test" rev="${hadoop-core.version}"
conf="test->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}"
conf="test->default"/>
 
     <dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}" conf="checkstyle->default"/>
 

Modified: hadoop/hdfs/branches/branch-0.21/ivy/hadoop-hdfs-template.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/ivy/hadoop-hdfs-template.xml?rev=949089&r1=949088&r2=949089&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/ivy/hadoop-hdfs-template.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/ivy/hadoop-hdfs-template.xml Fri May 28 03:35:51 2010
@@ -32,7 +32,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-core</artifactId>
+      <artifactId>hadoop-common</artifactId>
       <version>0.21.0-SNAPSHOT</version>
     </dependency>
   </dependencies>

Modified: hadoop/hdfs/branches/branch-0.21/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/ivy/libraries.properties?rev=949089&r1=949088&r2=949089&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/ivy/libraries.properties (original)
+++ hadoop/hdfs/branches/branch-0.21/ivy/libraries.properties Fri May 28 03:35:51 2010
@@ -37,7 +37,7 @@ coreplugin.version=1.3.2
 ftplet-api.version=1.0.2
 ftpserver-core.version=1.0.2
 
-hadoop-core.version=0.21.0-SNAPSHOT
+hadoop-common.version=0.21.0-SNAPSHOT
 hadoop-hdfs.version=0.21.0-SNAPSHOT
 
 hsqldb.version=1.8.0.10

Modified: hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy/build.xml?rev=949089&r1=949088&r2=949089&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy/build.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy/build.xml Fri May 28 03:35:51 2010
@@ -126,7 +126,7 @@
               <include name="slf4j-log4j12-${slf4j-log4j12.version}.jar"/>
               <include name="xmlenc-${xmlenc.version}.jar"/>
               <include name="core-${core.vesion}.jar"/> 
-	      <include name="hadoop-core-${hadoop-version}.jar"/>
+	      <include name="hadoop-common-${hadoop-version}.jar"/>
 	    </lib>
 	    <classes dir="${proxy.conf.dir}">
 	    	<include name="hdfsproxy-default.xml"/>
@@ -153,7 +153,7 @@
         <include name="core-${core.vesion}.jar"/> 
 	    </lib>
 	    <lib dir="${hadoop.root}/lib">
-		<include name="hadoop-core-${hadoop-version}.jar"/>
+		<include name="hadoop-common-${hadoop-version}.jar"/>
 	    </lib>
 	    <classes dir="${proxy.conf.dir}">
 	    	<include name="hdfsproxy-default.xml"/>
@@ -179,7 +179,7 @@
               <include name="slf4j-log4j12-${slf4j-log4j12.version}.jar"/>
               <include name="xmlenc-${xmlenc.version}.jar"/>
               <include name="core-${core.vesion}.jar"/> 
-	      <include name="hadoop-core-${hadoop-version}.jar"/>
+	      <include name="hadoop-common-${hadoop-version}.jar"/>
 	    </lib>
 	    <classes dir="${proxy.conf.test}" excludes="**/*.template **/*.sh"/>
 	    <classes dir="${build.classes}"/>

Modified: hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy/ivy.xml?rev=949089&r1=949088&r2=949089&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy/ivy.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy/ivy.xml Fri May 28 03:35:51 2010
@@ -23,12 +23,12 @@
   </publications>
   <dependencies>
     <dependency org="org.apache.hadoop"
-      name="hadoop-core"
-      rev="${hadoop-core.version}"
+      name="hadoop-common"
+      rev="${hadoop-common.version}"
       conf="common->default"/>
     <dependency org="org.apache.hadoop"
-      name="hadoop-core-test"
-      rev="${hadoop-core.version}"
+      name="hadoop-common-test"
+      rev="${hadoop-common.version}"
       conf="common->default"/>
     <dependency org="commons-cli"
       name="commons-cli"

Modified: hadoop/hdfs/branches/branch-0.21/src/contrib/thriftfs/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/contrib/thriftfs/ivy.xml?rev=949089&r1=949088&r2=949089&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/src/contrib/thriftfs/ivy.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/src/contrib/thriftfs/ivy.xml Fri May 28 03:35:51 2010
@@ -25,8 +25,8 @@
   </publications>
   <dependencies>
     <dependency org="org.apache.hadoop"
-      name="hadoop-core"
-      rev="${hadoop-core.version}"
+      name="hadoop-common"
+      rev="${hadoop-common.version}"
       conf="common->default"/>
     <dependency org="commons-logging"
       name="commons-logging"



Mime
View raw message