Repository: hbase-thirdparty Updated Branches: refs/heads/master 94f75fbb6 -> adcec63ed
HBASE-20216 Shade commons-cli Signed-off-by: Mike Drob <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/commit/adcec63e Tree: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/tree/adcec63e Diff: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/diff/adcec63e Branch: refs/heads/master Commit: adcec63ed2fb4a28454e38de808606f37ece3953 Parents: 94f75fb Author: Josh Elser <[email protected]> Authored: Fri Mar 16 16:31:53 2018 -0400 Committer: Josh Elser <[email protected]> Committed: Mon Mar 19 11:21:16 2018 -0400 ---------------------------------------------------------------------- .gitignore | 3 +++ hbase-shaded-miscellaneous/pom.xml | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/blob/adcec63e/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index afa17c0..3c9ac01 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ **/target **/dependency-reduced-pom.xml hbase-shaded-protobuf/src/main/java/ +.project +.settings +.classpath http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/blob/adcec63e/hbase-shaded-miscellaneous/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shaded-miscellaneous/pom.xml b/hbase-shaded-miscellaneous/pom.xml index 0a985c2..11b88d4 100644 --- a/hbase-shaded-miscellaneous/pom.xml +++ b/hbase-shaded-miscellaneous/pom.xml @@ -76,6 +76,10 @@ <exclude>com.google.errorprone.annotations.CanIgnoreReturnValue</exclude> </excludes> </relocation> + <relocation> + <pattern>org.apache.commons.cli</pattern> + <shadedPattern>${rename.offset}.org.apache.commons.cli</shadedPattern> + </relocation> </relocations> <artifactSet> <excludes> @@ -93,6 +97,13 @@ <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude> </excludes> </artifactSet> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> + <addHeader>false</addHeader> + </transformer> + </transformers> </configuration> </execution> </executions> @@ -141,5 +152,10 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.4</version> + </dependency> </dependencies> </project>
