From 21289ca42f130b46de5ac0e48bf8e06606021204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Paksy?= Date: Wed, 21 May 2025 17:37:39 +0200 Subject: [PATCH 1/2] HBASE-27802 Manage static javascript resources programatically (#6864) Signed-off-by: Nick Dimiduk Signed-off-by: Nihal Jain (cherry picked from commit 2f9d9fcd906c30abf30da1b5a78eae948e901e30) --- hbase-rest/pom.xml | 4 +- hbase-server/pom.xml | 104 ++++++++++++++++++ .../tmpl/master/RegionVisualizerTmpl.jamon | 6 +- .../static/css/bootstrap.min.css | 6 - .../hbase-webapps/static/js/bootstrap.min.js | 7 -- .../hbase-webapps/static/js/jquery.min.js | 2 - .../static/js/jquery.tablesorter.min.js | 4 - .../static/js/parser-date-iso8601.min.js | 4 - .../static/js/vega-embed@6.29.0.min.js | 7 -- .../static/js/vega-lite@5.23.0.min.js | 2 - .../static/js/vega@5.32.0.min.js | 2 - hbase-thrift/pom.xml | 4 +- pom.xml | 8 ++ 13 files changed, 119 insertions(+), 41 deletions(-) delete mode 100644 hbase-server/src/main/resources/hbase-webapps/static/css/bootstrap.min.css delete mode 100644 hbase-server/src/main/resources/hbase-webapps/static/js/bootstrap.min.js delete mode 100644 hbase-server/src/main/resources/hbase-webapps/static/js/jquery.min.js delete mode 100644 hbase-server/src/main/resources/hbase-webapps/static/js/jquery.tablesorter.min.js delete mode 100644 hbase-server/src/main/resources/hbase-webapps/static/js/parser-date-iso8601.min.js delete mode 100644 hbase-server/src/main/resources/hbase-webapps/static/js/vega-embed@6.29.0.min.js delete mode 100644 hbase-server/src/main/resources/hbase-webapps/static/js/vega-lite@5.23.0.min.js delete mode 100644 hbase-server/src/main/resources/hbase-webapps/static/js/vega@5.32.0.min.js diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index f5d07da05773..7bd7b188cc32 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -280,7 +280,7 @@ true - + maven-resources-plugin @@ -296,7 +296,7 @@ true - ../hbase-server/src/main/resources/hbase-webapps/static + ../hbase-server/target/hbase-webapps/static diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index e303ec1ada6a..152267c440c3 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -893,7 +893,9 @@ + org.apache.maven.plugins maven-dependency-plugin + ${maven.dependency.version} create-mrapp-generated-classpath @@ -909,6 +911,108 @@ ${project.build.directory}/test-classes/mrapp-generated-classpath + + unpack-ui-resources-js + + unpack + + process-resources + + + + org.webjars + bootstrap + ${bootstrap.version} + jar + true + **/js/bootstrap.min.js + + + + + + org.webjars + jquery + ${jquery.version} + jar + true + **/jquery.min.js + + + + + + org.webjars + tablesorter + ${tablesorter.version} + jar + true + **/jquery.tablesorter.min.js, + **/parsers/parser-date-iso8601.min.js + + + + + + org.webjars + vega + ${vega.version} + jar + true + **/vega.min.js + + + + + + org.webjars + vega-embed + ${vega-embed.version} + jar + true + **/vega-embed.min.js + + + + + + org.webjars + vega-lite + ${vega-lite.version} + jar + true + **/vega-lite.min.js + + + + + + ${project.build.directory}/hbase-webapps/static/js + + + + unpack-ui-resources-css + + unpack + + process-resources + + + + org.webjars + bootstrap + ${bootstrap.version} + jar + true + **/css/bootstrap.min.css + + + + + + ${project.build.directory}/hbase-webapps/static/css + + diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon index 0b7b0c081ca2..9a98cfefed7f 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon @@ -17,9 +17,9 @@ See the License for the specific language governing permissions and limitations under the License. - - - + + +
- + - + - + - + diff --git a/hbase-server/src/main/resources/hbase-webapps/master/scripts.jsp b/hbase-server/src/main/resources/hbase-webapps/master/scripts.jsp index 1e9031f77eba..d987621a119d 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/scripts.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/scripts.jsp @@ -18,7 +18,7 @@ */ --%> - + - + - +