HBASE-20681 Explicitly include hamcrest in binary tarball

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.

Signed-off-by: Sean Busbey <busbey@apache.org>
This commit is contained in:
Josh Elser 2018-06-04 19:19:52 -04:00 committed by Sean Busbey
parent 86653c708f
commit 30772eef5d
4 changed files with 13 additions and 6 deletions

View File

@ -195,6 +195,14 @@
<artifactId>hbase-it</artifactId>
<type>test-jar</type>
</dependency>
<!-- Hamcrest is required by hbase-it (via junit), but as long as we're grabbing the hbase-it test-jar,
maven dependency resolution won't pick it up for us. -->
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<!-- Overriding the scope in depMgmt -->
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>

View File

@ -1333,12 +1333,14 @@ You can redistribute it and/or modify it under either the terms of the
#set($jruby = false)
## track hadoops
#set($hadoop = false)
## Whitelist of licenses that it's safe to not aggregate as above.
## Whitelist of lower-case licenses that it's safe to not aggregate as above.
## Note that this doesn't include ALv2 or the aforementioned aggregate
## 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' ])
##
## NB: This list is later compared as lower-case. New entries must also be all lower-case
#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' ])
## 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
@ -1449,7 +1451,7 @@ This product includes ${dep.name} licensed under the ${dep.licenses[0].name}.
#if( $dep.licenses[0].comments && !$dep.licenses[0].comments.empty )
${dep.licenses[0].comments}
#end
#if(!(${non_aggregate_fine.contains($dep.licenses[0].name)}))
#if(!(${non_aggregate_fine.contains($dep.licenses[0].name.toLowerCase())}))
ERROR: Please check ^^^^^^^^^^^^ this License for acceptability here:
https://www.apache.org/legal/resolved

View File

@ -1698,5 +1698,4 @@ Copyright (c) 2007-2017 The JRuby project
</licenses>
</project>
</supplement>
</supplementalDataModels>

View File

@ -418,8 +418,6 @@
<pattern>org.junit</pattern>
<shadedPattern>${shaded.prefix}.org.junit</shadedPattern>
</relocation>
</relocations>
<transformers>
<!-- Need to filter out some extraneous license files.