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 31e508fa22d..688310fccb3 100644 --- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm +++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm @@ -1561,7 +1561,9 @@ You can redistribute it and/or modify it under either the terms of the GPL ## Whitelist of licenses that it's safe to not aggregate as above. ## Note that this doesn't include ALv2 or the aforementioned aggregate ## license mentions. -#set($non_aggregate_fine = [ 'Public Domain', 'New BSD license', 'BSD license', 'Mozilla Public License Version 2.0' ]) +## +## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html +#set($non_aggregate_fine = [ 'Public Domain', 'New BSD license', 'BSD license', 'Mozilla Public License Version 2.0', 'Creative Commons Attribution License, Version 2.5', 'MPL 1.1']) ## include LICENSE sections for anything not under ASL2.0 #foreach( ${dep} in ${projects} ) ## if there are no licenses we'll fail the build later, so diff --git a/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm b/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm index 368e8473ea4..53fb51e65f1 100644 --- a/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm +++ b/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm @@ -272,6 +272,29 @@ JRuby's licence. #if(${dep.artifactId.equals("jruby-complete")}) #set($jruby=true) #end +#if( ${dep.licenses.isEmpty()} ) +ERROR: This product includes ${dep.name} which has no licenses! +Revert the change if invalid or if intentional add license info to supplemental-models.xml + +${dep.groupId} +${dep.artifactId} +${dep.version} + +maven central search +g:${dep.groupId} AND a:${dep.artifactId} AND v:${dep.version} + +project website +${dep.url} +project source +${dep.scm.url} + + + +## fail the template. If you're looking at the source NOTICE.vm +## file based on a stacktrace or exception message, you need to find +## the generated NOTICE file that has the actual dependency info printed. +${dep.license[0]} +#end #if( !(${dep.licenses[0].name.contains("BSD")} || ${dep.licenses[0].name.contains("MIT")}) ) #if( !(${dep.licenses[0].name.equals("Public Domain")}) ) #if( !(${dep.licenses[0].name.contains("Apache Software License, Version 2.0")}) ) diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml index 0979b5f1f16..982a087ae17 100644 --- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml +++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml @@ -643,6 +643,21 @@ under the License. + + + org.apache.commons + commons-csv + 1.0 + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + org.apache.commons @@ -713,6 +728,21 @@ under the License. + + + org.apache.curator + curator-test + 2.7.1 + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + org.apache.directory.api @@ -783,6 +813,21 @@ under the License. + + + org.apache.htrace + htrace-core4 + 4.0.1-incubating + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + @@ -980,6 +1025,7 @@ under the License. + @@ -1052,7 +1098,7 @@ under the License. - + io.dropwizard.metrics metrics-core @@ -1082,6 +1128,143 @@ Copyright 2006 Envoi Solutions LLC + + + com.codahale.metrics + metrics-core + 3.0.1 + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.nimbusds + nimbus-jose-jwt + 3.9 + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.squareup.okhttp + okhttp + 2.4.0 + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.squareup.okio + okio + 1.4.0 + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + com.twitter + hpack + 0.11.0 + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + net.minidev + json-smart + 1.1.1 + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + + de.ruedigermoeller + fst + 2.24 + + + + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + + org.objenesis + objenesis + 2.1 + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + + + xerces + xercesImpl + 2.9.1 + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + @@ -2047,4 +2230,43 @@ Copyright (c) 2007-2011 The JRuby project + + + + net.jcip + jcip-annotations + 1.0 + + Brian Goetz and Tim Peierls + http://www.jcip.net + + + + Creative Commons Attribution License, Version 2.5 + http://creativecommons.org/licenses/by/2.5 + repo + + + + + + + com.google.re2j + re2j + 1.0 + + + The Go Authors + https://github.com/google/re2j + + + + BSD license + https://github.com/google/re2j/blob/master/LICENSE + repo + + + + + diff --git a/pom.xml b/pom.xml index e70fa173ff8..35b970849f4 100644 --- a/pom.xml +++ b/pom.xml @@ -1178,7 +1178,7 @@ ${compileSource} 2.7.1 - 3.0.0-SNAPSHOT + 3.0.0-alpha1