From b6988521f4e45ad1be204213a7827ad4720edc3f Mon Sep 17 00:00:00 2001
From: Jason Darrell Lowe <jlowe@apache.org>
Date: Mon, 19 May 2014 20:31:40 +0000
Subject: [PATCH] Reverted HADOOP-10474 from branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596048 13f79535-47bb-0310-9956-ffa450edef68
---
 .../hadoop-common/CHANGES.txt                 |  2 -
 .../dev-support/findbugsExcludeFile.xml       | 18 ++++++++
 hadoop-common-project/hadoop-common/pom.xml   |  2 +-
 .../hadoop/record/BinaryRecordInput.java      |  0
 .../hadoop/record/BinaryRecordOutput.java     |  0
 .../java/org/apache/hadoop/record/Buffer.java |  0
 .../apache/hadoop/record/CsvRecordInput.java  |  0
 .../apache/hadoop/record/CsvRecordOutput.java |  0
 .../java/org/apache/hadoop/record/Index.java  |  0
 .../java/org/apache/hadoop/record/Record.java |  0
 .../hadoop/record/RecordComparator.java       |  0
 .../org/apache/hadoop/record/RecordInput.java |  0
 .../apache/hadoop/record/RecordOutput.java    |  0
 .../java/org/apache/hadoop/record/Utils.java  |  0
 .../apache/hadoop/record/XmlRecordInput.java  |  0
 .../apache/hadoop/record/XmlRecordOutput.java |  0
 .../hadoop/record/compiler/CGenerator.java    |  0
 .../hadoop/record/compiler/CodeBuffer.java    |  0
 .../hadoop/record/compiler/CodeGenerator.java |  0
 .../apache/hadoop/record/compiler/Consts.java |  0
 .../hadoop/record/compiler/CppGenerator.java  |  0
 .../hadoop/record/compiler/JBoolean.java      |  0
 .../hadoop/record/compiler/JBuffer.java       |  0
 .../apache/hadoop/record/compiler/JByte.java  |  0
 .../hadoop/record/compiler/JCompType.java     |  0
 .../hadoop/record/compiler/JDouble.java       |  0
 .../apache/hadoop/record/compiler/JField.java |  0
 .../apache/hadoop/record/compiler/JFile.java  |  0
 .../apache/hadoop/record/compiler/JFloat.java |  0
 .../apache/hadoop/record/compiler/JInt.java   |  0
 .../apache/hadoop/record/compiler/JLong.java  |  0
 .../apache/hadoop/record/compiler/JMap.java   |  0
 .../hadoop/record/compiler/JRecord.java       |  0
 .../hadoop/record/compiler/JString.java       |  0
 .../apache/hadoop/record/compiler/JType.java  |  0
 .../hadoop/record/compiler/JVector.java       |  0
 .../hadoop/record/compiler/JavaGenerator.java |  0
 .../hadoop/record/compiler/ant/RccTask.java   |  0
 .../compiler/generated/ParseException.java    |  0
 .../hadoop/record/compiler/generated/Rcc.java |  0
 .../compiler/generated/RccConstants.java      |  0
 .../compiler/generated/RccTokenManager.java   |  0
 .../compiler/generated/SimpleCharStream.java  |  0
 .../record/compiler/generated/Token.java      |  0
 .../compiler/generated/TokenMgrError.java     |  0
 .../record/compiler/generated/package.html    |  0
 .../hadoop/record/compiler/generated/rcc.jj   |  0
 .../hadoop/record/compiler/package.html       |  0
 .../hadoop/record/meta/FieldTypeInfo.java     |  0
 .../apache/hadoop/record/meta/MapTypeID.java  |  0
 .../hadoop/record/meta/RecordTypeInfo.java    |  0
 .../hadoop/record/meta/StructTypeID.java      |  0
 .../org/apache/hadoop/record/meta/TypeID.java |  0
 .../org/apache/hadoop/record/meta/Utils.java  |  0
 .../hadoop/record/meta/VectorTypeID.java      |  0
 .../org/apache/hadoop/record/package.html     |  0
 .../security/SecureShuffleUtils.java          |  4 +-
 .../dev-support/findbugs-exclude.xml          | 41 -------------------
 hadoop-tools/hadoop-streaming/pom.xml         |  5 ---
 59 files changed, 21 insertions(+), 51 deletions(-)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/Buffer.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/CsvRecordInput.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/Index.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/Record.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/RecordComparator.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/RecordInput.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/RecordOutput.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/Utils.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/XmlRecordInput.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/Consts.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JByte.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JCompType.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JDouble.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JField.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JFile.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JFloat.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JInt.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JLong.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JMap.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JRecord.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JString.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JType.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JVector.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/JavaGenerator.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/ant/RccTask.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/generated/ParseException.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/generated/Rcc.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/generated/RccConstants.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/generated/RccTokenManager.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/generated/SimpleCharStream.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/generated/Token.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/generated/TokenMgrError.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/generated/package.html (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/generated/rcc.jj (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/compiler/package.html (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/meta/FieldTypeInfo.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/meta/MapTypeID.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/meta/RecordTypeInfo.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/meta/StructTypeID.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/meta/TypeID.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/meta/Utils.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/meta/VectorTypeID.java (100%)
 rename {hadoop-tools/hadoop-streaming => hadoop-common-project/hadoop-common}/src/main/java/org/apache/hadoop/record/package.html (100%)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index b8c211c0927..794bdcfef6e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -4,8 +4,6 @@ Release 2.5.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
 
-    HADOOP-10474 Move o.a.h.record to hadoop-streaming. (wheat9)
-
   NEW FEATURES
 
     HADOOP-10498. Add support for proxy server. (daryn)
diff --git a/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml b/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
index 66da5424ce9..24fded9ef6b 100644
--- a/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
@@ -15,6 +15,9 @@
    limitations under the License.
 -->
 <FindBugsFilter>
+     <Match>
+       <Package name="org.apache.hadoop.record.compiler.generated" />
+     </Match>
      <Match>
        <Package name="org.apache.hadoop.security.proto" />
      </Match>
@@ -193,6 +196,21 @@
        <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS" />
      </Match>
 
+     <Match>
+       <Class name="org.apache.hadoop.record.meta.Utils" />
+       <Method name="skip" />
+       <Bug pattern="BC_UNCONFIRMED_CAST" />
+     </Match>
+
+     <!--
+        The compareTo method is actually a dummy method that just
+        throws excpetions. So, no need to override equals. Ignore
+     -->
+     <Match>
+       <Class name="org.apache.hadoop.record.meta.RecordTypeInfo" />
+       <Bug pattern="EQ_COMPARETO_USE_OBJECT_EQUALS" />
+     </Match>
+
      <Match>
        <Class name="org.apache.hadoop.util.ProcfsBasedProcessTree" />
        <Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME" />
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index d1e9e094a3a..fb86473a6a1 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -202,7 +202,7 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <scope>test</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Buffer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Buffer.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Buffer.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Buffer.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/CsvRecordInput.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordInput.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/CsvRecordInput.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordInput.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Index.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Index.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Index.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Index.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Record.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Record.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordComparator.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordComparator.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordInput.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordInput.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordInput.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordInput.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordOutput.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordOutput.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordOutput.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordOutput.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Utils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Utils.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Utils.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Utils.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/XmlRecordInput.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/XmlRecordInput.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/Consts.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/Consts.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/Consts.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/Consts.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JByte.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JByte.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JByte.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JByte.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JCompType.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JCompType.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JCompType.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JCompType.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JDouble.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JDouble.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JDouble.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JDouble.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JField.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JField.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JField.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JField.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JFile.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JFile.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JFile.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JFile.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JFloat.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JFloat.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JFloat.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JFloat.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JInt.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JInt.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JInt.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JInt.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JLong.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JLong.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JLong.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JLong.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JMap.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JMap.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JMap.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JMap.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JRecord.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JRecord.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JRecord.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JRecord.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JString.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JString.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JString.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JString.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JType.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JType.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JType.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JType.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JVector.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JVector.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JVector.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JVector.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JavaGenerator.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JavaGenerator.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JavaGenerator.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JavaGenerator.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/ant/RccTask.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/ant/RccTask.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/ant/RccTask.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/ant/RccTask.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/ParseException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/ParseException.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/ParseException.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/ParseException.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/Rcc.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Rcc.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/Rcc.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Rcc.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/RccConstants.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/RccConstants.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/RccConstants.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/RccConstants.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/RccTokenManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/RccTokenManager.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/RccTokenManager.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/RccTokenManager.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/SimpleCharStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/SimpleCharStream.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/SimpleCharStream.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/SimpleCharStream.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/Token.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Token.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/Token.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Token.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/TokenMgrError.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/TokenMgrError.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/TokenMgrError.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/TokenMgrError.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/package.html b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/package.html
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/package.html
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/package.html
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/rcc.jj b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/rcc.jj
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/generated/rcc.jj
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/rcc.jj
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/package.html b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/package.html
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/package.html
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/package.html
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/meta/FieldTypeInfo.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/FieldTypeInfo.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/meta/FieldTypeInfo.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/FieldTypeInfo.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/meta/MapTypeID.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/MapTypeID.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/meta/MapTypeID.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/MapTypeID.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/meta/RecordTypeInfo.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/RecordTypeInfo.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/meta/RecordTypeInfo.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/RecordTypeInfo.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/meta/StructTypeID.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/StructTypeID.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/meta/StructTypeID.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/StructTypeID.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/meta/TypeID.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/TypeID.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/meta/TypeID.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/TypeID.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/meta/Utils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/Utils.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/meta/Utils.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/Utils.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/meta/VectorTypeID.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/VectorTypeID.java
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/meta/VectorTypeID.java
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/VectorTypeID.java
diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/package.html b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/package.html
similarity index 100%
rename from hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/package.html
rename to hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/package.html
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java
index 30554dbdb75..f7189cb317e 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java
@@ -31,8 +31,8 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.io.WritableComparator;
 import org.apache.hadoop.mapreduce.security.token.JobTokenSecretManager;
+import org.apache.hadoop.record.Utils;
 
 import com.google.common.base.Charsets;
 
@@ -74,7 +74,7 @@ public class SecureShuffleUtils {
    */
   private static boolean verifyHash(byte[] hash, byte[] msg, SecretKey key) {
     byte[] msg_hash = generateByteHash(msg, key);
-    return WritableComparator.compareBytes(msg_hash, 0, msg_hash.length, hash, 0, hash.length) == 0;
+    return Utils.compareBytes(msg_hash, 0, msg_hash.length, hash, 0, hash.length) == 0;
   }
   
   /**
diff --git a/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml b/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml
index 5ad3808ead0..122c75bbb18 100644
--- a/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml
+++ b/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml
@@ -16,19 +16,6 @@
    limitations under the License.
 -->
 <FindBugsFilter>
-  <!-- Workaround bugs in findbugs 1.3.9. See http://sourceforge.net/p/findbugs/bugs/918 for more details. -->
-  <Match>
-    <Or>
-      <Package name="org.apache.hadoop.streaming" />
-      <Class name="org.apache.hadoop.record.compiler.JFile" />
-    </Or>
-    <Bug pattern="NP_ALWAYS_NULL"/>
-  </Match>
-  <Match>
-    <Class name="org.apache.hadoop.streaming.JarBuilder" />
-    <Bug pattern="NP_NULL_PARAM_DEREF_ALL_TARGETS_DANGEROUS"/>
-  </Match>
-
   <Match>
     <Or>
       <Class name="org.apache.hadoop.streaming.PipeMapper" />
@@ -40,32 +27,4 @@
     </Or>
     <Bug pattern="EI_EXPOSE_REP"/>
   </Match>
-
-  <Match>
-    <Package name="org.apache.hadoop.record.compiler.generated" />
-  </Match>
-
-  <Match>
-    <Package name="org.apache.hadoop.record" />
-    <Or>
-      <Bug pattern="EI_EXPOSE_REP" />
-      <Bug pattern="EI_EXPOSE_REP2" />
-      <Bug pattern="MS_PKGPROTECT" />
-    </Or>
-  </Match>
-
-  <Match>
-    <Class name="org.apache.hadoop.record.meta.Utils" />
-    <Method name="skip" />
-    <Bug pattern="BC_UNCONFIRMED_CAST" />
-  </Match>
-
-  <!--
-     The compareTo method is actually a dummy method that just
-     throws excpetions. So, no need to override equals. Ignore
-  -->
-  <Match>
-    <Class name="org.apache.hadoop.record.meta.RecordTypeInfo" />
-    <Bug pattern="EQ_COMPARETO_USE_OBJECT_EQUALS" />
-  </Match>
 </FindBugsFilter>
diff --git a/hadoop-tools/hadoop-streaming/pom.xml b/hadoop-tools/hadoop-streaming/pom.xml
index a0930d63377..81bd0b0c1e5 100644
--- a/hadoop-tools/hadoop-streaming/pom.xml
+++ b/hadoop-tools/hadoop-streaming/pom.xml
@@ -41,11 +41,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-annotations</artifactId>