Repository: hbase Updated Branches: refs/heads/branch-1.1 30855853f -> ac258020f
HBASE-13963 Do not leak jdk.tools dependency from hbase-annotations Signed-off-by: Sean Busbey <[email protected]> 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/ac258020 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ac258020 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ac258020 Branch: refs/heads/branch-1.1 Commit: ac258020f098699bd358b752f6f13354517f4a8d Parents: 3085585 Author: Gábor Lipták <[email protected]> Authored: Wed Jun 24 22:10:13 2015 -0400 Committer: Sean Busbey <[email protected]> Committed: Thu Mar 10 09:31:53 2016 -0800 ---------------------------------------------------------------------- hbase-client/pom.xml | 6 ++++++ hbase-common/pom.xml | 6 ++++++ hbase-examples/pom.xml | 6 ++++++ hbase-hadoop2-compat/pom.xml | 6 ++++++ hbase-protocol/pom.xml | 6 ++++++ hbase-rest/pom.xml | 6 ++++++ hbase-testing-util/pom.xml | 6 ++++++ 7 files changed, 42 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ac258020/hbase-client/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index bf36e66..6bde52b 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -109,6 +109,12 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-annotations</artifactId> + <exclusions> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/ac258020/hbase-common/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 5ff24c5..436416b 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -229,6 +229,12 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-annotations</artifactId> + <exclusions> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/ac258020/hbase-examples/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index 5292248..60f7869 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -264,6 +264,12 @@ if we can combine these profiles somehow --> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> + <exclusions> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/ac258020/hbase-hadoop2-compat/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index 4b10c02..ce8da15 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -143,6 +143,12 @@ limitations under the License. <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-annotations</artifactId> + <exclusions> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/ac258020/hbase-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-protocol/pom.xml b/hbase-protocol/pom.xml index 4e05bd7..6ac78c0 100644 --- a/hbase-protocol/pom.xml +++ b/hbase-protocol/pom.xml @@ -110,6 +110,12 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-annotations</artifactId> + <exclusions> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> + </exclusions> </dependency> <!-- General dependencies --> <dependency> http://git-wip-us.apache.org/repos/asf/hbase/blob/ac258020/hbase-rest/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 7202d43..b6c6ed0 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -189,6 +189,12 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-annotations</artifactId> + <exclusions> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/ac258020/hbase-testing-util/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index b9b19ab..dd03d5b 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -59,6 +59,12 @@ <artifactId>hbase-annotations</artifactId> <type>test-jar</type> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId>
