HBASE-18202 Remove unnecessary info from supplemental-models Signed-off-by: Michael Stack <st...@apache.org> Signed-off-by: Sean Busbey <bus...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/22df9265 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/22df9265 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/22df9265 Branch: refs/heads/HBASE-18147 Commit: 22df926541a2427d07f4a39e92c26069a889bc3f Parents: 8623d14 Author: Mike Drob <md...@apache.org> Authored: Tue Jun 20 16:27:40 2017 -0500 Committer: Sean Busbey <bus...@apache.org> Committed: Wed Jul 12 15:15:16 2017 -0500 ---------------------------------------------------------------------- .../src/main/resources/supplemental-models.xml | 1323 ++---------------- 1 file changed, 126 insertions(+), 1197 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/22df9265/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 87025c8..68e2d5f 100644 --- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml +++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml @@ -82,76 +82,6 @@ under the License. <!-- Artifacts with ambiguously named licenses in POM --> <supplement> <project> - <groupId>com.github.stephenc.findbugs</groupId> - <artifactId>findbugs-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>com.google.code.gson</groupId> - <artifactId>gson</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>com.google.guava</groupId> - <artifactId>guava</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>com.google.inject</groupId> - <artifactId>guice</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>com.google.inject.extensions</groupId> - <artifactId>guice-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> - <supplement> - <project> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> @@ -196,926 +126,7 @@ under the License. <project> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-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</groupId> - <artifactId>jetty-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> - <supplement> - <project> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</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-util-ajax</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-webapp</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-xml</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-jsp</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-security</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.orbit</groupId> - <artifactId>javax.servlet.jsp.jstl</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.orbit</groupId> - <artifactId>org.eclipse.jdt.core</artifactId> - - <licenses> - <license> - <name>Eclipse Public License 1.0</name> - <url>http://www.eclipse.org/legal/epl-v10.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.eclipse.jetty.toolchain</groupId> - <artifactId>jetty-schemas</artifactId> - <licenses> - <license> - <name>Common Development and Distribution License (CDDL) v1.0</name> - <url>https://glassfish.dev.java.net/public/CDDLv1.0.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.javassist</groupId> - <artifactId>javassist</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>com.lmax</groupId> - <artifactId>disruptor</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>commons-cli</groupId> - <artifactId>commons-cli</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>commons-codec</groupId> - <artifactId>commons-codec</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>commons-configuration</groupId> - <artifactId>commons-configuration</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>commons-daemon</groupId> - <artifactId>commons-daemon</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>commons-digester</groupId> - <artifactId>commons-digester</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>commons-el</groupId> - <artifactId>commons-el</artifactId> - <name>Apache Commons El</name> - - <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>commons-fileupload</groupId> - <artifactId>commons-fileupload</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>commons-io</groupId> - <artifactId>commons-io</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>commons-lang</groupId> - <artifactId>commons-lang</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>commons-logging</groupId> - <artifactId>commons-logging</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>commons-net</groupId> - <artifactId>commons-net</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> - <!-- Hadoop is needed for versions < 2.7.1 --> - <supplement> - <project> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-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.apache.hadoop</groupId> - <artifactId>hadoop-auth</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.apache.hadoop</groupId> - <artifactId>hadoop-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.apache.hadoop</groupId> - <artifactId>hadoop-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.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</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.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-app</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.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-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.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</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.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-jobclient</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.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-shuffle</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.apache.hadoop</groupId> - <artifactId>hadoop-yarn-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.apache.hadoop</groupId> - <artifactId>hadoop-yarn-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.apache.hadoop</groupId> - <artifactId>hadoop-yarn-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.apache.hadoop</groupId> - <artifactId>hadoop-yarn-server-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> - <!-- /Hadoop --> - <supplement> - <project> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</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.apache.httpcomponents</groupId> - <artifactId>httpcore</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>io.netty</groupId> - <artifactId>netty-all</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>commons-httpclient</groupId> - <artifactId>commons-httpclient</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>javax.inject</groupId> - <artifactId>javax.inject</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>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <licenses> - <license> - <name>Common Development and Distribution License (CDDL) v1.0</name> - <url>https://glassfish.dev.java.net/public/CDDLv1.0.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <licenses> - <license> - <name>Common Development and Distribution License (CDDL) v1.0</name> - <url>https://glassfish.dev.java.net/public/CDDLv1.0.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>javax.servlet.jsp</groupId> - <artifactId>javax.servlet.jsp-api</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish</groupId> - <artifactId>javax.el</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.hk2</groupId> - <artifactId>hk2-api</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.hk2</groupId> - <artifactId>hk2-locator</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.hk2</groupId> - <artifactId>hk2-utils</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.hk2</groupId> - <artifactId>osgi-resource-locator</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.hk2.external</groupId> - <artifactId>aopalliance-repackaged</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.hk2.external</groupId> - <artifactId>javax.inject</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.jersey.bundles.repackaged</groupId> - <artifactId>jersey-guava</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-common</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-server</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-jaxb</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-json-jackson1</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.web</groupId> - <artifactId>javax.servlet.jsp</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.glassfish.web</groupId> - <artifactId>javax.servlet.jsp.jstl</artifactId> - <licenses> - <license> - <name>CDDL 1.1</name> - <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>javax.validation</groupId> - <artifactId>validation-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.mortbay.jetty</groupId> - <artifactId>jetty-util</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>log4j</groupId> - <artifactId>log4j</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.apache.avro</groupId> - <artifactId>avro</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.apache.commons</groupId> - <artifactId>commons-compress</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> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> - <groupId>org.apache.commons</groupId> - <artifactId>commons-csv</artifactId> - <version>1.0</version> + <licenses> <license> <name>Apache License, Version 2.0</name> @@ -1125,11 +136,10 @@ under the License. </licenses> </project> </supplement> - <supplement> <project> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> <licenses> <license> @@ -1142,8 +152,8 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math3</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> <licenses> <license> @@ -1156,8 +166,8 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.curator</groupId> - <artifactId>curator-client</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> <licenses> <license> @@ -1170,8 +180,8 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.curator</groupId> - <artifactId>curator-framework</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> <licenses> <license> @@ -1184,8 +194,8 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.curator</groupId> - <artifactId>curator-recipes</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-xml</artifactId> <licenses> <license> @@ -1197,10 +207,9 @@ under the License. </project> </supplement> <supplement> - <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> - <groupId>org.apache.curator</groupId> - <artifactId>curator-test</artifactId> - <version>2.7.1</version> + <project> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jsp</artifactId> <licenses> <license> @@ -1213,8 +222,8 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.directory.api</groupId> - <artifactId>api-asn1-api</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> <licenses> <license> @@ -1227,8 +236,8 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.directory.api</groupId> - <artifactId>api-util</artifactId> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet.jsp.jstl</artifactId> <licenses> <license> @@ -1241,13 +250,13 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-i18n</artifactId> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>org.eclipse.jdt.core</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>Eclipse Public License 1.0</name> + <url>http://www.eclipse.org/legal/epl-v10.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1255,13 +264,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-kerberos-codec</artifactId> - + <groupId>org.eclipse.jetty.toolchain</groupId> + <artifactId>jetty-schemas</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>Common Development and Distribution License (CDDL) v1.0</name> + <url>https://glassfish.dev.java.net/public/CDDLv1.0.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1269,9 +277,8 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.htrace</groupId> - <artifactId>htrace-core</artifactId> - + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> <licenses> <license> <name>Apache License, Version 2.0</name> @@ -1281,11 +288,13 @@ under the License. </licenses> </project> </supplement> + <!-- Hadoop is needed for versions < 2.7.1 --> + <!-- /Hadoop --> <supplement> - <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> - <groupId>org.apache.htrace</groupId> - <artifactId>htrace-core4</artifactId> - <version>4.0.1-incubating</version> + <project> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <licenses> <license> <name>Apache License, Version 2.0</name> @@ -1295,17 +304,14 @@ under the License. </licenses> </project> </supplement> - - <!-- Used by Hadoop 2.6 --> <supplement> <project> - <groupId>org.htrace</groupId> - <artifactId>htrace-core</artifactId> - + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>Common Development and Distribution License (CDDL) v1.0</name> + <url>https://glassfish.dev.java.net/public/CDDLv1.0.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1313,13 +319,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>Common Development and Distribution License (CDDL) v1.0</name> + <url>https://glassfish.dev.java.net/public/CDDLv1.0.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1327,13 +332,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>batik-css</artifactId> - + <groupId>javax.servlet.jsp</groupId> + <artifactId>javax.servlet.jsp-api</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1341,13 +345,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>batik-ext</artifactId> - + <groupId>org.glassfish</groupId> + <artifactId>javax.el</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1355,13 +358,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>batik-util</artifactId> - + <groupId>org.glassfish.hk2</groupId> + <artifactId>hk2-api</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1369,13 +371,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - + <groupId>org.glassfish.hk2</groupId> + <artifactId>hk2-locator</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1383,13 +384,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> - + <groupId>org.glassfish.hk2</groupId> + <artifactId>hk2-utils</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1397,13 +397,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - + <groupId>org.glassfish.hk2</groupId> + <artifactId>osgi-resource-locator</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1411,13 +410,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-xc</artifactId> - + <groupId>org.glassfish.hk2.external</groupId> + <artifactId>aopalliance-repackaged</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1425,13 +423,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.xerial.snappy</groupId> - <artifactId>snappy-java</artifactId> - + <groupId>org.glassfish.hk2.external</groupId> + <artifactId>javax.inject</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1439,13 +436,12 @@ under the License. </supplement> <supplement> <project> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - + <groupId>org.glassfish.jersey.bundles.repackaged</groupId> + <artifactId>jersey-guava</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1453,13 +449,12 @@ under the License. </supplement> <supplement> <project> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet-core</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1467,13 +462,12 @@ under the License. </supplement> <supplement> <project> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1481,29 +475,25 @@ under the License. </supplement> <supplement> <project> - <groupId>xml-apis</groupId> - <artifactId>xml-apis-ext</artifactId> - + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-common</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> </project> </supplement> - -<!-- Ambiguous license names in server and not in client --> <supplement> <project> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> - + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-server</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1511,13 +501,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-jaxb</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1525,13 +514,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-sslengine</artifactId> - + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-json-jackson1</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1539,13 +527,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jsp-api-2.1</artifactId> - + <groupId>org.glassfish.web</groupId> + <artifactId>javax.servlet.jsp</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1553,13 +540,12 @@ under the License. </supplement> <supplement> <project> - <groupId>com.jamesmurty.utils</groupId> - <artifactId>java-xmlbuilder</artifactId> - + <groupId>org.glassfish.web</groupId> + <artifactId>javax.servlet.jsp.jstl</artifactId> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>CDDL 1.1</name> + <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url> <distribution>repo</distribution> </license> </licenses> @@ -1567,8 +553,8 @@ under the License. </supplement> <supplement> <project> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-core</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> <licenses> <license> @@ -1579,28 +565,30 @@ under the License. </licenses> </project> </supplement> + + + <!-- Used by Hadoop 2.6 --> + +<!-- Ambiguous license names in server and not in client --> <supplement> <project> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> <licenses> <license> <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> - <comments> -Copyright 2006 Envoi Solutions LLC -</comments> </license> </licenses> </project> </supplement> <supplement> - <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> - <groupId>com.codahale.metrics</groupId> + <project> + <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> - <version>3.0.1</version> + <licenses> <license> <name>Apache License, Version 2.0</name> @@ -1610,11 +598,12 @@ Copyright 2006 Envoi Solutions LLC </licenses> </project> </supplement> + <supplement> <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> - <groupId>com.nimbusds</groupId> - <artifactId>nimbus-jose-jwt</artifactId> - <version>3.9</version> + <groupId>com.codahale.metrics</groupId> + <artifactId>metrics-core</artifactId> + <version>3.0.1</version> <licenses> <license> <name>Apache License, Version 2.0</name> @@ -1652,34 +641,6 @@ Copyright 2006 Envoi Solutions LLC </licenses> </project> </supplement> - <supplement> - <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> - <groupId>com.twitter</groupId> - <artifactId>hpack</artifactId> - <version>0.11.0</version> - <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> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> - <groupId>net.minidev</groupId> - <artifactId>json-smart</artifactId> - <version>1.1.1</version> - <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> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 --> @@ -1717,20 +678,6 @@ Copyright 2006 Envoi Solutions LLC <!-- xercesImpl is necessary when using -Dhadoop.profile=3.0 due to a bug in maven. (last tested with mvn 3.3.9) See HBASE-16712 for more details.--> - <supplement> - <project> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> - <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> <!-- Permissive licenses that need text in LICENSE --> @@ -2712,24 +1659,6 @@ Copyright (c) 2007-2017 The JRuby project </licenses> </project> </supplement> - <supplement> - <project> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - - <organization> - <name>The Apache Software Foundation</name> - <url>http://www.apache.org/</url> - </organization> - <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>
