HBASE-28718 Should support different license name for 'Apache License…

…, Version 2.0' (apache#6056) Signed-off-by: GeorryHuang <huangzhuoyue@apache.org>
Apache9 · Jul 9, 2024 · 2a4c7cd · 2a4c7cd
1 parent 5082212
commit 2a4c7cd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 467 deletions.
diff --git a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1465,7 +1465,16 @@ project website
 ${dep.url}
 project source
 ${dep.scm.url}
-#elseif( !(${dep.licenses[0].name.contains("Apache License, Version 2.0")} || ${dep.licenses[0].name.contains("The Apache Software License, Version 2.0")}) )
+#*
+  "Apache License, Version 2.0" is the official name in the past
+  "The Apache Software License, Version 2.0" is the official name in the past too
+  "Apache Software License - Version 2.0" is what jetty uses in pom
+  "Apache-2.0" is the new short official name
+*#
+#elseif( !(${dep.licenses[0].name.contains("Apache License, Version 2.0")}
+  || ${dep.licenses[0].name.contains("The Apache Software License, Version 2.0")}
+  || ${dep.licenses[0].name.contains("Apache Software License - Version 2.0")}
+  || ${dep.licenses[0].name.contains("Apache-2.0")}) )
 #if( ${dep.licenses[0].name.contains("CDDL")} )
 #if( ${dep.licenses[0].name.contains("1.0")} )
 #set($aggregated = $cddl_1_0.add($dep))