This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 6434e6e28dd HBASE-29820 Bump the syntax of velocity template to align
with velocity 2.x syntax (#7622)
6434e6e28dd is described below
commit 6434e6e28dddc76e145747c3c629d693280b440c
Author: Aman Poonia <[email protected]>
AuthorDate: Mon Jan 19 12:43:56 2026 +0530
HBASE-29820 Bump the syntax of velocity template to align with velocity 2.x
syntax (#7622)
Signed-off-by: Istvan Toth <[email protected]>
Signed-off-by: Viraj Jasani <[email protected]>
---
hbase-assembly/pom.xml | 14 ++++++------
hbase-http/pom.xml | 14 ++++++------
.../src/main/resources/META-INF/LICENSE.vm | 26 +++++++++++-----------
.../src/main/resources/META-INF/NOTICE.vm | 26 +++++++++++-----------
hbase-server/pom.xml | 14 ++++++------
hbase-shaded/pom.xml | 14 ++++++------
6 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index f2080226f0c..8ff8fcdf2a7 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -249,13 +249,13 @@
</goals>
<configuration>
<properties>
- <copyright-end-year>${build.year}</copyright-end-year>
-
<debug-print-included-work-info>${license.debug.print.included}</debug-print-included-work-info>
-
<bundled-dependencies>${license.bundles.dependencies}</bundled-dependencies>
- <bundled-jquery>${license.bundles.jquery}</bundled-jquery>
- <bundled-vega>${license.bundles.vega}</bundled-vega>
- <bundled-logo>${license.bundles.logo}</bundled-logo>
-
<bundled-bootstrap>${license.bundles.bootstrap}</bundled-bootstrap>
+ <copyright_end_year>${build.year}</copyright_end_year>
+
<debug_print_included_work_info>${license.debug.print.included}</debug_print_included_work_info>
+
<bundled_dependencies>${license.bundles.dependencies}</bundled_dependencies>
+ <bundled_jquery>${license.bundles.jquery}</bundled_jquery>
+ <bundled_vega>${license.bundles.vega}</bundled_vega>
+ <bundled_logo>${license.bundles.logo}</bundled_logo>
+
<bundled_bootstrap>${license.bundles.bootstrap}</bundled_bootstrap>
</properties>
<resourceBundles>
<resourceBundle>${project.groupId}:hbase-resource-bundle:${project.version}</resourceBundle>
diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml
index bb0030f60d0..27f7319ca51 100644
--- a/hbase-http/pom.xml
+++ b/hbase-http/pom.xml
@@ -208,13 +208,13 @@
<configuration>
<attachToTest>false</attachToTest>
<properties>
- <copyright-end-year>${build.year}</copyright-end-year>
-
<debug-print-included-work-info>${license.debug.print.included}</debug-print-included-work-info>
-
<bundled-dependencies>${license.bundles.dependencies}</bundled-dependencies>
- <bundled-jquery>${license.bundles.jquery}</bundled-jquery>
- <bundled-vega>${license.bundles.vega}</bundled-vega>
- <bundled-logo>${license.bundles.logo}</bundled-logo>
-
<bundled-bootstrap>${license.bundles.bootstrap}</bundled-bootstrap>
+ <copyright_end_year>${build.year}</copyright_end_year>
+
<debug_print_included_work_info>${license.debug.print.included}</debug_print_included_work_info>
+
<bundled_dependencies>${license.bundles.dependencies}</bundled_dependencies>
+ <bundled_jquery>${license.bundles.jquery}</bundled_jquery>
+ <bundled_vega>${license.bundles.vega}</bundled_vega>
+ <bundled_logo>${license.bundles.logo}</bundled_logo>
+
<bundled_hbase-bootstrap>${license.bundles.bootstrap}</bundled_hbase-bootstrap>
</properties>
<resourceBundles>
<resourceBundle>${project.groupId}:hbase-resource-bundle:${project.version}</resourceBundle>
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 15bdb160560..4ebf986391d 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -221,11 +221,11 @@ under the License.
limitations under the License.
## Special cases, for e.g. ASL2.0 licensed works that bundle additional third
party works
-#set($bundled-jquery = ${bundled-jquery.equalsIgnoreCase("true")})
-#set($bundled-vega = ${bundled-vega.equalsIgnoreCase("true")})
-#set($bundled-logo = ${bundled-logo.equalsIgnoreCase("true")})
-#set($bundled-dependencies = ${bundled-dependencies.equalsIgnoreCase("true")})
-#if($bundled-jquery || $bundled-vega || $bundled-logo || $bundled-dependencies)
+#set($bundled_jquery_enabled = ${bundled_jquery.equalsIgnoreCase("true")})
+#set($bundled_vega_enabled = ${bundled_vega.equalsIgnoreCase("true")})
+#set($bundled_logo_enabled = ${bundled_logo.equalsIgnoreCase("true")})
+#set($bundled_dependencies_enabled =
${bundled_dependencies.equalsIgnoreCase("true")})
+#if($bundled_jquery_enabled || $bundled_vega_enabled || $bundled_logo_enabled
|| $bundled_dependencies_enabled)
====
${project.name} contained works
@@ -1341,18 +1341,18 @@ You can redistribute it and/or modify it under either
the terms of the
PURPOSE.
#end
## modules with bundled works in source
-#if(${bundled-jquery})
+#if(${bundled_jquery_enabled})
#jquery_license()
#end
-#if(${bundled-vega})
+#if(${bundled_vega_enabled})
#vega_license()
#end
-#if(${bundled-logo})
+#if(${bundled_logo_enabled})
#orca_logo_license()
#end
## when true, we're in a module that makes a binary dist with
## bundled works.
-#if(${bundled-dependencies})
+#if(${bundled_dependencies_enabled})
====
## gather up CDDL licensed works
#set($cddl_1_0 = [])
@@ -1369,7 +1369,7 @@ You can redistribute it and/or modify it under either the
terms of the
## gather up EDL works
#set($edl_1_0 = [])
## track commons-math
-#set($commons-math = false)
+#set($commons_math = false)
## track if we need jruby additionals.
#set($jruby = false)
## track hadoops
@@ -1394,7 +1394,7 @@ g:${dep.groupId} AND a:${dep.artifactId} AND
v:${dep.version}
Until hbase-resource-bundle/src/main/resources/supplemental-models.xml
is updated, the build should fail.
#end
-#if(${debug-print-included-work-info.equalsIgnoreCase("true")})
+#if(${debug_print_included_work_info.equalsIgnoreCase("true")})
=====
Check license for included work
@@ -1417,7 +1417,7 @@ ${dep.scm.url}
#set($aggregated=false)
## Check for our set of known dependencies that require manual LICENSE
additions.
#if($dep.artifactId.equals("commons-math3"))
-#set($commons-math=true)
+#set($commons_math=true)
#end
#if($dep.artifactId.equals("jruby-complete"))
#set($jruby=true)
@@ -1539,7 +1539,7 @@ ${dep.scm.url}
#if($hadoop)
#hadoop_license()
#end
-#if($commons-math)
+#if($commons_math)
#commons_math_license()
#end
#if(!(${mit.isEmpty()}))
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 8be266c787e..b1a2bd7bcb9 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm
@@ -18,15 +18,15 @@ under the License.
*#
## Start with the NOTICE header for this particular artifact
${project.name}
-Copyright ${project.inceptionYear}-${copyright-end-year} The Apache Software
Foundation
+Copyright ${project.inceptionYear}-${copyright_end_year} The Apache Software
Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
## Specially handled included deps. e.g. ASL2.0 works that have additional
bundled works but
-#set($bundled-bootstrap = ${bundled-bootstrap.equalsIgnoreCase("true")})
-#set($bundled-logo = ${bundled-logo.equalsIgnoreCase("true")})
-#set($bundled-dependencies = ${bundled-dependencies.equalsIgnoreCase("true")})
-#if($bundled-bootstrap || $bundled-logo || $bundled-dependencies)
+#set($bundled_bootstrap_enabled =
${bundled_bootstrap.equalsIgnoreCase("true")})
+#set($bundled_logo_enabled = ${bundled_logo.equalsIgnoreCase("true")})
+#set($bundled_dependencies_enabled =
${bundled_dependencies.equalsIgnoreCase("true")})
+#if($bundled_bootstrap_enabled || $bundled_logo_enabled ||
$bundled_dependencies_enabled)
====
${project.name} contained works
@@ -94,13 +94,13 @@ noted in the LICENSE file.
#end
-#macro(jetty_notice $jetty-include-unixcrypt)
+#macro(jetty_notice $jetty_include_unixcrypt)
--
This product includes portions of 'The Jetty Web Container'
Copyright 1995-2016 Mort Bay Consulting Pty Ltd.
-#if(${jetty-include-unixcrypt})
+#if(${jetty_include_unixcrypt})
## UnixCrypt.java paragraph only in server
The UnixCrypt.java code ~Implements the one way cryptography used by
Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
@@ -199,13 +199,13 @@ under the Apache License 2.0 (see:
StringUtils.containsWhitespace())
#end
## first bundled source
-#if(${bundled-logo})
+#if(${bundled_logo_enabled})
#orca_logo_notice()
#end
-#if(${bundled-bootstrap})
+#if(${bundled_bootstrap_enabled})
#bootstrap_notice()
#end
-#if(${bundled-dependencies})
+#if(${bundled_dependencies_enabled})
#**
Note that this will fail the build if we don't have a license. update
supplemental-models via
setting '-Dlicense.debug.print.included' and looking in the generated LICENSE
file
@@ -221,7 +221,7 @@ under the Apache License 2.0 (see:
StringUtils.containsWhitespace())
#set($mpl_1_1=[])
## track jettys
#set($jetty=false)
-#set($jetty-with-crypt=false)
+#set($jetty_with_crypt=false)
## track jruby
#set($jruby=false)
#foreach( ${dep} in ${projects} )
@@ -236,7 +236,7 @@ under the Apache License 2.0 (see:
StringUtils.containsWhitespace())
#if(${dep.artifactId.startsWith("jetty")})
#set($jetty=true)
#if(${dep.artifactId.equals("jetty")})
-#set($jetty-with-crypt=true)
+#set($jetty_with_crypt=true)
#end
#end
#if(${dep.artifactId.equals("log4j")})
@@ -309,7 +309,7 @@ For source see '${dep.url}'.
#end
## Print out jetty
#if(${jetty})
-#jetty_notice(${jetty-with-crypt})
+#jetty_notice(${jetty_with_crypt})
#end
## Now go through all the lists of Category-B licensed works and make sure we
## name them and give a URL for the project's home page.
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 55f65436e69..747dc6fe317 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -430,13 +430,13 @@
<configuration>
<attachToTest>false</attachToTest>
<properties>
- <copyright-end-year>${build.year}</copyright-end-year>
-
<debug-print-included-work-info>${license.debug.print.included}</debug-print-included-work-info>
-
<bundled-dependencies>${license.bundles.dependencies}</bundled-dependencies>
- <bundled-jquery>${license.bundles.jquery}</bundled-jquery>
- <bundled-vega>${license.bundles.vega}</bundled-vega>
- <bundled-logo>${license.bundles.logo}</bundled-logo>
-
<bundled-bootstrap>${license.bundles.bootstrap}</bundled-bootstrap>
+ <copyright_end_year>${build.year}</copyright_end_year>
+
<debug_print_included_work_info>${license.debug.print.included}</debug_print_included_work_info>
+
<bundled_dependencies>${license.bundles.dependencies}</bundled_dependencies>
+ <bundled_jquery>${license.bundles.jquery}</bundled_jquery>
+ <bundled_vega>${license.bundles.vega}</bundled_vega>
+ <bundled_logo>${license.bundles.logo}</bundled_logo>
+
<bundled_bootstrap>${license.bundles.bootstrap}</bundled_bootstrap>
</properties>
<resourceBundles>
<resourceBundle>${project.groupId}:hbase-resource-bundle:${project.version}</resourceBundle>
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 2fc77e4ee43..7654a188610 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -567,13 +567,13 @@
</goals>
<configuration>
<properties>
- <copyright-end-year>${build.year}</copyright-end-year>
-
<debug-print-included-work-info>${license.debug.print.included}</debug-print-included-work-info>
-
<bundled-dependencies>${license.bundles.dependencies}</bundled-dependencies>
- <bundled-jquery>${license.bundles.jquery}</bundled-jquery>
- <bundled-vega>${license.bundles.vega}</bundled-vega>
- <bundled-logo>${license.bundles.logo}</bundled-logo>
-
<bundled-bootstrap>${license.bundles.bootstrap}</bundled-bootstrap>
+ <copyright_end_year>${build.year}</copyright_end_year>
+
<debug_print_included_work_info>${license.debug.print.included}</debug_print_included_work_info>
+
<bundled_dependencies>${license.bundles.dependencies}</bundled_dependencies>
+ <bundled_jquery>${license.bundles.jquery}</bundled_jquery>
+ <bundled_vega>${license.bundles.vega}</bundled_vega>
+ <bundled_logo>${license.bundles.logo}</bundled_logo>
+
<bundled_bootstrap>${license.bundles.bootstrap}</bundled_bootstrap>
</properties>
<resourceBundles>
<resourceBundle>${project.groupId}:hbase-resource-bundle:${project.version}</resourceBundle>
