You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2018/09/05 22:02:26 UTC
[3/3] hbase git commit: HBASE-21153 Shaded client jars should always
build in relevant phase to avoid confusion
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/4d7221a6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4d7221a6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4d7221a6
Branch: refs/heads/branch-2.1
Commit: 4d7221a68fc155284340c67f836edc78f3be5fc4
Parents: 198aa5d
Author: Sean Busbey <bu...@apache.org>
Authored: Wed Sep 5 14:15:06 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Sep 5 16:53:47 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/4d7221a6/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 94f42ef..e52798b 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/4d7221a6/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 1c19767..df881ba 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/4d7221a6/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 3f47e41..bd3076f 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>
@@ -165,17 +169,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.