This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new b4f24cf8c6b HBASE-28617 Add trademark statement in footer on our
website (#5993)
b4f24cf8c6b is described below
commit b4f24cf8c6bc1bb675cca7d41962bf56a6f879cf
Author: Duo Zhang <[email protected]>
AuthorDate: Tue Jun 18 16:30:58 2024 +0800
HBASE-28617 Add trademark statement in footer on our website (#5993)
Also change ™ to ® on the index page as HBase is a registered trademark
Signed-off-by: Nick Dimiduk <[email protected]>
---
pom.xml | 34 +++++++++++++++++++++++++++++-----
src/site/resources/css/site.css | 24 ++++++++++--------------
src/site/site.xml | 25 +++++++++++++++++++++----
src/site/xdoc/index.xml | 22 +++++++++++-----------
4 files changed, 71 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7afa8b72c37..59a1c95b905 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<version>${revision}</version>
<packaging>pom</packaging>
<name>Apache HBase</name>
- <description>Apache HBase is the Hadoop database. Use it when you need
+ <description>Apache HBase® is the Hadoop database. Use it when you need
random, realtime read/write access to your Big Data.
This project's goal is the hosting of very large tables -- billions of
rows X millions of columns -- atop clusters
of commodity hardware.</description>
@@ -2259,6 +2259,30 @@
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
+ <execution>
+ <id>set-current-year</id>
+ <goals>
+ <goal>timestamp-property</goal>
+ </goals>
+ <phase>pre-site</phase>
+ <configuration>
+ <name>current.year</name>
+ <pattern>yyyy</pattern>
+ <unit>year</unit>
+ </configuration>
+ </execution>
+ <execution>
+ <id>set-current-date</id>
+ <goals>
+ <goal>timestamp-property</goal>
+ </goals>
+ <phase>pre-site</phase>
+ <configuration>
+ <name>current.date</name>
+ <pattern>yyyy-MM-dd</pattern>
+ <unit>day</unit>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -3028,7 +3052,7 @@
<destDir>devapidocs</destDir>
<name>Developer API</name>
<description>The full HBase API, including private and unstable
APIs</description>
- <doctitle>Apache HBase™ ${project.version} API</doctitle>
+ <doctitle>Apache HBase® ${project.version} API</doctitle>
<sourceFileExcludes>
<exclude>**/generated/*</exclude>
<exclude>**/protobuf/*</exclude>
@@ -3079,7 +3103,7 @@
<destDir>testdevapidocs</destDir>
<name>Test Developer API</name>
<description>The full HBase API test code, including private and
unstable APIs</description>
- <testDoctitle>Apache HBase™ ${project.version} Test
API</testDoctitle>
+ <testDoctitle>Apache HBase® ${project.version} Test
API</testDoctitle>
<sourceFileExcludes>
<exclude>**/generated/*</exclude>
<exclude>**/protobuf/*</exclude>
@@ -3139,7 +3163,7 @@
<destDir>apidocs</destDir>
<name>User API</name>
<description>The HBase Application Programmer's API</description>
- <doctitle>Apache HBase™ ${project.version} API</doctitle>
+ <doctitle>Apache HBase® ${project.version} API</doctitle>
<excludePackageNames>org.apache.hadoop.hbase.backup*:org.apache.hadoop.hbase.catalog:org.apache.hadoop.hbase.client.coprocessor:org.apache.hadoop.hbase.client.metrics:org.apache.hadoop.hbase.codec*:org.apache.hadoop.hbase.constraint:org.apache.hadoop.hbase.coprocessor.*:org.apache.hadoop.hbase.executor:org.apache.hadoop.hbase.fs:*.generated.*:org.apache.hadoop.hbase.io.hfile.*:org.apache.hadoop.hbase.mapreduce.hadoopbackport:org.apache.hadoop.hbase.mapreduce.replication:org
[...]
<!-- switch on dependency-driven aggregation -->
<includeDependencySources>false</includeDependencySources>
@@ -3197,7 +3221,7 @@
<destDir>testapidocs</destDir>
<name>Test User API</name>
<description>The HBase Application Programmer's API test
code</description>
- <testDoctitle>Apache HBase™ ${project.version} Test
API</testDoctitle>
+ <testDoctitle>Apache HBase® ${project.version} Test
API</testDoctitle>
<excludePackageNames>org.apache.hadoop.hbase.backup*:org.apache.hadoop.hbase.catalog:org.apache.hadoop.hbase.client.coprocessor:org.apache.hadoop.hbase.client.metrics:org.apache.hadoop.hbase.codec*:org.apache.hadoop.hbase.constraint:org.apache.hadoop.hbase.coprocessor.*:org.apache.hadoop.hbase.executor:org.apache.hadoop.hbase.fs:*.generated.*:org.apache.hadoop.hbase.io.hfile.*:org.apache.hadoop.hbase.mapreduce.hadoopbackport:org.apache.hadoop.hbase.mapreduce.replication:org
[...]
<!-- switch on dependency-driven aggregation -->
<includeDependencySources>false</includeDependencySources>
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
index 3f42f5ab61d..9426cd67a4f 100644
--- a/src/site/resources/css/site.css
+++ b/src/site/resources/css/site.css
@@ -29,10 +29,9 @@ li {
line-height: 120%;
}
-div#topbar,
+header#topbar,
div#banner,
-div#breadcrumbs,
-div#bodyColumn,
+main#bodyColumn,
footer {
width: initial;
padding-left: 20px;
@@ -52,9 +51,7 @@ div#search-form.navbar-search.pull-right {
margin-left: 0;
position: initial;
}
-li#publishDate.pull-right {
- list-style: none;
-}
+
.container,
.navbar-static-top .container,
.navbar-fixed-top .container,
@@ -105,14 +102,13 @@ li#publishDate.pull-right {
}
/* Override weird body padding thing that causes scrolling */
-@media (max-width: 767px)
-body {
+@media (max-width: 767px) {
+ body {
padding-right: 0;
padding-left: 0;
-}
-
-@media (max-width: 767px)
-.navbar-fixed-top, .navbar-fixed-bottom, .navbar-static-top {
- margin-left: 0;
- margin-right: 0;
+ }
+ .navbar-fixed-top, .navbar-fixed-bottom, .navbar-static-top {
+ margin-left: 0;
+ margin-right: 0;
+ }
}
\ No newline at end of file
diff --git a/src/site/site.xml b/src/site/site.xml
index c430faf2753..7d05b7419c2 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -33,9 +33,9 @@
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>com.github.joshelser</groupId>
+ <groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.7.1-HBase</version>
+ <version>1.12.0</version>
</skin>
<custom>
<fluidoSkin>
@@ -50,6 +50,11 @@
<sourceLineNumbersEnabled>false</sourceLineNumbersEnabled>
<skipGenerationDate>true</skipGenerationDate>
<breadcrumbDivider>»</breadcrumbDivider>
+ <gitHub>
+ <projectId>apache/hbase</projectId>
+ <ribbonOrientation>right</ribbonOrientation>
+ <ribbonColor>red</ribbonColor>
+ </gitHub>
</fluidoSkin>
</custom>
<bannerLeft>
@@ -67,7 +72,7 @@
<src>images/hbase_logo_with_orca_large.png</src>
<href>http://hbase.apache.org/</href>
</bannerRight>
- <publishDate position="bottom"/>
+ <publishDate position="none"/>
<version position="none"/>
<body>
<head>
@@ -152,5 +157,17 @@
<item name="How Apache Works"
href="http://www.apache.org/foundation/how-it-works.html"; target="_blank" />
<item name="Sponsoring Apache"
href="http://www.apache.org/foundation/sponsorship.html"; target="_blank" />
</menu>
- </body>
+ <footer>
+ <![CDATA[
+ <div style="float: left">
+ Copyright ©2007–${current.year} <a href="https://www.apache.org";>The
Apache Software Foundation</a>. All rights reserved.<br>
+ Apache HBase, HBase, Apache, the Apache HBase logo and the ASF logo
are either registered trademarks or trademarks of the Apache Software
Foundation.
+ All other marks mentioned may be trademarks or registered trademarks
of their respective owners.
+ </div>
+ <div style="float: right">
+ Last Published: ${current.date}
+ </div>
+ ]]>
+ </footer>
+ </body>
</project>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 67d962baed2..b2dac50bcb9 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -21,21 +21,21 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
<properties>
- <title>Apache HBase™ Home</title>
+ <title>Apache HBase® Home</title>
<link rel="shortcut icon" href="/images/favicon.ico" />
</properties>
<body>
- <section name="Welcome to Apache HBase™">
- <p><a href="https://www.apache.org/";>Apache</a> HBase™ is the <a
href="https://hadoop.apache.org/";>Hadoop</a> database, a distributed, scalable,
big data store.</p>
- <p>Use Apache HBase™ when you need random, realtime read/write
access to your Big Data.
+ <section name="Welcome to Apache HBase®">
+ <p><a href="https://www.apache.org/";>Apache</a> HBase<sup>®</sup> is the
<a href="https://hadoop.apache.org/";>Hadoop</a> database, a distributed,
scalable, big data store.</p>
+ <p>Use Apache HBase<sup>®</sup> when you need random, realtime
read/write access to your Big Data.
This project's goal is the hosting of very large tables -- billions of
rows X millions of columns -- atop clusters of commodity hardware.
- Apache HBase is an open-source, distributed, versioned, non-relational
database modeled after Google's <a
href="https://research.google.com/archive/bigtable.html";>Bigtable: A
Distributed Storage System for Structured Data</a> by Chang et al.
- Just as Bigtable leverages the distributed data storage provided by
the Google File System, Apache HBase provides Bigtable-like capabilities on top
of Hadoop and HDFS.
+ Apache HBase<sup>®</sup> is an open-source, distributed, versioned,
non-relational database modeled after Google's <a
href="https://research.google.com/archive/bigtable.html";>Bigtable: A
Distributed Storage System for Structured Data</a> by Chang et al.
+ Just as Bigtable leverages the distributed data storage provided by
the Google File System, Apache HBase<sup>®</sup> provides Bigtable-like
capabilities on top of Hadoop and HDFS.
</p>
</section>
<section name="Download">
- <p>Click <b><a href="downloads.html">here</a></b> to download Apache
HBase™.</p>
+ <p>Click <b><a href="downloads.html">here</a></b> to download Apache
HBase<sup>®</sup>.</p>
</section>
<section name="Features">
<p>
@@ -44,7 +44,7 @@ under the License.
<li>Strictly consistent reads and writes.</li>
<li>Automatic and configurable sharding of tables</li>
<li>Automatic failover support between RegionServers.</li>
- <li>Convenient base classes for backing Hadoop MapReduce jobs with
Apache HBase tables.</li>
+ <li>Convenient base classes for backing Hadoop MapReduce jobs with
Apache HBase<sup>®</sup> tables.</li>
<li>Easy to use Java API for client access.</li>
<li>Block cache and Bloom Filters for real-time queries.</li>
<li>Query predicate push down via server side Filters</li>
@@ -55,20 +55,20 @@ under the License.
</p>
</section>
<section name="More Info">
- <p>See the <a href="book.html#arch.overview">Architecture Overview</a>,
the <a href="book.html#faq">Apache HBase Reference Guide FAQ</a>, and the other
documentation links.</p>
+ <p>See the <a href="book.html#arch.overview">Architecture Overview</a>,
the <a href="book.html#faq">Apache HBase<sup>®</sup> Reference Guide FAQ</a>,
and the other documentation links.</p>
<dl>
<dt>Export Control</dt>
<dd><p>The HBase distribution includes cryptographic software. See the
export control notice <a href="export_control.html">here</a></p></dd>
<dt>Code Of Conduct</dt>
<dd><p>We expect participants in discussions on the HBase project
mailing lists, Slack and IRC channels, and JIRA issues to abide by the Apache
Software Foundation's <a
href="https://apache.org/foundation/policies/conduct.html";>Code of Conduct</a>.
More information can be found <a href="coc.html">here</a>.</p></dd>
<dt>License</dt>
- <dd><p>Apache HBase is licensed under the <a
href="https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version
2.0</a></p></dd>
+ <dd><p>Apache HBase<sup>®</sup> is licensed under the <a
href="https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version
2.0</a></p></dd>
<dt>Trademarks</dt>
<dd><p>Apache HBase, HBase, Apache, the Apache feather logo, and the
Apache HBase project logo are either <a
href="https://www.apache.org/foundation/marks/list/";>registered trademarks or
trademarks</a> of The Apache Software Foundation in the United States and other
countries.</p></dd>
<dt>Thanks</dt>
<dd><p>Thanks for all the sponsors, who are <a
href="https://www.apache.org/foundation/thanks.html";>supporting Apache</a> or
<a href="sponsors.html">supporting the HBase project</a>!</p></dd>
<dt>Security and Vulnerability information</dt>
- <dd><p>See the <a href="book.html#security">Security</a> chapter in
the <a href="book.html#faq">Apache HBase Reference Guide</a>, and the general
<a href="https://apache.org/security/";>Apache Security information</a>!</p></dd>
+ <dd><p>See the <a href="book.html#security">Security</a> chapter in
the <a href="book.html#faq">Apache HBase<sup>®</sup> Reference Guide</a>, and
the general <a href="https://apache.org/security/";>Apache Security
information</a>!</p></dd>
</dl>
</section>
