Repository: hbase Updated Branches: refs/heads/branch-2 d39be48f0 -> bc3ab8172 refs/heads/branch-2.1 198aa5dab -> 4d7221a68 refs/heads/master cc414bdea -> b7cdfe3ab
HBASE-21153 Shaded client jars should always build in relevant phase to avoid confusion Signed-off-by: Michael Stack <st...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b7cdfe3a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b7cdfe3a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b7cdfe3a Branch: refs/heads/master Commit: b7cdfe3ab07f38a54988b573ea7a2816c7cd6c60 Parents: cc414bd Author: Sean Busbey <bus...@apache.org> Authored: Wed Sep 5 14:15:06 2018 -0500 Committer: Sean Busbey <bus...@apache.org> Committed: Wed Sep 5 16:44:51 2018 -0500 ---------------------------------------------------------------------- .../hbase-shaded-client-byo-hadoop/pom.xml | 17 ++--- hbase-shaded/hbase-shaded-client/pom.xml | 65 +++++++++----------- hbase-shaded/hbase-shaded-mapreduce/pom.xml | 15 ++--- 3 files changed, 36 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b7cdfe3a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml index c51a1af..953e0b8 100644 --- a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml +++ b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml @@ -45,6 +45,10 @@ <skipAssembly>true</skipAssembly> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + </plugin> </plugins> </build> <dependencies> @@ -54,17 +58,4 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/hbase/blob/b7cdfe3a/hbase-shaded/hbase-shaded-client/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml index 6152aad..3f19305 100644 --- a/hbase-shaded/hbase-shaded-client/pom.xml +++ b/hbase-shaded/hbase-shaded-client/pom.xml @@ -45,6 +45,34 @@ <skipAssembly>true</skipAssembly> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <id>aggregate-into-a-jar-with-relocated-third-parties</id> + <configuration> + <artifactSet> + <excludes> + <!-- + Tell the shade plugin that in this case we want to include hadoop + by leaving out the exclude. + --> + <!-- The rest of these should be kept in sync with the parent pom --> + <exclude>org.apache.hbase:hbase-resource-bundle</exclude> + <exclude>org.slf4j:*</exclude> + <exclude>com.google.code.findbugs:*</exclude> + <exclude>com.github.stephenc.findbugs:*</exclude> + <exclude>org.apache.htrace:*</exclude> + <exclude>org.apache.yetus:*</exclude> + <exclude>log4j:*</exclude> + <exclude>commons-logging:*</exclude> + </excludes> + </artifactSet> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> @@ -55,41 +83,4 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <id>aggregate-into-a-jar-with-relocated-third-parties</id> - <configuration> - <artifactSet> - <excludes> - <!-- - Tell the shade plugin that in this case we want to include hadoop - by leaving out the exclude. - --> - <!-- The rest of these should be kept in sync with the parent pom --> - <exclude>org.apache.hbase:hbase-resource-bundle</exclude> - <exclude>org.slf4j:*</exclude> - <exclude>com.google.code.findbugs:*</exclude> - <exclude>com.github.stephenc.findbugs:*</exclude> - <exclude>org.apache.htrace:*</exclude> - <exclude>org.apache.yetus:*</exclude> - <exclude>log4j:*</exclude> - <exclude>commons-logging:*</exclude> - </excludes> - </artifactSet> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/hbase/blob/b7cdfe3a/hbase-shaded/hbase-shaded-mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml index fec88f1..e269aac 100644 --- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml +++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml @@ -59,6 +59,10 @@ </archive> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + </plugin> </plugins> </build> <dependencies> @@ -161,17 +165,6 @@ </dependencies> <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> <!-- These hadoop profiles should be derived from those in the hbase-mapreduce module. Essentially, you must list the same hadoop-* dependencies since provided dependencies are not transitively included.