From f4d96be6c637ff54903615cff04b365e25bb3229 Mon Sep 17 00:00:00 2001
From: yliu <yliu@apache.org>
Date: Tue, 1 Sep 2015 16:20:56 +0800
Subject: [PATCH] HADOOP-12367. Move TestFileUtil's test resources to resources
 folder. (wang via yliu)

---
 .../hadoop-common/CHANGES.txt                 |   3 +++
 hadoop-common-project/hadoop-common/pom.xml   |  19 +-----------------
 .../hadoop/fs => resources}/test-untar.tar    | Bin
 .../hadoop/fs => resources}/test-untar.tgz    | Bin
 4 files changed, 4 insertions(+), 18 deletions(-)
 rename hadoop-common-project/hadoop-common/src/test/{java/org/apache/hadoop/fs => resources}/test-untar.tar (100%)
 rename hadoop-common-project/hadoop-common/src/test/{java/org/apache/hadoop/fs => resources}/test-untar.tgz (100%)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 0f52d22089..14e6fda709 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -759,6 +759,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12368. Mark ViewFileSystemBaseTest and ViewFsBaseTest as abstract.
     (wang)
 
+    HADOOP-12367. Move TestFileUtil's test resources to resources folder.
+    (wang via yliu)
+
   OPTIMIZATIONS
 
     HADOOP-11785. Reduce the number of listStatus operation in distcp
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 282735dd40..3ae09a0f57 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -453,23 +453,6 @@
               </target>
             </configuration>
           </execution>
-          <execution>
-            <id>copy-test-tarballs</id>
-            <phase>process-test-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <copy toDir="${test.cache.data}">
-                  <fileset dir="${basedir}/src/test/java/org/apache/hadoop/fs">
-                    <include name="test-untar.tar"/>
-                    <include name="test-untar.tgz"/>
-                  </fileset>
-                </copy>
-              </target>
-            </configuration>
-          </execution>
           <execution>
             <phase>pre-site</phase>
             <goals>
@@ -505,7 +488,7 @@
             <exclude>src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc.h</exclude>
             <exclude>src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc.c</exclude>
             <exclude>src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc_encoder.h</exclude>
-            <exclude>src/test/java/org/apache/hadoop/fs/test-untar.tgz</exclude>
+            <exclude>src/test/resources/test-untar.tgz</exclude>
             <exclude>src/test/resources/test.har/_SUCCESS</exclude>
             <exclude>src/test/resources/test.har/_index</exclude>
             <exclude>src/test/resources/test.har/_masterindex</exclude>
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tar b/hadoop-common-project/hadoop-common/src/test/resources/test-untar.tar
similarity index 100%
rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tar
rename to hadoop-common-project/hadoop-common/src/test/resources/test-untar.tar
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tgz b/hadoop-common-project/hadoop-common/src/test/resources/test-untar.tgz
similarity index 100%
rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tgz
rename to hadoop-common-project/hadoop-common/src/test/resources/test-untar.tgz