Author: omalley
Date: Tue Mar 8 05:58:11 2011
New Revision: 1079228
URL: http://svn.apache.org/viewvc?rev=1079228&view=rev
Log:
commit 219fc6526f295a808aae1c28b27ef7032cb56c6b
Author: Luke Lu <[email protected]>
Date: Mon Dec 20 03:32:43 2010 -0800
Bump avro version to 1.4.1
Also dedup some artifacts from common. (ramach, llu)
Modified:
hadoop/mapreduce/branches/yahoo-merge/ivy.xml
hadoop/mapreduce/branches/yahoo-merge/ivy/libraries.properties
hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/AvroArrayUtils.java
hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/JobSubmittedEvent.java
Modified: hadoop/mapreduce/branches/yahoo-merge/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/ivy.xml?rev=1079228&r1=1079227&r2=1079228&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/ivy.xml (original)
+++ hadoop/mapreduce/branches/yahoo-merge/ivy.xml Tue Mar 8 05:58:11 2011
@@ -65,20 +65,10 @@
rev="${hadoop-common.version}" conf="system->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-instrumented"
rev="${hadoop-common.version}" conf="system->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.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="org.apache.hadoop" name="hadoop-common-test"
rev="${hadoop-common.version}" conf="test->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}" conf="test->default"/>
-
<dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}"
conf="checkstyle->default"/>
@@ -86,23 +76,10 @@
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"/>
- <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 addition for the fault injection -->
<dependency org="org.aspectj" name="aspectjrt" rev="${aspectj.version}"
conf="common->default"/>
Modified: hadoop/mapreduce/branches/yahoo-merge/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/ivy/libraries.properties?rev=1079228&r1=1079227&r2=1079228&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/ivy/libraries.properties (original)
+++ hadoop/mapreduce/branches/yahoo-merge/ivy/libraries.properties Tue Mar 8
05:58:11 2011
@@ -20,60 +20,15 @@ ant-task.version=2.0.10
#This property has to be updated synchronously with aop.xml
aspectj.version=1.6.5
-avro.version=1.3.2
-
checkstyle.version=4.2
-commons-cli.version=1.2
-commons-collections.version=3.1
-commons-httpclient.version=3.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
-
-ftplet-api.version=1.0.0
-ftpserver-core.version=1.0.0
-ftpserver-deprecated.version=1.0.0-M2
-
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
-jets3t.version=0.7.1
-jetty.version=6.1.14
-jetty-util.version=6.1.14
-junit.version=4.8.1
jdiff.version=1.0.9
-kfs.version=0.3
-
-log4j.version=1.2.15
-lucene-core.version=2.3.1
-
-mina-core.version=2.0.0-M5
-
-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
-
-xmlenc.version=0.52
xerces.version=1.4.4
-
Modified:
hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/AvroArrayUtils.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/AvroArrayUtils.java?rev=1079228&r1=1079227&r2=1079228&view=diff
==============================================================================
---
hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/AvroArrayUtils.java
(original)
+++
hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/AvroArrayUtils.java
Tue Mar 8 05:58:11 2011
@@ -46,7 +46,7 @@ public class AvroArrayUtils {
return result;
}
- public static int[] fromAvro(GenericArray<Integer> avro) {
+ public static int[] fromAvro(java.util.List<Integer> avro) {
int[] result = new int[(int)avro.size()];
int i = 0;
Modified:
hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/JobSubmittedEvent.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/JobSubmittedEvent.java?rev=1079228&r1=1079227&r2=1079228&view=diff
==============================================================================
---
hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/JobSubmittedEvent.java
(original)
+++
hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/JobSubmittedEvent.java
Tue Mar 8 05:58:11 2011
@@ -52,19 +52,19 @@ public class JobSubmittedEvent implement
public JobSubmittedEvent(JobID id, String jobName, String userName,
long submitTime, String jobConfPath,
Map<JobACL, AccessControlList> jobACLs, String jobQueueName) {
- datum.jobid = new Utf8(id.toString());
- datum.jobName = new Utf8(jobName);
- datum.userName = new Utf8(userName);
+ datum.jobid = id.toString();
+ datum.jobName = jobName;
+ datum.userName = userName;
datum.submitTime = submitTime;
- datum.jobConfPath = new Utf8(jobConfPath);
- Map<Utf8, Utf8> jobAcls = new HashMap<Utf8, Utf8>();
+ datum.jobConfPath = jobConfPath;
+ Map<CharSequence, CharSequence> jobAcls = new HashMap<CharSequence,
CharSequence>();
for (Entry<JobACL, AccessControlList> entry : jobACLs.entrySet()) {
jobAcls.put(new Utf8(entry.getKey().getAclName()), new Utf8(
entry.getValue().getAclString()));
}
datum.acls = jobAcls;
if (jobQueueName != null) {
- datum.jobQueueName = new Utf8(jobQueueName);
+ datum.jobQueueName = jobQueueName;
}
}
