From 9fd6b9c3c5821ed8049e22d17973c9cb9542a313 Mon Sep 17 00:00:00 2001 From: Josh Elser Date: Mon, 4 Jun 2018 19:19:52 -0400 Subject: [PATCH] HBASE-20681 Explicitly add dependency on hamcrest HBase ITs require junit which requires hamcrest. Hadoop recently stopped including hamcrest in their installation (and thus our inherited classpath), which means that we need to ship it. --- hbase-assembly/pom.xml | 6 ++++++ hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm | 2 +- hbase-shaded/pom.xml | 6 ++++-- pom.xml | 1 - 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index 5da105b24e..ef7a083495 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -195,6 +195,12 @@ hbase-it test-jar + + + org.hamcrest + hamcrest-core + org.apache.hbase hbase-server diff --git a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm index 05893a63ef..d64a7be3c1 100644 --- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm +++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm @@ -1338,7 +1338,7 @@ You can redistribute it and/or modify it under either the terms of the ## license mentions. ## ## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html -#set($non_aggregate_fine = [ 'Public Domain', 'New BSD license', 'BSD license', 'BSD', 'BSD 2-Clause license', 'Mozilla Public License Version 1.1', 'Mozilla Public License Version 2.0', 'Creative Commons Attribution License, Version 2.5' ]) +#set($non_aggregate_fine = [ 'Public Domain', 'New BSD License', 'New BSD license', 'BSD license', 'BSD', 'BSD 2-Clause license', 'Mozilla Public License Version 1.1', 'Mozilla Public License Version 2.0', 'Creative Commons Attribution License, Version 2.5' ]) ## include LICENSE sections for anything not under ASL2.0 #foreach( ${dep} in ${projects} ) ## if there are no licenses we'll fail the build later, so diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index 24c515844e..7a5f678726 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -418,8 +418,10 @@ org.junit ${shaded.prefix}.org.junit - - + + org.hamcrest + ${shaded.prefix}.org.hamcrest +