Repository: hbase Updated Branches: refs/heads/master d5e4faacc -> 4b86dd248
HBASE-21371. Hbase unable to compile against Hadoop trunk (3.3.0-SNAPSHOT) due to license error Signed-off-by: Michael Stack <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4b86dd24 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4b86dd24 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4b86dd24 Branch: refs/heads/master Commit: 4b86dd248a425409d3bcc93e6eee370007263967 Parents: d5e4faa 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:39:37 2018 -0700 ---------------------------------------------------------------------- .../src/main/resources/supplemental-models.xml | 174 +++++++++++++++++++ 1 file changed, 174 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/4b86dd24/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 c42e284..103919c 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> @@ -552,6 +568,164 @@ under the License. </licenses> </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 -->
