Repository: hbase
Updated Branches:
refs/heads/branch-1 47d59288a -> f8ee447c5
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/f8ee447c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f8ee447c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f8ee447c
Branch: refs/heads/branch-1
Commit: f8ee447c55c713e69503360509076d832fdd6240
Parents: 47d5928
Author: zhangduo <zhang...@wandoujia.com>
Authored: Tue Nov 17 08:54:13 2015 +0800
Committer: zhangduo <zhang...@wandoujia.com>
Committed: Tue Nov 17 08:55:24 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/f8ee447c/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index fa3da15..46447ad 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/f8ee447c/hbase-external-blockcache/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-external-blockcache/pom.xml
b/hbase-external-blockcache/pom.xml
index b2ee4dc..dbb4ca7 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>
