Repository: hbase Updated Branches: refs/heads/branch-2.0 f9e8d69e8 -> 80d1370a6
HBASE-21371. Hbase unable to compile against Hadoop trunk (3.3.0-SNAPSHOT) due to license error Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/80d1370a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/80d1370a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/80d1370a Branch: refs/heads/branch-2.0 Commit: 80d1370a617d7132b4d7c592d760979f8fcd0234 Parents: f9e8d69 Author: Wei-Chiu Chuang <[email protected]> Authored: Tue Oct 23 10:08:11 2018 -0700 Committer: Michael Stack <[email protected]> Committed: Mon Oct 29 14:25:00 2018 -0700 ---------------------------------------------------------------------- .../src/main/resources/supplemental-models.xml | 174 +++++++++++++++++++ 1 file changed, 174 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/80d1370a/hbase-resource-bundle/src/main/resources/supplemental-models.xml ---------------------------------------------------------------------- diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml index 9897769..6e19c94 100644 --- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml +++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml @@ -24,6 +24,22 @@ under the License. hbase-shaded-server versions, with the execption of moving the text of the CPL to LICENSE.vm --> <!-- All of the below missing / ambiguous / full text license info verified at dependency source --> +<!-- Dual licensed dependencies--> + <supplement> + <project> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + <!-- javax.activation-api is also separately licensed under the GPL version 2 plus the Classpath Exception --> + <licenses> + <license> + <name>CDDL 1.1</name> + <url>https://github.com/javaee/activation/blob/master/LICENSE.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <!-- Artifacts missing license info in POM --> <supplement> <project> @@ -1310,6 +1326,164 @@ under the License. </project> </supplement> + <supplement> + <project> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + + <licenses> + <!-- bcpkix-jdk15on is licensed under the Bouncy Castle License, which is equivalent to the MIT License --> + <license> + <name>MIT License</name> + <url>http://www.opensource.org/licenses/mit-license.php</url> + <distribution>repo</distribution> + <comments> + Copyright (c) 2000 - 2018 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) + </comments> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-annotations</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jndi</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-plus</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>javax-websocket-client-impl</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>javax-websocket-server-impl</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-api</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-client</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-common</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-server</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + <supplement> + <project> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-servlet</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> <!-- Used by Hadoop 2.6 --> <supplement> <project>
