merge from 0.8

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1154426 13f79535-47bb-0310-9956-ffa450edef68
apache · Aug 6, 2011 · c51c3e1 · c51c3e1
1 parent 64d3409
commit c51c3e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/build.properties.default b/build.properties.default
@@ -2,7 +2,6 @@
 artifact.remoteRepository.central:     http://repo1.maven.org/maven2
 artifact.remoteRepository.java.net2:   http://download.java.net/maven/2
 artifact.remoteRepository.apache:      https://repository.apache.org/content/repositories/releases
-artifact.remoteRepository.cloudera:    https://repository.cloudera.com/content/repositories/releases
 artifact.remoteRepository.jclouds:     http://jclouds.googlecode.com/svn/repo
 artifact.remoteRepository.oauth:       http://oauth.googlecode.com/svn/code/maven
 
diff --git a/build.xml b/build.xml
@@ -285,7 +285,6 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
       <artifact:remoteRepository id="central"   url="${artifact.remoteRepository.central}"/>
       <artifact:remoteRepository id="java.net2" url="${artifact.remoteRepository.java.net2}"/>
       <artifact:remoteRepository id="apache"    url="${artifact.remoteRepository.apache}"/>
-      <artifact:remoteRepository id="cloudera"  url="${artifact.remoteRepository.cloudera}"/>
       <!-- for distributed tests -->
       <artifact:remoteRepository id="jclouds"   url="${artifact.remoteRepository.jclouds}"/>
       <artifact:remoteRepository id="oauth"     url="${artifact.remoteRepository.oauth}"/>
@@ -379,8 +378,7 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
           <dependency groupId="junit" artifactId="junit" version="4.6" />
           <dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/>
           <dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.6" />
-          <dependency groupId="com.cloudera.hadoop" artifactId="hadoop-core" version="0.20.2-320"/>
-          <dependency groupId="com.cloudera.hadoop" artifactId="hadoop-streaming" version="0.20.2-320"/>
+          <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="0.20.203.0"/>
           <dependency groupId="net.sf.jopt-simple" artifactId="jopt-simple" version="3.2"/>
           <dependency groupId="net.java.dev.jna" artifactId="jna" version="3.2.7"/>
 
@@ -422,8 +420,7 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
         <dependency groupId="junit" artifactId="junit"/>
         <dependency groupId="commons-logging" artifactId="commons-logging"/>
         <dependency groupId="org.apache.rat" artifactId="apache-rat"/>
-        <dependency groupId="com.cloudera.hadoop" artifactId="hadoop-core"/>
-        <dependency groupId="com.cloudera.hadoop" artifactId="hadoop-streaming"/>
+        <dependency groupId="org.apache.hadoop" artifactId="hadoop-core"/>
         <dependency groupId="net.sf.jopt-simple" artifactId="jopt-simple"/>
 
         <dependency groupId="net.java.dev.jna" artifactId="jna"/>
@@ -480,8 +477,7 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
         <dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift"/>
 
         <!-- don't need hadoop classes to run, but if you use the hadoop stuff -->
-        <dependency groupId="com.cloudera.hadoop" artifactId="hadoop-core" optional="true"/>
-        <dependency groupId="com.cloudera.hadoop" artifactId="hadoop-streaming" optional="true"/>
+        <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" optional="true"/>
 
         <!-- don't need jna to run, but nice to have -->
         <dependency groupId="net.java.dev.jna" artifactId="jna" optional="true"/>
@@ -522,7 +518,6 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
                              dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
           <remoteRepository refid="central"/>
           <remoteRepository refid="apache"/>
-          <remoteRepository refid="cloudera"/>
           <remoteRepository refid="java.net2"/>
       </artifact:dependencies>
       <artifact:dependencies pomRefId="coverage-deps-pom"