[1/2] hbase git commit: HBASE-16318 consistently use the correct name for 'Apache License, Version 2.0'
Repository: hbase Updated Branches: refs/heads/0.98 8168667f3 -> efe57b196 HBASE-16318 consistently use the correct name for 'Apache License, Version 2.0' Signed-off-by: Andrew PurtellConflicts: hbase-resource-bundle/src/main/resources/supplemental-models.xml Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0f455127 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0f455127 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0f455127 Branch: refs/heads/0.98 Commit: 0f455127b3e6f080400f09b76d87cfd1be8cbc81 Parents: 8168667 Author: Sean Busbey Authored: Tue Aug 2 00:54:50 2016 -0500 Committer: Sean Busbey Committed: Wed Aug 17 14:51:56 2016 -0700 -- .../src/main/resources/META-INF/LICENSE.vm |2 +- .../src/main/resources/supplemental-models.xml | 1030 -- pom.xml | 11 + 3 files changed, 967 insertions(+), 76 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/0f455127/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/0f455127/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 55b3d58..810ebec 100644 --- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml +++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml @@ -36,6 +36,711 @@ under the License. + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + commons-beanutils + commons-beanutils + + +The Apache Software Foundation +http://www.apache.org/ + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + commons-beanutils + commons-beanutils-core + + +The Apache Software Foundation +http://www.apache.org/ + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + org.apache.hadoop + hadoop-core + + +The Apache Software Foundation +http://www.apache.org/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + + com.github.stephenc.findbugs + findbugs-annotations + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.code.gson + gson + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.guava + guava + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.inject + guice + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.inject.extensions + guice-servlet + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.lmax + disruptor + + + + Apache License,
[1/2] hbase git commit: HBASE-16318 consistently use the correct name for 'Apache License, Version 2.0'
Repository: hbase Updated Branches: refs/heads/branch-1.1 176040bd7 -> d82cf96f2 HBASE-16318 consistently use the correct name for 'Apache License, Version 2.0' Signed-off-by: Andrew PurtellProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5eb0a540 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5eb0a540 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5eb0a540 Branch: refs/heads/branch-1.1 Commit: 5eb0a540f885c99a87a55a2c38765a1a89a16bdc Parents: 176040b Author: Sean Busbey Authored: Tue Aug 2 00:54:50 2016 -0500 Committer: Sean Busbey Committed: Wed Aug 17 14:23:26 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/5eb0a540/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/5eb0a540/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 faa7887..c03d348 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. - The Apache Software License, Version 2.0 + Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -54,7 +54,25 @@ under the License. - The Apache Software License, Version 2.0 + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + commons-beanutils + commons-beanutils-core + + +The Apache Software Foundation +http://www.apache.org/ + + + + Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -64,12 +82,547 @@ under the License. - com.github.stephenc.findbugs - findbugs-annotations + com.github.stephenc.findbugs + findbugs-annotations + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.code.gson + gson + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.guava + guava + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.inject + guice + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.inject.extensions + guice-servlet + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.lmax + disruptor + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + commons-cli + commons-cli + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + +
[1/2] hbase git commit: HBASE-16318 consistently use the correct name for 'Apache License, Version 2.0'
Repository: hbase Updated Branches: refs/heads/branch-1.2 45beeec0f -> ca1b49dd0 HBASE-16318 consistently use the correct name for 'Apache License, Version 2.0' Signed-off-by: Andrew PurtellProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3f30d420 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3f30d420 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3f30d420 Branch: refs/heads/branch-1.2 Commit: 3f30d420c773ab173252d2bfadf2df095d715878 Parents: 45beeec Author: Sean Busbey Authored: Tue Aug 2 00:54:50 2016 -0500 Committer: Sean Busbey Committed: Wed Aug 17 14:14:46 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/3f30d420/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/3f30d420/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. - The Apache Software License, Version 2.0 + Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -54,7 +54,25 @@ under the License. - The Apache Software License, Version 2.0 + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + commons-beanutils + commons-beanutils-core + + +The Apache Software Foundation +http://www.apache.org/ + + + + Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -64,12 +82,547 @@ under the License. - com.github.stephenc.findbugs - findbugs-annotations + com.github.stephenc.findbugs + findbugs-annotations + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.code.gson + gson + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.guava + guava + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.inject + guice + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.inject.extensions + guice-servlet + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.lmax + disruptor + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + commons-cli + commons-cli + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + +
[1/2] hbase git commit: HBASE-16318 consistently use the correct name for 'Apache License, Version 2.0'
Repository: hbase Updated Branches: refs/heads/branch-1.3 f32016614 -> 4e78f7a99 HBASE-16318 consistently use the correct name for 'Apache License, Version 2.0' Signed-off-by: Andrew PurtellProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/75950de0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/75950de0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/75950de0 Branch: refs/heads/branch-1.3 Commit: 75950de09ea9b0f1dc893f0724c73fb2a618e4ed Parents: f320166 Author: Sean Busbey Authored: Tue Aug 2 00:54:50 2016 -0500 Committer: Sean Busbey Committed: Wed Aug 17 14:01:48 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/75950de0/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/75950de0/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. - The Apache Software License, Version 2.0 + Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -54,7 +54,25 @@ under the License. - The Apache Software License, Version 2.0 + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + commons-beanutils + commons-beanutils-core + + +The Apache Software Foundation +http://www.apache.org/ + + + + Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -64,12 +82,547 @@ under the License. - com.github.stephenc.findbugs - findbugs-annotations + com.github.stephenc.findbugs + findbugs-annotations + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.code.gson + gson + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.guava + guava + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.inject + guice + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.inject.extensions + guice-servlet + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.lmax + disruptor + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + commons-cli + commons-cli + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + +
[1/2] hbase git commit: HBASE-16318 consistently use the correct name for 'Apache License, Version 2.0'
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 PurtellProject: 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 Authored: Tue Aug 2 00:54:50 2016 -0500 Committer: Sean Busbey 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. - The Apache Software License, Version 2.0 + Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -54,7 +54,25 @@ under the License. - The Apache Software License, Version 2.0 + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + commons-beanutils + commons-beanutils-core + + +The Apache Software Foundation +http://www.apache.org/ + + + + Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -64,12 +82,547 @@ under the License. - com.github.stephenc.findbugs - findbugs-annotations + com.github.stephenc.findbugs + findbugs-annotations + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.code.gson + gson + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.guava + guava + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.inject + guice + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.google.inject.extensions + guice-servlet + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.lmax + disruptor + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + commons-cli + commons-cli + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + +