Repository: hbase Updated Branches: refs/heads/branch-1 3d7bcd020 -> 0175e432c
HBASE-16318 consistently use the correct name for 'Apache License, Version 2.0' Signed-off-by: Andrew Purtell <apurt...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/df4953c2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/df4953c2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/df4953c2 Branch: refs/heads/branch-1 Commit: df4953c22e8578922d5f4fa77b7a78c30a9b0a1a Parents: 3d7bcd0 Author: Sean Busbey <bus...@apache.org> Authored: Tue Aug 2 00:54:50 2016 -0500 Committer: Sean Busbey <bus...@apache.org> Committed: Wed Aug 17 13:28:53 2016 -0700 ---------------------------------------------------------------------- .../src/main/resources/META-INF/LICENSE.vm | 2 +- .../src/main/resources/supplemental-models.xml | 906 ++++++++++++++++++- pom.xml | 11 + 3 files changed, 891 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/df4953c2/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm ---------------------------------------------------------------------- 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 d00b17c..e046222 100644 --- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm +++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm @@ -1616,7 +1616,7 @@ ${dep.scm.url} #thrift_license() #end ## Note that this will fail the build if we don't have a license. update supplemental-models. -#if( !(${dep.licenses[0].name.contains("Apache Software License, Version 2.0")}) ) +#if( !(${dep.licenses[0].name.contains("Apache License, Version 2.0")}) ) #if( ${dep.licenses[0].name.contains("CDDL")} ) #if( ${dep.licenses[0].name.contains("1.0")} ) #set($aggregated = $cddl_1_0.add($dep)) http://git-wip-us.apache.org/repos/asf/hbase/blob/df4953c2/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 d01f188..d6237d0 100644 --- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml +++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml @@ -36,7 +36,7 @@ under the License. </organization> <licenses> <license> - <name>The Apache Software License, Version 2.0</name> + <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> @@ -54,7 +54,25 @@ under the License. </organization> <licenses> <license> - <name>The Apache Software License, Version 2.0</name> + <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-beanutils</groupId> + <artifactId>commons-beanutils-core</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> @@ -64,12 +82,547 @@ under the License. <!-- Artifacts with ambiguously named licenses in POM --> <supplement> <project> - <groupId>com.github.stephenc.findbugs</groupId> - <artifactId>findbugs-annotations</artifactId> + <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>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>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>The Apache Software License, Version 2.0</name> + <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> @@ -78,12 +631,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> <licenses> <license> - <name>The Apache Software License, Version 2.0</name> + <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> @@ -92,12 +645,12 @@ under the License. </supplement> <supplement> <project> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> <licenses> <license> - <name>The Apache Software License, Version 2.0</name> + <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> @@ -106,12 +659,12 @@ under the License. </supplement> <supplement> <project> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math3</artifactId> <licenses> <license> - <name>The Apache Software License, Version 2.0</name> + <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> @@ -120,12 +673,12 @@ under the License. </supplement> <supplement> <project> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> + <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> <licenses> <license> - <name>The Apache Software License, Version 2.0</name> + <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> @@ -134,12 +687,293 @@ under the License. </supplement> <supplement> <project> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</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.curator</groupId> + <artifactId>curator-recipes</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.directory.api</groupId> + <artifactId>api-asn1-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.directory.api</groupId> + <artifactId>api-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.apache.directory.server</groupId> + <artifactId>apacheds-i18n</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.directory.server</groupId> + <artifactId>apacheds-kerberos-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>org.apache.htrace</groupId> + <artifactId>htrace-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> + <!-- Used by Hadoop 2.6 --> + <supplement> + <project> + <groupId>org.htrace</groupId> + <artifactId>htrace-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.thrift</groupId> + <artifactId>libthrift</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.xmlgraphics</groupId> + <artifactId>batik-css</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.xmlgraphics</groupId> + <artifactId>batik-ext</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.xmlgraphics</groupId> + <artifactId>batik-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.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</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.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</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.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</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.codehaus.jackson</groupId> + <artifactId>jackson-xc</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.xerial.snappy</groupId> + <artifactId>snappy-java</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>tomcat</groupId> + <artifactId>jasper-compiler</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>tomcat</groupId> + <artifactId>jasper-runtime</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>xml-apis</groupId> + <artifactId>xml-apis</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>xml-apis</groupId> + <artifactId>xml-apis-ext</artifactId> <licenses> <license> - <name>The Apache Software License, Version 2.0</name> + <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> @@ -154,7 +988,7 @@ under the License. <licenses> <license> - <name>The Apache Software License, Version 2.0</name> + <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> @@ -168,7 +1002,7 @@ under the License. <licenses> <license> - <name>The Apache Software License, Version 2.0</name> + <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> @@ -182,7 +1016,7 @@ under the License. <licenses> <license> - <name>The Apache Software License, Version 2.0</name> + <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> @@ -196,7 +1030,7 @@ under the License. <licenses> <license> - <name>The Apache Software License, Version 2.0</name> + <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> @@ -210,7 +1044,7 @@ under the License. <licenses> <license> - <name>The Apache Software License, Version 2.0</name> + <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> @@ -224,7 +1058,7 @@ under the License. <licenses> <license> - <name>The Apache Software License, Version 2.0</name> + <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> @@ -238,7 +1072,7 @@ under the License. <licenses> <license> - <name>The Apache Software License, Version 2.0</name> + <name>Apache License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> <comments> @@ -1195,4 +2029,22 @@ Copyright (c) 2007-2011 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> </supplementalDataModels> http://git-wip-us.apache.org/repos/asf/hbase/blob/df4953c2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b7cded7..322823e 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,17 @@ </description> <url>http://hbase.apache.org</url> <inceptionYear>2007</inceptionYear> + <!-- Set here so we can consistently use the correct name, even on branches with + an ASF parent pom older than v15. Also uses the url from v18. + --> + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <modules> <module>hbase-resource-bundle</module> <module>hbase-server</module>
