Author: jlowe
Date: Mon May 19 20:31:40 2014
New Revision: 1596048
URL: http://svn.apache.org/r1596048
Log:
Reverted HADOOP-10474 from branch-2.
Removed:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml?rev=1596048&r1=1596047&r2=1596048&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml
Mon May 19 20:31:40 2014
@@ -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>
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml?rev=1596048&r1=1596047&r2=1596048&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml
(original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml Mon
May 19 20:31:40 2014
@@ -42,11 +42,6 @@
<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>
<scope>provided</scope>
