svn commit: r1153706 - in /hive/trunk: build.properties ivy/ivysettings.xml shims/ivy.xml

[jv...@apache.org]

Author: jvs
Date: Thu Aug  4 00:30:18 2011
New Revision: 1153706

URL: http://svn.apache.org/viewvc?rev=1153706&view=rev
Log:
HIVE-2342. mirror.facebook.net is 404ing
(Carl Steinbach via jvs)


Modified:
    hive/trunk/build.properties
    hive/trunk/ivy/ivysettings.xml
    hive/trunk/shims/ivy.xml

Modified: hive/trunk/build.properties
URL: http://svn.apache.org/viewvc/hive/trunk/build.properties?rev=1153706&r1=1153705&r2=1153706&view=diff
==============================================================================
--- hive/trunk/build.properties (original)
+++ hive/trunk/build.properties Thu Aug  4 00:30:18 2011
@@ -11,7 +11,9 @@ javac.args=
 javac.args.warnings=
 
 hadoop.version=0.20.1
+hadoop.security.version=0.20.3-CDH3-SNAPSHOT
 hadoop.mirror=http://mirror.facebook.net/facebook/hive-deps
+hadoop.mirror2=http://archive.cloudera.com/hive-deps
 
 build.dir.hive=${hive.root}/build
 build.dir.hadoop=${build.dir.hive}/hadoopcore
@@ -41,7 +43,5 @@ common.jar=${hadoop.root}/lib/commons-ht
 #
 datanucleus.repo=http://www.datanucleus.org/downloads/maven2
 
-# URLs pointing to a built tarball of a secure hadoop release
-hadoop.security.url=http://mirror.facebook.net/facebook/hive-deps/hadoop/core/hadoop-0.20.3-CDH3-SNAPSHOT/hadoop-0.20.3-CDH3-SNAPSHOT.tar.gz
-hadoop.security.version=0.20.3-CDH3-SNAPSHOT
+
 

Modified: hive/trunk/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ivy/ivysettings.xml?rev=1153706&r1=1153705&r2=1153706&view=diff
==============================================================================
--- hive/trunk/ivy/ivysettings.xml (original)
+++ hive/trunk/ivy/ivysettings.xml Thu Aug  4 00:30:18 2011
@@ -43,6 +43,10 @@
       <artifact pattern="${hadoop.mirror}/hadoop/core/[artifact]-[revision]/[artifact]-[revision].[ext]" />
     </url>
 
+    <url name="hadoop-source2">
+      <artifact pattern="${hadoop.mirror2}/hadoop/core/[artifact]-[revision]/[artifact]-[revision].[ext]" />
+    </url>
+
     <ibiblio name="maven2" root="${repo.maven.org}" pattern="${maven2.pattern.ext}" m2compatible="true"/>
     <ibiblio name="apache-snapshot" root="${snapshot.apache.org}" m2compatible="true"
         checkmodified="true" changingPattern=".*SNAPSHOT"/>
@@ -56,8 +60,9 @@
        <ivy pattern="${repo.dir}/org/apache/hadoop/[module]/[revision]/[module]-[revision].pom"/>
     </filesystem>
 
-    <chain name="default" dual="true" checkmodified="true" changingPattern=".*SNAPSHOT">
+    <chain name="default" dual="true" returnFirst="true" checkmodified="true" changingPattern=".*SNAPSHOT">
       <resolver ref="hadoop-source"/>
+      <resolver ref="hadoop-source2"/>
       <resolver ref="apache-snapshot"/>
       <resolver ref="maven2"/>
       <resolver ref="datanucleus-repo"/>

Modified: hive/trunk/shims/ivy.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/ivy.xml?rev=1153706&r1=1153705&r2=1153706&view=diff
==============================================================================
--- hive/trunk/shims/ivy.xml (original)
+++ hive/trunk/shims/ivy.xml Thu Aug  4 00:30:18 2011
@@ -28,8 +28,7 @@
           <artifact name="hadoop" type="source" ext="tar.gz"/>
         </dependency> 
         <dependency org="hadoop" name="core" rev="${hadoop.security.version}">
-          <artifact name="hadoop" type="source" ext="tar.gz"
-            url="${hadoop.security.url}" />
+          <artifact name="hadoop" type="source" ext="tar.gz"/>
         </dependency> 
         <conflict manager="all" />
     </dependencies>