Skip to content

HBASE-27802 Manage static javascript resources programatically #7032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 26, 2025
+126 −48
Merged

HBASE-27802 Manage static javascript resources programatically #7032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b65860
HBASE-27802 Manage static javascript resources programatically (#6864)
PDavid May 21, 2025
aa658f7
HBASE-27802 Manage static javascript resources programatically (adden…
PDavid May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hbase-rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@
<skipAssembly>true</skipAssembly>
</configuration>
</plugin>
<!-- Copy the static web resources (JS, CSS, images, etc.) from hbase-server sources -->
<!-- Copy the static web resources (JS, CSS, images, etc.) from hbase-server -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
Expand All @@ -295,7 +295,7 @@
<overwrite>true</overwrite>
<resources>
<resource>
<directory>../hbase-server/src/main/resources/hbase-webapps/static</directory>
<directory>../hbase-server/target/hbase-webapps/static</directory>
</resource>
</resources>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
--%>

<script src="/static/js/jquery.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
<script src="/static/js/tab.js" type="text/javascript"></script>
<script type="text/javascript">
$(document).ready(function() {
Expand Down
104 changes: 104 additions & 0 deletions hbase-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,9 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${maven.dependency.version}</version>
<executions>
<execution>
<id>create-mrapp-generated-classpath</id>
Expand All @@ -768,6 +770,108 @@
<outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
</configuration>
</execution>
<execution>
<id>unpack-ui-resources-js</id>
<goals>
<goal>unpack</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>${bootstrap.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<includes>**/js/bootstrap.bundle.min.js</includes>
<fileMappers>
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
</fileMappers>
</artifactItem>
<artifactItem>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>${jquery.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<includes>**/jquery.min.js</includes>
<fileMappers>
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
</fileMappers>
</artifactItem>
<artifactItem>
<groupId>org.webjars</groupId>
<artifactId>tablesorter</artifactId>
<version>${tablesorter.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<includes>**/jquery.tablesorter.min.js,
**/parsers/parser-date-iso8601.min.js</includes>
<fileMappers>
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
</fileMappers>
</artifactItem>
<artifactItem>
<groupId>org.webjars</groupId>
<artifactId>vega</artifactId>
<version>${vega.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<includes>**/vega.min.js</includes>
<fileMappers>
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
</fileMappers>
</artifactItem>
<artifactItem>
<groupId>org.webjars</groupId>
<artifactId>vega-embed</artifactId>
<version>${vega-embed.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<includes>**/vega-embed.min.js</includes>
<fileMappers>
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
</fileMappers>
</artifactItem>
<artifactItem>
<groupId>org.webjars</groupId>
<artifactId>vega-lite</artifactId>
<version>${vega-lite.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<includes>**/vega-lite.min.js</includes>
<fileMappers>
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
</fileMappers>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/hbase-webapps/static/js</outputDirectory>
</configuration>
</execution>
<execution>
<id>unpack-ui-resources-css</id>
<goals>
<goal>unpack</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>${bootstrap.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<includes>**/css/bootstrap.min.css</includes>
<fileMappers>
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
</fileMappers>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/hbase-webapps/static/css</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
<script src="/static/js/jquery.tablesorter.min.js" type="text/javascript"></script>
<script src="/static/js/parser-date-iso8601.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
<script src="/static/js/tab.js" type="text/javascript"></script>
<script src="/static/js/jqSpager.js" type="text/javascript"></script>
<script>
Expand Down
6 changes: 3 additions & 3 deletions hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ See the License for the specific language governing permissions and
limitations under the License.
</%doc>

<script type="text/javascript" src="/static/js/vega@5.32.0.min.js"></script>
<script type="text/javascript" src="/static/js/vega-lite@5.23.0.min.js"></script>
<script type="text/javascript" src="/static/js/vega-embed@6.29.0.min.js"></script>
<script type="text/javascript" src="/static/js/vega.min.js"></script>
<script type="text/javascript" src="/static/js/vega-lite.min.js"></script>
<script type="text/javascript" src="/static/js/vega-embed.min.js"></script>

<div id="vis" style="width:80%;"></div>
<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
</div>
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
<script src="/static/js/jquery.tablesorter.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
<script src="/static/js/tab.js" type="text/javascript"></script>
<script>
$(document).ready(function()
Expand Down
2 changes: 1 addition & 1 deletion hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ org.apache.hadoop.hbase.util.JvmVersion;
</div> <!-- /container -->

<script src="/static/js/jquery.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
<script src="/static/js/tab.js" type="text/javascript"></script>
</body>
</html>
Expand Down
2 changes: 1 addition & 1 deletion hbase-server/src/main/resources/hbase-webapps/master/scripts.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
--%>
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
<script src="/static/js/tab.js" type="text/javascript"></script>
<script type="text/javascript">
$(document).ready(function() {
Expand Down
2 changes: 1 addition & 1 deletion hbase-server/src/main/resources/hbase-webapps/regionserver/footer.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
--%>
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
<script src="/static/js/tab.js" type="text/javascript"></script>
<script type="text/javascript">
$(document).ready(function() {
Expand Down
6 changes: 0 additions & 6 deletions hbase-server/src/main/resources/hbase-webapps/static/css/bootstrap.min.css
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions hbase-server/src/main/resources/hbase-webapps/static/js/bootstrap.min.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions hbase-server/src/main/resources/hbase-webapps/static/js/jquery.min.js
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions hbase-server/src/main/resources/hbase-webapps/static/js/jquery.tablesorter.min.js
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions hbase-server/src/main/resources/hbase-webapps/static/js/parser-date-iso8601.min.js
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions hbase-server/src/main/resources/hbase-webapps/static/js/vega-embed@6.29.0.min.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions hbase-server/src/main/resources/hbase-webapps/static/js/vega-lite@5.23.0.min.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions hbase-server/src/main/resources/hbase-webapps/static/js/vega@5.32.0.min.js
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions hbase-thrift/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
<skipAssembly>true</skipAssembly>
</configuration>
</plugin>
<!-- Copy the static web resources (JS, CSS, images, etc.) from hbase-server sources -->
<!-- Copy the static web resources (JS, CSS, images, etc.) from hbase-server -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
Expand All @@ -205,7 +205,7 @@
<overwrite>true</overwrite>
<resources>
<resource>
<directory>../hbase-server/src/main/resources/hbase-webapps/static</directory>
<directory>../hbase-server/target/hbase-webapps/static</directory>
</resource>
</resources>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion hbase-thrift/src/main/resources/hbase-webapps/thrift/footer.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
--%>
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
<script src="/static/js/tab.js" type="text/javascript"></script>
<script type="text/javascript">
$(document).ready(function() {
Expand Down
8 changes: 8 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,7 @@
<maven.eclipse.version>2.10</maven.eclipse.version>
<maven.gpg.version>3.0.1</maven.gpg.version>
<maven.javadoc.version>3.4.0</maven.javadoc.version>
<maven.dependency.version>3.8.1</maven.dependency.version>
<maven.warbucks.version>1.1.0</maven.warbucks.version>
<maven.project.info.report.version>3.1.2</maven.project.info.report.version>
<maven-owasp-plugin.version>12.1.0</maven-owasp-plugin.version>
Expand Down Expand Up @@ -1014,6 +1015,13 @@
<!-- Required for testing LDAP integration -->
<apacheds.version>2.0.0.AM26</apacheds.version>
<ldap-api.version>2.0.0</ldap-api.version>
<!-- Web UI dependencies -->
<bootstrap.version>5.3.3</bootstrap.version>
<jquery.version>3.7.1</jquery.version>
<tablesorter.version>2.32.0</tablesorter.version>
<vega.version>5.32.0</vega.version>
<vega-embed.version>6.29.0</vega-embed.version>
<vega-lite.version>5.23.0</vega-lite.version>
</properties>
<!-- Sorted by groups of dependencies then groupId and artifactId -->
<dependencyManagement>
Expand Down