hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1089320 - in /hadoop/hdfs/branches/yahoo-merge: ./ ivy/ src/contrib/fuse-dfs/ src/contrib/hdfsproxy/ src/contrib/hdfsproxy/ivy/ src/contrib/thriftfs/
Date Wed, 06 Apr 2011 06:22:47 GMT
Author: omalley
Date: Wed Apr  6 06:22:47 2011
New Revision: 1089320

URL: http://svn.apache.org/viewvc?rev=1089320&view=rev
Log:
commit 6e766f5a5d7a51f169b59b784e0f382b02283e98
Author: Luke Lu <llu@yahoo-inc.com>
Date:   Fri Dec 17 17:36:07 2010 -0800

    HDFS-1810 Dedup artifacts from common

Modified:
    hadoop/hdfs/branches/yahoo-merge/CHANGES.txt
    hadoop/hdfs/branches/yahoo-merge/build.xml
    hadoop/hdfs/branches/yahoo-merge/ivy.xml
    hadoop/hdfs/branches/yahoo-merge/ivy/libraries.properties
    hadoop/hdfs/branches/yahoo-merge/src/contrib/fuse-dfs/ivy.xml
    hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/build.xml
    hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/ivy.xml
    hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/ivy/libraries.properties
    hadoop/hdfs/branches/yahoo-merge/src/contrib/thriftfs/ivy.xml

Modified: hadoop/hdfs/branches/yahoo-merge/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/CHANGES.txt?rev=1089320&r1=1089319&r2=1089320&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/CHANGES.txt (original)
+++ hadoop/hdfs/branches/yahoo-merge/CHANGES.txt Wed Apr  6 06:22:47 2011
@@ -230,6 +230,8 @@ Trunk (unreleased changes)
 
     HDFS-1544. Ivy resolve force mode off by default. (Luke Lu)
 
+    HDFS-1810. Remove duplicate jars from ivy. (Luke Lu)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: hadoop/hdfs/branches/yahoo-merge/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/build.xml?rev=1089320&r1=1089319&r2=1089320&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/build.xml (original)
+++ hadoop/hdfs/branches/yahoo-merge/build.xml Wed Apr  6 06:22:47 2011
@@ -1201,8 +1201,9 @@
 
   <target name="veryclean" depends="clean-cache,clean" 
           description="veryclean.  Delete ant maven task and ivy jars">
-    <delete file="${ant_task.jar}"/>
-    <delete file="${ivy.jar}"/>
+    <delete>
+       <fileset dir="${ivy.dir}" includes="*.jar"/>
+    </delete>
   </target>
 
   <target name="clean-cache" depends="clean" description="Clean. Delete ivy cache">

Modified: hadoop/hdfs/branches/yahoo-merge/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/ivy.xml?rev=1089320&r1=1089319&r2=1089320&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/ivy.xml (original)
+++ hadoop/hdfs/branches/yahoo-merge/ivy.xml Wed Apr  6 06:22:47 2011
@@ -20,7 +20,7 @@
     <license name="Apache 2.0"/>
     <ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
     <description>
-        Hadoop Core
+        Hadoop HDFS
     </description>
   </info>
   <configurations defaultconfmapping="default">
@@ -40,11 +40,7 @@
     <conf name="javadoc" visibility="private" description="artiracts required while performing
doc generation" extends="common"/>
     <conf name="test" extends="common" visibility="private" description="the classpath
needed to run tests"/>
     <conf name="system" extends="test" visibility="private" description="the classpath
needed to run system tests"/>
-
-    <conf name="test-hdfswithmr" extends="test, common" visibility="private" description="the
classpath needed to run tests"/>
-
     <conf name="releaseaudit" visibility="private" description="Artifacts required for
releaseaudit target"/>
-     
     <conf name="jdiff" visibility="private" extends="common"/>
     <conf name="checkstyle" visibility="private"/>
 
@@ -57,33 +53,17 @@
   <dependencies>
     
     <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}"
conf="test->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-common-instrumented" rev="${hadoop-common.version}"
conf="system->default"/>
-    <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
conf="common->master"/>
+
     <dependency org="commons-daemon" name="commons-daemon" rev="${commons-daemon.version}"
conf="common->default" />
-    <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
-    <dependency org="org.apache.hadoop" name="avro" rev="${avro.version}" conf="common->default">
-      <exclude module="ant"/>
-      <exclude module="jetty"/>
-      <exclude module="slf4j-simple"/>
-    </dependency>
+
     <dependency org="org.aspectj" name="aspectjrt" rev="${aspectj.version}" conf="common->default"/>
     <dependency org="org.aspectj" name="aspectjtools" rev="${aspectj.version}" conf="common->default"/>
-
-    <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-common-test" rev="${hadoop-common.version}"
conf="test->default"/>
-
     <dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}" conf="checkstyle->default"/>
-
     <dependency org="jdiff" name="jdiff" rev="${jdiff.version}" conf="jdiff->default"/>
     <dependency org="xerces" name="xerces" rev="${xerces.version}" conf="jdiff->default"/>
-
     <dependency org="org.apache.rat" name="apache-rat-tasks" rev="${rats-lib.version}"
conf="releaseaudit->default"/>
-    <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}" conf="releaseaudit->default"/>
-    <dependency org="commons-collections" name="commons-collections" rev="${commons-collections.version}"
conf="releaseaudit->default"/>
-
-    <dependency org="org.apache.lucene" name="lucene-core" rev="${lucene-core.version}"
conf="javadoc->default"/> 
-
-   </dependencies>
+  </dependencies>
   
 </ivy-module>

Modified: hadoop/hdfs/branches/yahoo-merge/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/ivy/libraries.properties?rev=1089320&r1=1089319&r2=1089320&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/ivy/libraries.properties (original)
+++ hadoop/hdfs/branches/yahoo-merge/ivy/libraries.properties Wed Apr  6 06:22:47 2011
@@ -15,59 +15,18 @@
 
 #These are the versions of our dependencies (in alphabetical order)
 ant-task.version=2.0.10
-avro.version=1.3.2
+aspectj.version=1.6.5
 
 checkstyle.version=4.2
-
-commons-cli.version=1.2
-commons-cli2.version=2.0-mahout
-commons-collections.version=3.1
 commons-daemon.version=1.0.1
-commons-httpclient.version=3.0.1
-commons-lang.version=2.5
-commons-logging.version=1.1.1
-commons-logging-api.version=1.1
-commons-el.version=1.0
-commons-fileupload.version=1.2
-commons-io.version=1.4
-commons-net.version=1.4.1
-core.version=3.1.1
-coreplugin.version=1.3.2
 
 hadoop-common.version=0.22.0-SNAPSHOT
 hadoop-hdfs.version=0.22.0-SNAPSHOT
 
-hsqldb.version=1.8.0.10
-
-ivy.version=2.1.0
+ivy.version=2.2.0
 
-jasper.version=5.5.12
-jsp.version=2.1
-jsp-api.version=5.5.12
-jetty.version=6.1.14
-jetty-util.version=6.1.14
-junit.version=4.8.1
 jdiff.version=1.0.9
-json.version=1.0
-
-kfs.version=0.3
-
-log4j.version=1.2.15
-lucene-core.version=2.3.1
-
-oro.version=2.0.8
 
 rats-lib.version=0.6
 
-servlet.version=4.0.6
-servlet-api-2.5.version=6.1.14
-servlet-api.version=2.5
-slf4j-api.version=1.5.11
-slf4j-log4j12.version=1.5.11
-
-wagon-http.version=1.0-beta-2
-xmlenc.version=0.52
 xerces.version=1.4.4
-
-#This property has to be updated synchronously with aop.xml
-aspectj.version=1.6.5

Modified: hadoop/hdfs/branches/yahoo-merge/src/contrib/fuse-dfs/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/src/contrib/fuse-dfs/ivy.xml?rev=1089320&r1=1089319&r2=1089320&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/src/contrib/fuse-dfs/ivy.xml (original)
+++ hadoop/hdfs/branches/yahoo-merge/src/contrib/fuse-dfs/ivy.xml Wed Apr  6 06:22:47 2011
@@ -23,15 +23,5 @@
     <!--get the artifact from our module name-->
     <artifact conf="master"/>
   </publications>
-  <dependencies>
-    <dependency org="commons-logging"
-      name="commons-logging"
-      rev="${commons-logging.version}"
-      conf="common->default"/>
-    <dependency org="log4j"
-      name="log4j"
-      rev="${log4j.version}"
-      conf="common->master"/>
-    </dependencies>
   
 </ivy-module>

Modified: hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/build.xml?rev=1089320&r1=1089319&r2=1089320&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/build.xml (original)
+++ hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/build.xml Wed Apr  6 06:22:47 2011
@@ -220,7 +220,8 @@
     </cactifywar>    	
 	</target>
 	
-	<target name="test" depends="compile,compile-test,test-junit,test-cactus" description="Automated
Test Framework" if="test.available"/>
+        <!-- disable test-cactus for now -->
+	<target name="test" depends="compile,compile-test,test-junit" description="Automated
Test Framework" if="test.available"/>
 	
 	<target name="test-junit" depends="compile,compile-test" if="test.available">
 		<junit fork="yes" printsummary="yes" errorProperty="tests.failed" failureProperty="tests.failed">

Modified: hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/ivy.xml?rev=1089320&r1=1089319&r2=1089320&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/ivy.xml (original)
+++ hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/ivy.xml Wed Apr  6 06:22:47 2011
@@ -30,81 +30,16 @@
       name="hadoop-common-test"
       rev="${hadoop-common.version}"
       conf="common->default"/>
-    <dependency org="commons-cli"
-      name="commons-cli"
-      rev="${commons-cli.version}"
-      conf="common->default"/>
-    <dependency org="log4j"
-      name="log4j"
-      rev="${log4j.version}"
-      conf="common->master"/>
-    <dependency org="commons-logging"
-      name="commons-logging"
-      rev="${commons-logging.version}"
-      conf="common->master"/>
-    <dependency org="commons-logging"
-      name="commons-logging-api"
-      rev="${commons-logging-api.version}"
-      conf="common->master"/>
-    <dependency org="junit"
-      name="junit"
-      rev="${junit.version}"
-      conf="common->master"/>
-    <dependency org="org.slf4j"
-      name="slf4j-api"
-      rev="${slf4j-api.version}"
-      conf="common->master"/>
-    <dependency org="org.slf4j"
-      name="slf4j-log4j12"
-      rev="${slf4j-log4j12.version}"
-      conf="common->master"/>
-    <dependency org="xmlenc"
-      name="xmlenc"
-      rev="${xmlenc.version}"
-      conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jetty"
-      rev="${jetty.version}"
-      conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jsp-api-2.1"
-      rev="${jetty.version}"
-      conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jsp-2.1"
-      rev="${jetty.version}"
-      conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jetty-util"
-      rev="${jetty-util.version}"
-      conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="servlet-api-2.5"
-      rev="${servlet-api-2.5.version}"
-      conf="common->master"/>
-    <dependency org="org.eclipse.jdt"
-      name="core"
-      rev="${core.version}"
-      conf="common->master"/>
+    <dependency org="commons-io" name="commons-io" rev="1.4" conf="common->master"/>
     <dependency org="org.apache.cactus" name="cactus.core.framework.uberjar.javaEE.14"
rev="${cactus.version}" conf="common->master"/>
-		<dependency org="org.apache.cactus" name="cactus.integration.ant" rev="${cactus.version}"
conf="common->master"/>
-		<dependency org="org.apache.cactus" name="cactus.integration.shared.api" rev="${cactus.version}"
conf="common->master"/>
-				
-		<dependency org="commons-httpclient" name="commons-httpclient" rev="3.1" conf="common->master"/>
-		<dependency org="commons-io" name="commons-io" rev="1.4" conf="common->master"/>
-		<dependency org="commons-lang" name="commons-lang" rev="2.3" conf="common->master"/>
-		<dependency org="commons-codec" name="commons-codec" rev="1.4" conf="common->master"/>
-		
-		<dependency org="aspectj" name="aspectjrt" rev="1.5.3" conf="common->master"/>
-		
-		<dependency org="org.codehaus.cargo" name="cargo-core-uberjar" rev="0.9" conf="common->master"/>
-		<dependency org="org.codehaus.cargo" name="cargo-ant" rev="0.9" conf="common->master"/>
-
-		<dependency org="javax.servlet" name="jsp-api" rev="2.0" conf="common->master"/>
-		<dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="common->master"/>
-		<dependency org="javax.servlet" name="jstl" rev="1.1.2" conf="common->master"/>
-		<dependency org="taglibs" name="standard" rev="1.1.2" conf="common->master"/>
-	  
-		<dependency org="junitperf" name="junitperf" rev="1.8" conf="common->master"/>
+    <dependency org="org.apache.cactus" name="cactus.integration.ant" rev="${cactus.version}"
conf="common->master"/>
+    <dependency org="org.apache.cactus" name="cactus.integration.shared.api" rev="${cactus.version}"
conf="common->master"/>
+    <dependency org="aspectj" name="aspectjrt" rev="1.5.3" conf="common->master"/>
+    <dependency org="org.codehaus.cargo" name="cargo-core-uberjar" rev="0.9" conf="common->master"/>
+    <dependency org="org.codehaus.cargo" name="cargo-ant" rev="0.9" conf="common->master"/>
+    <dependency org="junitperf" name="junitperf" rev="1.8" conf="common->master"/>
+    <dependency org="javax.servlet" name="jstl" rev="1.1.2" conf="common->master"/>
+    <dependency org="taglibs" name="standard" rev="1.1.2" conf="common->master"/>
+    <dependency org="xerces" name="xerces" rev="${xerces.version}" conf="common->master"/>
   </dependencies>
 </ivy-module>

Modified: hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/ivy/libraries.properties?rev=1089320&r1=1089319&r2=1089320&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/ivy/libraries.properties (original)
+++ hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/ivy/libraries.properties Wed Apr
 6 06:22:47 2011
@@ -1,18 +1,4 @@
 #This properties file lists the versions of the various artifacts used by hadoop.
 #It drives ivy and the generation of a maven POM
 #These are the versions of our dependencies (in alphabetical order)
-ivy.version=2.1.0
-
-log4j.version=1.2.15
-slf4j-api.version=1.5.11
-slf4j-log4j12.version=1.5.11
-jetty.version=6.1.14
-jetty-util.version=6.1.14
-servlet-api-2.5.version=6.1.14
 cactus.version=1.8.0
-commons-logging.version=1.1.1
-commons-logging-api.version=1.1
-junit.version=4.8.1
-jsp.version=2.1
-core.version=3.1.1
-xmlenc.version=0.52
\ No newline at end of file

Modified: hadoop/hdfs/branches/yahoo-merge/src/contrib/thriftfs/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/src/contrib/thriftfs/ivy.xml?rev=1089320&r1=1089319&r2=1089320&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/src/contrib/thriftfs/ivy.xml (original)
+++ hadoop/hdfs/branches/yahoo-merge/src/contrib/thriftfs/ivy.xml Wed Apr  6 06:22:47 2011
@@ -28,13 +28,5 @@
       name="hadoop-common"
       rev="${hadoop-common.version}"
       conf="common->default"/>
-    <dependency org="commons-logging"
-      name="commons-logging"
-      rev="${commons-logging.version}"
-      conf="common->default"/>
-    <dependency org="log4j"
-      name="log4j"
-      rev="${log4j.version}"
-      conf="common->master"/>
     </dependencies>
 </ivy-module>



Mime
View raw message