[
https://issues.apache.org/jira/browse/HBASE-20681?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16502137#comment-16502137
]
Sean Busbey commented on HBASE-20681:
-------------------------------------
{code}
<!-- Need to filter out some extraneous license files.
diff --git a/pom.xml b/pom.xml
index ed7a1722ba..bad3bb5692 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2111,7 +2111,6 @@
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>${hamcrest.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
{code}
Ugh. this scope change smells bad. Can we find a different way to get things
included in the specific context where we need it?
please keep hamcrest out of the default process classpath (e.g. do the same
thing we do with jruby but for when we're running integration tests). If you
can also move JUnit out of or default classpath at the same time that would be
fabulous.
{code}
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 @@
<pattern>org.junit</pattern>
<shadedPattern>${shaded.prefix}.org.junit</shadedPattern>
</relocation>
-
-
+ <relocation>
+ <pattern>org.hamcrest</pattern>
+
<shadedPattern>${shaded.prefix}.org.hamcrest</shadedPattern>
+ </relocation>
</relocations>
<transformers>
{code}
Do we actually need hamcrest in the shaded artifacts, or is this just a side
effect of the scope change above? Could we filter it out instead of relocating
it?
{code}
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
{code}
please either make the name match case insensitive or add a supplemental info
entry that corrects the name for hamcrest. Let's try to keep a single instance
of names here.
> IntegrationTestDriver fails after HADOOP-15406 due to missing hamcrest-core
> ---------------------------------------------------------------------------
>
> Key: HBASE-20681
> URL: https://issues.apache.org/jira/browse/HBASE-20681
> Project: HBase
> Issue Type: Bug
> Components: integration tests
> Reporter: Romil Choksi
> Assignee: Josh Elser
> Priority: Major
> Fix For: 3.0.0, 2.1.0, 2.0.1
>
> Attachments: HBASE-20681.001.patch, HBASE-20681.002.patch
>
>
> HADOOP-15406 marked mockito and junit as test-only dependencies which, I
> believe, has stopped them from being included in a stock Hadoop classpath.
> Prior, you'd get hamcrest at {{share/hadoop/common/lib/hamcrest-core-1.3.jar}}
> However, we depend on it being there for our junit in hbase-it:
> {noformat}
> [INFO] --- maven-dependency-plugin:3.0.1:tree (default-cli) @ hbase-it ---
> [INFO] org.apache.hbase:hbase-it:jar:2.0.1-SNAPSHOT
> [INFO] +- junit:junit:jar:4.12:test
> [INFO] | \- org.hamcrest:hamcrest-core:jar:1.3:test
> {noformat}
> We need to make sure we include it.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)