Repository: hbase Updated Branches: refs/heads/hbase-12439 f218e499a -> c92737c0e
HBASE-14806 Missing sources.jar for several modules when building HBase Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/db42fc64 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/db42fc64 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/db42fc64 Branch: refs/heads/hbase-12439 Commit: db42fc64f1e54ab8b47799eae7920f7298a5a406 Parents: f218e49 Author: zhangduo <[email protected]> Authored: Tue Nov 17 08:54:13 2015 +0800 Committer: zhangduo <[email protected]> Committed: Tue Nov 17 08:54:13 2015 +0800 ---------------------------------------------------------------------- hbase-common/pom.xml | 12 +++++++----- hbase-external-blockcache/pom.xml | 29 ++++------------------------- 2 files changed, 11 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/db42fc64/hbase-common/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 390b5b4..5b43553 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -53,6 +53,10 @@ <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> @@ -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/db42fc64/hbase-external-blockcache/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml index a46f1a5..17def38 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>
