stoty commented on code in PR #7355:
URL: https://github.com/apache/hbase/pull/7355#discussion_r2398667890
##########
pom.xml:
##########
@@ -2880,11 +2893,15 @@
<version>${maven-site.version}</version>
<configuration>
<siteDirectory>${basedir}/src/site</siteDirectory>
-
<customBundle>${basedir}/src/site/custom/project-info-report.properties</customBundle>
Review Comment:
Parts of this seems to have been used in
https://hbase.apache.org/team.html
Is the team page intact with these changes ?
(There are probable other strings from here that are used, but I only
checked this page)
##########
pom.xml:
##########
@@ -2851,6 +2836,34 @@
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <!-- Required for the site to use local resources (e.g. not from
CDN). -->
+ <id>unpack-site-resources</id>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <phase>pre-site</phase>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>io.github.devacfr.maven.skins</groupId>
+ <artifactId>reflow-default-webdeps</artifactId>
Review Comment:
Interesting.
Isn't there a more straightforward way to have the site build add these ?
##########
src/site/custom/project-info-report.properties:
##########
Review Comment:
See my comment above
##########
src/site/site.xml:
##########
@@ -21,74 +21,49 @@
<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";
+ name="Apache HBase">
+ <publishDate position="none"/>
+ <version position="none"/>
+
<skin>
- <!-- We tried to get some changes to the fluido-skin committed upstream
- but with little success. This is a custom artifact that contains
- some commits over the official maven-fluido-skin 1.4 release. The
- actual code is available at:
- https://github.com/joshelser/maven-fluido-skin/tree/1.4-HBase-patched.
- The hope is that we can get these fixes included upstream and
- remove the need for this custom fork. This is published to
- my end-user's GAV for ease of releasing this to maven central
- until the upstream update happens and is released.
- See HBASE-14785 and HBASE-21005 for more info. -->
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.12.0</version>
+ <groupId>io.github.devacfr.maven.skins</groupId>
+ <artifactId>reflow-maven-skin</artifactId>
+ <version>${reflow-maven-skin.version}</version>
</skin>
+
<custom>
- <fluidoSkin>
- <topBarEnabled>true</topBarEnabled>
- <sideBarEnabled>false</sideBarEnabled>
- <googleSearch>
- <!-- The ID of the Google custom search engine to use.
- This one searches hbase.apache.org,
issues.apache.org/browse/HBASE-*,
- and user and dev mailing list archives. -->
- <customSearch>000385458301414556862:sq1bb0xugjg</customSearch>
- </googleSearch>
- <sourceLineNumbersEnabled>false</sourceLineNumbersEnabled>
- <skipGenerationDate>true</skipGenerationDate>
- <breadcrumbDivider>ยป</breadcrumbDivider>
- <gitHub>
- <projectId>apache/hbase</projectId>
- <ribbonOrientation>right</ribbonOrientation>
- <ribbonColor>red</ribbonColor>
- </gitHub>
- </fluidoSkin>
+ <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>
+ <brand>
+ <name><![CDATA[<div class="xtoplogo"></div>]]></name>
+ <href>index.html</href>
+ </brand>
+ <navbar theme="light" background="light"></navbar>
+ <skinAttribution>false</skinAttribution>
+ <breadcrumbs>true</breadcrumbs>
+ <!-- Switch to local resources: Do NOT use CDN. -->
+ <localResources>true</localResources>
+ <absoluteResourceURL></absoluteResourceURL>
+ </reflowSkin>
</custom>
- <bannerLeft>
- <name />
- <src />
- <href />
- <!--
- <name/>
- <height>0</height>
- <width>0</width>
--->
- </bannerLeft>
- <bannerRight>
- <name>Apache HBase</name>
- <src>images/hbase_logo_with_orca_large.png</src>
- <href>http://hbase.apache.org/</href>
- </bannerRight>
- <publishDate position="none"/>
- <version position="none"/>
<body>
<head>
- <![CDATA[<meta name="viewport" content="width=device-width,
initial-scale=1.0"></meta>
- <link rel="stylesheet" href="css/bootstrap-responsive.min.css"/>
- <link rel="stylesheet" href="css/github.min.css"/>
- <link rel="stylesheet" href="css/site.css"/>
- <script src="js/highlight.min.js"></script>]]>
</head>
<menu name="Apache HBase Project">
<item name="Overview" href="index.html"/>
<item name="License" href="https://www.apache.org/licenses/"/>
<item name="Downloads" href="downloads.html"/>
- <item name="Release Notes"
href="https://issues.apache.org/jira/browse/HBASE?report=com.atlassian.jira.plugin.system.project:changelog-panel#selectedTab=com.atlassian.jira.plugin.system.project%3Achangelog-panel";
/>
<item name="Code Of Conduct" href="coc.html"/>
- <item name="Blog" href="http://blogs.apache.org/hbase/"/>
Review Comment:
Not sure we should do that in this patch.
I'd just leave them as is and open follow-up tickets.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
