This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 5a9b9c0 HBASE-22585 Ensure javax.annotation doesn't get include in
shaded artifacts when built with Java 11
5a9b9c0 is described below
commit 5a9b9c070f266b6ab138e9ec0c1399da522d8290
Author: Sakthi <[email protected]>
AuthorDate: Fri Jun 14 09:17:06 2019 -0700
HBASE-22585 Ensure javax.annotation doesn't get include in shaded artifacts
when built with Java 11
Signed-off-by: Sean Busbey <[email protected]>
(cherry picked from commit e14b5f0edc5bf5828122cd0f38ceaa8de00278d9)
---
hbase-shaded/hbase-shaded-client/pom.xml | 1 +
hbase-shaded/pom.xml | 1 +
2 files changed, 2 insertions(+)
diff --git a/hbase-shaded/hbase-shaded-client/pom.xml
b/hbase-shaded/hbase-shaded-client/pom.xml
index fa68ea4..fe1ebc2 100644
--- a/hbase-shaded/hbase-shaded-client/pom.xml
+++ b/hbase-shaded/hbase-shaded-client/pom.xml
@@ -57,6 +57,7 @@
<!-- exclude J2EE modules that come in for
JDK11+ (since
hadoop-3.2.0) or modules that come in
for JDK8+ but
need not be included -->
+
<exclude>javax.annotation:javax.annotation-api</exclude>
<exclude>javax.activation:javax.activation-api</exclude>
<!--
Tell the shade plugin that in this case
we want to include hadoop
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index e79b5ad..4e1e90d 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -135,6 +135,7 @@
<!-- exclude J2EE modules that come in
for JDK11+ (since
hadoop-3.2.0) or modules that
come in for JDK8+ but
need not be included -->
+
<exclude>javax.annotation:javax.annotation-api</exclude>
<exclude>javax.activation:javax.activation-api</exclude>
<!-- default to excluding Hadoop, have
module that want
to include it redefine the
exclude list -->
