Author: jbellis
Date: Sat Aug 6 02:11:39 2011
New Revision: 1154424
URL: http://svn.apache.org/viewvc?rev=1154424&view=rev
Log:
switch to apache hadoop repo and remove hadoop streaming dependency
patch by Nate McCall; reviewed by jhanna for CASSANDRA-2998
Modified:
cassandra/branches/cassandra-0.8/build.properties.default
cassandra/branches/cassandra-0.8/build.xml
Modified: cassandra/branches/cassandra-0.8/build.properties.default
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/build.properties.default?rev=1154424&r1=1154423&r2=1154424&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/build.properties.default (original)
+++ cassandra/branches/cassandra-0.8/build.properties.default Sat Aug 6
02:11:39 2011
@@ -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
Modified: cassandra/branches/cassandra-0.8/build.xml
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/build.xml?rev=1154424&r1=1154423&r2=1154424&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/build.xml (original)
+++ cassandra/branches/cassandra-0.8/build.xml Sat Aug 6 02:11:39 2011
@@ -285,7 +285,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<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}"/>
@@ -380,8 +379,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
<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"/>
@@ -423,8 +421,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
<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"/>
@@ -482,8 +479,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
<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"/>
@@ -524,7 +520,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
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"