Skip to content

HBASE-29659 Replace reflow-default-webdeps to fix site build failure #7386

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
Oct 16, 2025
+118 −22
Merged

HBASE-29659 Replace reflow-default-webdeps to fix site build failure #7386

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
55e209c
HBASE-29659 Use separate webjar dependencies for website instead of r…
PDavid Oct 14, 2025
7befc9c
HBASE-29659 Use webjar for bootswatch
PDavid Oct 15, 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
133 changes: 113 additions & 20 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,17 @@
<spotless.version>2.44.4</spotless.version>
<maven-site.version>3.12.0</maven-site.version>
<reflow-maven-skin.version>2.3.3</reflow-maven-skin.version>
<maven-download-plugin.version>1.2.1</maven-download-plugin.version>
<!-- Website static CSS, JS dependencies -->
<site.bootswatch.version>4.4.0</site.bootswatch.version>
<site.popperjs.version>1.16.0</site.popperjs.version>
<site.jquery.version>3.4.1</site.jquery.version>
<site.bootstrap.version>4.4.1</site.bootstrap.version>
<site.anchorjs.version>3.2.2</site.anchorjs.version>
<site.fontawesome.version>5.12.0</site.fontawesome.version>
<!-- RefGuide static CSS, JS dependencies -->
<refguide.fontawesome.version>4.7.0</refguide.fontawesome.version>
<refguide.mathjax.version>2.7.0</refguide.mathjax.version>
<!-- compression -->
<aircompressor.version>0.27</aircompressor.version>
<brotli4j.version>1.11.0</brotli4j.version>
Expand Down Expand Up @@ -2795,7 +2806,7 @@
<artifactItem>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
<version>4.7.0</version>
<version>${refguide.fontawesome.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<includes>**/css/font-awesome.css,
Expand All @@ -2808,7 +2819,7 @@
<artifactItem>
<groupId>org.webjars</groupId>
<artifactId>MathJax</artifactId>
<version>2.7.0</version>
<version>${refguide.mathjax.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<includes>**/MathJax.js,
Expand Down Expand Up @@ -2846,22 +2857,43 @@
<configuration>
<artifactItems>
<artifactItem>
<groupId>io.github.devacfr.maven.skins</groupId>
<artifactId>reflow-default-webdeps</artifactId>
<version>${reflow-maven-skin.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<includes>**/css/bootstrap.min.css,
**/css/themes/litera/bootstrap.min.css,
**/css/fontawesome/*,
**/css/fontawesome/webfonts/*,
**/js/*.js,
**/js/languages/*,
**/js/styles/github.min.css,
**/js/styles/default.min.css</includes>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>${site.bootstrap.version}</version>
<includes>**/js/bootstrap.min.js</includes>
</artifactItem>
<artifactItem>
<groupId>org.webjars.npm</groupId>
<artifactId>bootswatch</artifactId>
<version>${site.bootswatch.version}</version>
<includes>**/litera/bootstrap.min.css</includes>
</artifactItem>
<artifactItem>
<groupId>org.webjars</groupId>
<artifactId>popper.js</artifactId>
<version>${site.popperjs.version}</version>
<includes>**/umd/popper.min.js</includes>
</artifactItem>
<artifactItem>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>${site.jquery.version}</version>
<includes>**/jquery.min.js</includes>
</artifactItem>
<artifactItem>
<groupId>org.webjars</groupId>
<artifactId>anchorjs</artifactId>
<version>${site.anchorjs.version}</version>
<includes>**/anchor.min.js</includes>
</artifactItem>
<artifactItem>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
<version>${site.fontawesome.version}</version>
<includes>**/css/all.min.css,**/webfonts/*</includes>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/site</outputDirectory>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -3012,6 +3044,67 @@
</resources>
</configuration>
</execution>
<execution>
<id>copy-website-resources</id>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>pre-site</phase>
<configuration>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${project.build.directory}/META-INF/resources/webjars/bootstrap/${site.bootstrap.version}/js</directory>
<targetPath>${project.build.directory}/site/js</targetPath>
<includes>
<include>bootstrap.min.js</include>
</includes>
</resource>
<resource>
<directory>${project.build.directory}/META-INF/resources/webjars/bootswatch/${site.bootswatch.version}/dist/litera</directory>
<targetPath>${project.build.directory}/site/css/themes/litera</targetPath>
<includes>
<include>bootstrap.min.css</include>
</includes>
</resource>
<resource>
<directory>${project.build.directory}/META-INF/resources/webjars/popper.js/${site.popperjs.version}/umd</directory>
<targetPath>${project.build.directory}/site/js</targetPath>
<includes>
<include>popper.min.js</include>
</includes>
</resource>
<resource>
<directory>${project.build.directory}/META-INF/resources/webjars/jquery/${site.jquery.version}</directory>
<targetPath>${project.build.directory}/site/js</targetPath>
<includes>
<include>jquery.min.js</include>
</includes>
</resource>
<resource>
<directory>${project.build.directory}/META-INF/resources/webjars/anchorjs/${site.anchorjs.version}</directory>
<targetPath>${project.build.directory}/site/js</targetPath>
<includes>
<include>anchor.min.js</include>
</includes>
</resource>
<resource>
<directory>${project.build.directory}/META-INF/resources/webjars/font-awesome/${site.fontawesome.version}/css</directory>
<targetPath>${project.build.directory}/site/css/fontawesome</targetPath>
<includes>
<include>all.min.css</include>
</includes>
</resource>
<resource>
<directory>${project.build.directory}/META-INF/resources/webjars/font-awesome/${site.fontawesome.version}</directory>
<targetPath>${project.build.directory}/site/css</targetPath>
<includes>
<include>webfonts/*</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down Expand Up @@ -3043,17 +3136,17 @@
<configuration>
<target>
<copy flatten="true" todir="${project.build.directory}/site/css">
<fileset dir="${webjars-dir}/font-awesome/4.7.0/css">
<fileset dir="${webjars-dir}/font-awesome/${refguide.fontawesome.version}/css">
<include name="font-awesome.css"/>
</fileset>
</copy>
<copy flatten="true" todir="${project.build.directory}/site/js">
<fileset dir="${webjars-dir}/MathJax/2.7.0">
<fileset dir="${webjars-dir}/MathJax/${refguide.mathjax.version}">
<include name="MathJax.js"/>
</fileset>
</copy>
<copy flatten="false" todir="${project.build.directory}/site/js">
<fileset dir="${webjars-dir}/MathJax/2.7.0">
<fileset dir="${webjars-dir}/MathJax/${refguide.mathjax.version}">
<include name="config/TeX-MML-AM_HTMLorMML.js"/>
<include name="jax/output/HTML-CSS/jax.js"/>
<include name="jax/output/HTML-CSS/imageFonts.js"/>
Expand All @@ -3066,7 +3159,7 @@
</fileset>
</copy>
<copy flatten="true" todir="${project.build.directory}/site/fonts">
<fileset dir="${webjars-dir}/font-awesome/4.7.0/fonts">
<fileset dir="${webjars-dir}/font-awesome/${refguide.fontawesome.version}/fonts">
<include name="fontawesome-webfont.*"/>
</fileset>
</copy>
Expand Down
2 changes: 2 additions & 0 deletions src/site/resources/css/site.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@

/** Restore earlier code block styles. */
pre {
background-color: #f5f5f5;
border-radius: 6px;
border: 1px solid rgba(0, 0, 0, 0.15);
padding: 10px;
Comment on lines +33 to +36
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Improved code blocks style to look good without highlight.js.

}

footer {
Expand Down
5 changes: 3 additions & 2 deletions src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,16 @@
<custom>
<reflowSkin>
<protocolRelativeURLs>true</protocolRelativeURLs>
<smoothScroll>true</smoothScroll>
<bottomNav>
<column>Apache HBase Project</column>
<column>Project Information</column>
<column>Documentation and API</column>
<column>ASF</column>
</bottomNav>
<theme>bootswatch-litera</theme>
<highlightJs>true</highlightJs>
<highlightJs>false</highlightJs>
<imgLightbox>false</imgLightbox>
<smoothScroll>false</smoothScroll>
<brand>
<name><![CDATA[<div class="xtoplogo"></div>]]></name>
<href>index.html</href>
Expand Down