You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by ct...@apache.org on 2021/03/20 05:15:44 UTC

[fluo-website] branch main updated: Minimize jekyll dependencies (remove github-pages) (#207)

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fluo-website.git


The following commit(s) were added to refs/heads/main by this push:
     new 33dcb6a  Minimize jekyll dependencies (remove github-pages) (#207)
33dcb6a is described below

commit 33dcb6a1c4a92a1748ea2eb5a6920f90cffab55d
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Sat Mar 20 01:15:34 2021 -0400

    Minimize jekyll dependencies (remove github-pages) (#207)
    
    * Remove github-pages and other unused dependencies from the jekyll build,
      leaving only the minimal dependencies required to build the website.
    * Also fix any newly broken links caused by changes in the way markdown
      links to other markdown files were processed. Also update gitignore and
      add a site description field that was previously automatically populated
      by github-pages.
    * Remove unused rubyracer gem
    * Use at least jekyll 4.2 and jekyll-redirect-from 0.16
---
 .gitignore                                         |  11 +-
 Gemfile                                            |   4 +-
 Gemfile.lock                                       | 237 ++-------------------
 _config.yml                                        |   1 +
 docs/fluo-recipes/1.0.0-incubating/export-queue.md |   2 +-
 docs/fluo-recipes/1.0.0-incubating/transient.md    |   2 +-
 docs/fluo-recipes/1.1.0-incubating/export-queue.md |   2 +-
 docs/fluo-recipes/1.1.0-incubating/transient.md    |   2 +-
 8 files changed, 33 insertions(+), 228 deletions(-)

diff --git a/.gitignore b/.gitignore
index 723ffab..47aab83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
-_site
-.sass-cache
-.idea
+/_site
+/.sass-cache
+/.jekyll-cache/
+/.jekyll-metadata
+/vendor
+/.idea
+/*.iml
+/.bundle/
diff --git a/Gemfile b/Gemfile
index f45751c..07a0c60 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
 ruby '>=2.5.1'
 source 'https://rubygems.org'
-gem 'github-pages', group: :jekyll_plugins
-gem 'therubyracer'
+gem 'jekyll', '>= 4.2.0'
+gem 'jekyll-redirect-from', '>= 0.16.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 94607ab..2a4e808 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,271 +1,70 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.17.13)
-      ruby-enum (~> 0.5)
     concurrent-ruby (1.1.8)
-    dnsruby (1.61.5)
-      simpleidn (~> 0.1)
     em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
     eventmachine (1.2.7)
-    execjs (2.7.0)
-    faraday (1.3.0)
-      faraday-net_http (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    faraday-net_http (1.0.1)
     ffi (1.15.0)
     forwardable-extended (2.6.0)
-    gemoji (3.0.1)
-    github-pages (212)
-      github-pages-health-check (= 1.17.0)
-      jekyll (= 3.9.0)
-      jekyll-avatar (= 0.7.0)
-      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.1.6)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.15.1)
-      jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.13.0)
-      jekyll-mentions (= 1.6.0)
-      jekyll-optional-front-matter (= 0.3.2)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.3.0)
-      jekyll-redirect-from (= 0.16.0)
-      jekyll-relative-links (= 0.6.1)
-      jekyll-remote-theme (= 0.4.2)
-      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.7.1)
-      jekyll-sitemap (= 1.4.0)
-      jekyll-swiss (= 1.0.0)
-      jekyll-theme-architect (= 0.1.1)
-      jekyll-theme-cayman (= 0.1.1)
-      jekyll-theme-dinky (= 0.1.1)
-      jekyll-theme-hacker (= 0.1.2)
-      jekyll-theme-leap-day (= 0.1.1)
-      jekyll-theme-merlot (= 0.1.1)
-      jekyll-theme-midnight (= 0.1.1)
-      jekyll-theme-minimal (= 0.1.1)
-      jekyll-theme-modernist (= 0.1.1)
-      jekyll-theme-primer (= 0.5.4)
-      jekyll-theme-slate (= 0.1.1)
-      jekyll-theme-tactile (= 0.1.1)
-      jekyll-theme-time-machine (= 0.1.1)
-      jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.12.0)
-      kramdown (= 2.3.0)
-      kramdown-parser-gfm (= 1.1.0)
-      liquid (= 4.0.3)
-      mercenary (~> 0.3)
-      minima (= 2.5.1)
-      nokogiri (>= 1.10.4, < 2.0)
-      rouge (= 3.26.0)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.17.0)
-      addressable (~> 2.3)
-      dnsruby (~> 1.60)
-      octokit (~> 4.0)
-      public_suffix (>= 2.0.2, < 5.0)
-      typhoeus (~> 1.3)
-    html-pipeline (2.14.0)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.0)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (>= 1.17, < 3)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.7.0)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-coffeescript (1.1.1)
-      coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.3.1)
-      commonmarker (~> 0.14)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-commonmark-ghpages (0.1.6)
-      commonmarker (~> 0.17.6)
-      jekyll-commonmark (~> 1.2)
-      rouge (>= 2.0, < 4.0)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
-    jekyll-feed (0.15.1)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-gist (1.5.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.13.0)
-      jekyll (>= 3.4, < 5.0)
-      octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.6.0)
-      html-pipeline (~> 2.3)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-optional-front-matter (0.3.2)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.3.0)
-      jekyll (>= 3.0, < 5.0)
+      terminal-table (~> 2.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-relative-links (0.6.1)
-      jekyll (>= 3.3, < 5.0)
-    jekyll-remote-theme (0.4.2)
-      addressable (~> 2.0)
-      jekyll (>= 3.5, < 5.0)
-      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
-      rubyzip (>= 1.3.0, < 3.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-seo-tag (2.7.1)
-      jekyll (>= 3.8, < 5.0)
-    jekyll-sitemap (1.4.0)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-swiss (1.0.0)
-    jekyll-theme-architect (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.1.2)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.5.4)
-      jekyll (> 3.5, < 5.0)
-      jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.3)
-      jekyll (>= 3.3, < 5.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.12.0)
-      gemoji (~> 3.0)
-      html-pipeline (~> 2.2)
-      jekyll (>= 3.0, < 5.0)
-    kramdown (2.3.0)
+    kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    libv8 (3.16.14.19)
     liquid (4.0.3)
     listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
-    mini_portile2 (2.5.0)
-    minima (2.5.1)
-      jekyll (>= 3.5, < 5.0)
-      jekyll-feed (~> 0.9)
-      jekyll-seo-tag (~> 2.1)
-    minitest (5.14.4)
-    multipart-post (2.1.1)
-    nokogiri (1.11.2)
-      mini_portile2 (~> 2.5.0)
-      racc (~> 1.4)
-    octokit (4.20.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.6)
-    racc (1.5.2)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    ref (2.0.0)
     rexml (3.2.4)
     rouge (3.26.0)
-    ruby-enum (0.9.0)
-      i18n
-    ruby2_keywords (0.0.4)
-    rubyzip (2.3.0)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.2)
-      addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    simpleidn (0.2.1)
-      unf (~> 0.1.4)
-    terminal-table (1.8.0)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
-    thread_safe (0.3.6)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages
-  therubyracer
+  jekyll (>= 4.2.0)
+  jekyll-redirect-from (>= 0.16.0)
 
 RUBY VERSION
    ruby 2.7.1p83
diff --git a/_config.yml b/_config.yml
index 0433578..6bef6f0 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,6 +3,7 @@ title: Apache Fluo
 url: "https://fluo.apache.org/" # the base hostname & protocol for your site
 timezone: Etc/UTC
 permalink: pretty
+description: Apache Fluo Website
 
 markdown: kramdown
 
diff --git a/docs/fluo-recipes/1.0.0-incubating/export-queue.md b/docs/fluo-recipes/1.0.0-incubating/export-queue.md
index fe25863..f76ca07 100644
--- a/docs/fluo-recipes/1.0.0-incubating/export-queue.md
+++ b/docs/fluo-recipes/1.0.0-incubating/export-queue.md
@@ -109,7 +109,7 @@ This row range is defined by using the export queue id as a row prefix for all
 data in the export queue.  So the row range defined by the export queue id
 should not be used by anything else.
 
-All data stored in an export queue is [transient](transient.md). When an export
+All data stored in an export queue is [transient](../transient/). When an export
 queue is configured, it will recommend split points using the [table
 optimization process](table-optimization.md).  The number of splits generated
 by this process can be controlled by setting the number of buckets per tablet
diff --git a/docs/fluo-recipes/1.0.0-incubating/transient.md b/docs/fluo-recipes/1.0.0-incubating/transient.md
index 5ff4517..3d1d61f 100644
--- a/docs/fluo-recipes/1.0.0-incubating/transient.md
+++ b/docs/fluo-recipes/1.0.0-incubating/transient.md
@@ -25,7 +25,7 @@ standard way.
 
 ## Registering Transient Ranges
 
-Recipes like [Export Queue](export-queue.md) will automatically register
+Recipes like [Export Queue](../export-queue/) will automatically register
 transient ranges when configured.  If you would like to register your own
 transient ranges, use [TransientRegistry][1].  Below is a simple example of
 using this.
diff --git a/docs/fluo-recipes/1.1.0-incubating/export-queue.md b/docs/fluo-recipes/1.1.0-incubating/export-queue.md
index ec5ebd3..10caf14 100644
--- a/docs/fluo-recipes/1.1.0-incubating/export-queue.md
+++ b/docs/fluo-recipes/1.1.0-incubating/export-queue.md
@@ -240,7 +240,7 @@ This row range is defined by using the export queue id as a row prefix for all
 data in the export queue.  So the row range defined by the export queue id
 should not be used by anything else.
 
-All data stored in an export queue is [transient](transient.md). When an export
+All data stored in an export queue is [transient](../transient/). When an export
 queue is configured, it will recommend split points using the [table
 optimization process](table-optimization.md).  The number of splits generated
 by this process can be controlled by setting the number of buckets per tablet
diff --git a/docs/fluo-recipes/1.1.0-incubating/transient.md b/docs/fluo-recipes/1.1.0-incubating/transient.md
index b7265d9..5d0bdeb 100644
--- a/docs/fluo-recipes/1.1.0-incubating/transient.md
+++ b/docs/fluo-recipes/1.1.0-incubating/transient.md
@@ -25,7 +25,7 @@ standard way.
 
 ## Registering Transient Ranges
 
-Recipes like [Export Queue](export-queue.md) will automatically register
+Recipes like [Export Queue](../export-queue/) will automatically register
 transient ranges when configured.  If you would like to register your own
 transient ranges, use [TransientRegistry][1].  Below is a simple example of
 using this.