Return-Path: 
 <commits-return-28917-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
X-Original-To: apmail-hbase-commits-archive@www.apache.org
Delivered-To: apmail-hbase-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3B83518419
	for <apmail-hbase-commits-archive@www.apache.org>;
 Tue, 17 Nov 2015 01:26:40 +0000 (UTC)
Received: (qmail 79113 invoked by uid 500); 17 Nov 2015 01:26:40 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 79073 invoked by uid 500); 17 Nov 2015 01:26:40 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 79064 invoked by uid 99); 17 Nov 2015 01:26:40 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Nov 2015 01:26:40 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id CC2D9E098F; Tue, 17 Nov 2015 01:26:39 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: zhangduo@apache.org
To: commits@hbase.apache.org
Message-Id: <2de9e1f260ff4c60aa4dc20e87597cc3@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: hbase git commit: HBASE-14806 Missing sources.jar for several modules
 when building HBase
Date: Tue, 17 Nov 2015 01:26:39 +0000 (UTC)

Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 c813146d1 -> 047e91298


HBASE-14806 Missing sources.jar for several modules when building HBase

Conflicts:
	hbase-common/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/047e9129
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/047e9129
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/047e9129

Branch: refs/heads/branch-1.2
Commit: 047e91298db914f0d651215b1199e35aa1ff7f9b
Parents: c813146
Author: zhangduo <zhangduo@wandoujia.com>
Authored: Tue Nov 17 08:54:13 2015 +0800
Committer: zhangduo <zhangduo@wandoujia.com>
Committed: Tue Nov 17 08:56:02 2015 +0800

----------------------------------------------------------------------
 hbase-common/pom.xml              | 26 ++++++++++++++------------
 hbase-external-blockcache/pom.xml | 29 ++++-------------------------
 2 files changed, 18 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/047e9129/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index 952ef1d..0465620 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -51,13 +51,17 @@
       </testResource>
     </testResources>
     <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <configuration>
-            <skip>true</skip>
-          </configuration>
-        </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
       <plugin>
         <!--Make it so assembly:single does nothing in here-->
         <artifactId>maven-assembly-plugin</artifactId>
@@ -148,11 +152,9 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
           <configuration>
-            <excludeResources>true</excludeResources>
-            <includes>
-              <include>src/main/java</include>
-              <include>${project.build.outputDirectory}/META-INF</include>
-            </includes>
+            <excludes>
+              <exclude>hbase-default.xml</exclude>
+            </excludes>
           </configuration>
         </plugin>
     </plugins>

http://git-wip-us.apache.org/repos/asf/hbase/blob/047e9129/hbase-external-blockcache/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml
index 69b7e0f..2116713 100644
--- a/hbase-external-blockcache/pom.xml
+++ b/hbase-external-blockcache/pom.xml
@@ -40,27 +40,13 @@
   </description>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources/</directory>
-        <includes>
-          <include>hbase-default.xml</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>src/test/resources/META-INF/</directory>
-        <targetPath>META-INF/</targetPath>
-        <includes>
-          <include>NOTICE</include>
-        </includes>
-        <filtering>true</filtering>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
           <skip>true</skip>
@@ -121,13 +107,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <configuration>
-          <excludeResources>true</excludeResources>
-          <includes>
-            <include>src/main/java</include>
-            <include>${project.build.outputDirectory}/META-INF</include>
-          </includes>
-        </configuration>
       </plugin>
     </plugins>
     <pluginManagement>