From a36e9c76c26ddaf09e72fe68f51b9911a8112be4 Mon Sep 17 00:00:00 2001
From: Chia-Ping Tsai <chia7712@gmail.com>
Date: Mon, 29 Jan 2018 03:00:42 +0800
Subject: [PATCH] HBASE-19877 hbase-common and hbase-zookeeper don't add the
 log4j.properties to the resource path for testing

---
 hbase-common/pom.xml    | 6 ++++++
 hbase-zookeeper/pom.xml | 9 ++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index ffc1f88d23e..3284440482b 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -50,6 +50,12 @@
         </includes>
         <filtering>true</filtering>
       </testResource>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <includes>
+          <include>**/**</include>
+        </includes>
+      </testResource>
     </testResources>
     <plugins>
       <plugin>
diff --git a/hbase-zookeeper/pom.xml b/hbase-zookeeper/pom.xml
index aff824bcb0a..aeb8d665946 100644
--- a/hbase-zookeeper/pom.xml
+++ b/hbase-zookeeper/pom.xml
@@ -43,6 +43,12 @@
         </includes>
         <filtering>true</filtering>
       </testResource>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <includes>
+          <include>**/**</include>
+        </includes>
+      </testResource>
     </testResources>
     <plugins>
       <plugin>
@@ -96,9 +102,6 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <additionalClasspathElements>
-            <additionalClasspathElement>src/test/resources</additionalClasspathElement>
-          </additionalClasspathElements>
           <properties>
             <property>
               <name>listener</name>