You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by nk...@apache.org on 2019/11/14 15:57:30 UTC
[flink] branch release-1.8 updated (48f2d63 -> 0b43d8d)
This is an automated email from the ASF dual-hosted git repository.
nkruber pushed a change to branch release-1.8
in repository https://gitbox.apache.org/repos/asf/flink.git.
from 48f2d63 [hotfix][docs] clarify that a RocksDB dependency in pom.xml may not be needed
new bd6b2e2 [FLINK-13728][docs] Fix wrong closing tag order in sidenav
new 6d55aba [FLINK-13724][docs] Remove unnecessary whitespace from the generated pages
new d9b0c4b [FLINK-13723][docs] Use liquid-c for faster doc generation
new 70640a8 [FLINK-13729][docs] Update website generation dependencies
new ff954b5 [FLINK-13725][docs] use sassc for faster doc generation
new 369ac37 [hotfix][docs] Temporarily disable liveserve
new adbf065 [FLINK-13726][docs] Build docs with jekyll 4.0.0.pre.beta1
new 0b43d8d [FLINK-13791][docs] Speed up sidenav by using group_by
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docs/.gitignore | 3 +-
docs/Gemfile | 20 +++---
docs/Gemfile.lock | 91 +++++++++++++------------
docs/README.md | 3 +-
docs/_includes/sidenav.html | 157 ++++++++++++++++++++++----------------------
docs/_layouts/base.html | 6 +-
docs/_layouts/plain.html | 46 ++++++-------
docs/build_docs.sh | 2 +-
8 files changed, 171 insertions(+), 157 deletions(-)
[flink] 07/08: [FLINK-13726][docs] Build docs with jekyll
4.0.0.pre.beta1
Posted by nk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nkruber pushed a commit to branch release-1.8
in repository https://gitbox.apache.org/repos/asf/flink.git
commit adbf065ec2660ee63e282f0b6831d41d77d75f46
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Wed Aug 14 23:05:00 2019 +0200
[FLINK-13726][docs] Build docs with jekyll 4.0.0.pre.beta1
This significantly reduces the build times, on my machine from 140s to 47s!
This closes #9444
---
docs/.gitignore | 3 ++-
docs/Gemfile | 4 ++--
docs/Gemfile.lock | 19 +++++++++++--------
docs/README.md | 3 +--
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/docs/.gitignore b/docs/.gitignore
index 98b6f6b..6b3ce42 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,6 +1,7 @@
.bundle/
.jekyll-metadata
+.jekyll-cache/
.rubydeps/
content/
ruby2/.bundle/
-ruby2/.rubydeps/
\ No newline at end of file
+ruby2/.rubydeps/
diff --git a/docs/Gemfile b/docs/Gemfile
index 3bb7fea..cd9c708 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -18,9 +18,9 @@
source 'https://rubygems.org'
-ruby '>= 2.1.0'
+ruby '>= 2.4.0'
-gem 'jekyll', '3.7.2'
+gem 'jekyll', '4.0.0.pre.beta1'
gem 'addressable', '2.6.0'
gem 'octokit', '4.14.0'
gem 'therubyracer', '0.12.3'
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index affc2ba..0d5228a 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -14,27 +14,30 @@ GEM
ffi (1.11.1)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
- i18n (0.9.5)
+ i18n (1.6.0)
concurrent-ruby (~> 1.0)
- jekyll (3.7.2)
+ jekyll (4.0.0.pre.beta1)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
- i18n (~> 0.7)
+ i18n (>= 0.9.5, < 2)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 2.0)
- kramdown (~> 1.14)
+ kramdown (~> 2.1)
+ kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
- rouge (>= 1.7, < 4)
+ rouge (~> 3.0)
safe_yaml (~> 1.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-watch (2.2.1)
listen (~> 3.0)
json (2.2.0)
- kramdown (1.17.0)
+ kramdown (2.1.0)
+ kramdown-parser-gfm (1.1.0)
+ kramdown (~> 2.0)
libv8 (3.16.14.19)
liquid (4.0.3)
liquid-c (4.0.0)
@@ -78,7 +81,7 @@ PLATFORMS
DEPENDENCIES
addressable (= 2.6.0)
- jekyll (= 3.7.2)
+ jekyll (= 4.0.0.pre.beta1)
json (= 2.2.0)
liquid-c (= 4.0.0)
octokit (= 4.14.0)
@@ -86,7 +89,7 @@ DEPENDENCIES
therubyracer (= 0.12.3)
RUBY VERSION
- ruby 2.3.1p112
+ ruby 2.6.3p62
BUNDLED WITH
1.17.2
diff --git a/docs/README.md b/docs/README.md
index 79af68e..9e9805c 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -42,8 +42,7 @@ If you call the script with the preview flag `build_docs.sh -p`, Jekyll will
start a web server at `localhost:4000` and watch the docs directory for
updates. Use this mode to preview changes locally.
-If you have ruby 2.0 or greater,
-you can call the script with the incremental flag `build_docs.sh -i`.
+You can call the script with the incremental flag `build_docs.sh -i`.
Jekyll will then serve a live preview at `localhost:4000`,
and it will be much faster because it will only rebuild the pages corresponding
to files that are modified. Note that if you are making changes that affect
[flink] 01/08: [FLINK-13728][docs] Fix wrong closing tag order in
sidenav
Posted by nk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nkruber pushed a commit to branch release-1.8
in repository https://gitbox.apache.org/repos/asf/flink.git
commit bd6b2e2eb527392e7b6100089fd83c212e976705
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Wed Aug 14 15:59:50 2019 +0200
[FLINK-13728][docs] Fix wrong closing tag order in sidenav
This closes #9439
[ci skip]
---
docs/_includes/sidenav.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/_includes/sidenav.html b/docs/_includes/sidenav.html
index 5c5fb51..3011387 100644
--- a/docs/_includes/sidenav.html
+++ b/docs/_includes/sidenav.html
@@ -82,7 +82,7 @@ level is determined by 'nav-pos'.
{% else %}
{% assign elementsPos = elementsPosStack | last %}
{% assign pos = posStack | last %}
-</li></ul></div>
+</ul></div></li>
{% assign elementsPosStack = elementsPosStack | pop %}
{% assign posStack = posStack | pop %}
{% endif %}
[flink] 06/08: [hotfix][docs] Temporarily disable liveserve
Posted by nk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nkruber pushed a commit to branch release-1.8
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 369ac379a4b71a731208a7384349cae97bc7eb7c
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Wed Aug 14 23:00:09 2019 +0200
[hotfix][docs] Temporarily disable liveserve
./build_docs.sh -i previously did not only enable incremental documentation
building while serving the docs, it also enabled a 'liveserve' mode that
automatically reloaded pages in the browser when they changed. This is based
on the 'hawkins' module which is not (yet) compatible with jekyll 4.0 which we
need to (significantly) improve build times.
This disables the liveserve mode and remove the hawkins module until a new
version is available.
---
docs/Gemfile | 6 +++---
docs/Gemfile.lock | 4 ----
docs/build_docs.sh | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/docs/Gemfile b/docs/Gemfile
index 46ea627..3bb7fea 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -28,6 +28,6 @@ gem 'json', '2.2.0'
gem 'liquid-c', '4.0.0' # speed-up site generation
gem 'sassc', '2.0.1' # speed-up site generation
-group :jekyll_plugins do
- gem 'hawkins'
-end
+# group :jekyll_plugins do
+# gem 'hawkins'
+# end
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 866019c..affc2ba 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -13,9 +13,6 @@ GEM
multipart-post (>= 1.2, < 3)
ffi (1.11.1)
forwardable-extended (2.6.0)
- hawkins (2.0.5)
- em-websocket (~> 0.5)
- jekyll (~> 3.1)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
@@ -81,7 +78,6 @@ PLATFORMS
DEPENDENCIES
addressable (= 2.6.0)
- hawkins
jekyll (= 3.7.2)
json (= 2.2.0)
liquid-c (= 4.0.0)
diff --git a/docs/build_docs.sh b/docs/build_docs.sh
index aa08f4c..6176f9b 100755
--- a/docs/build_docs.sh
+++ b/docs/build_docs.sh
@@ -59,7 +59,7 @@ while getopts "pi" opt; do
;;
i)
[[ `${RUBY} -v` =~ 'ruby 1' ]] && echo "Error: building the docs with the incremental option requires at least ruby 2.0" && exit 1
- JEKYLL_CMD="liveserve --baseurl= --watch --incremental"
+ JEKYLL_CMD="serve --baseurl= --watch --incremental"
;;
esac
done
[flink] 03/08: [FLINK-13723][docs] Use liquid-c for faster doc
generation
Posted by nk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nkruber pushed a commit to branch release-1.8
in repository https://gitbox.apache.org/repos/asf/flink.git
commit d9b0c4ba032000cea992d4a3eccf96b2cc6b8f43
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Wed Aug 14 15:20:28 2019 +0200
[FLINK-13723][docs] Use liquid-c for faster doc generation
Jekyll requires liquid and only optionally uses liquid-c if available. The
latter uses natively-compiled code and reduces generation time by ~5% for me.
This closes #9441
---
docs/Gemfile | 1 +
docs/Gemfile.lock | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/docs/Gemfile b/docs/Gemfile
index 6b3d0b4..4fbbe71 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -25,6 +25,7 @@ gem 'addressable', '2.4.0'
gem 'octokit', '~> 4.3.0'
gem 'therubyracer', '0.12.2'
gem 'json', '2.0.4'
+gem 'liquid-c', '4.0.0' # speed-up site generation
group :jekyll_plugins do
gem 'hawkins'
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 1faadc0..2daa8dc 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -39,6 +39,8 @@ GEM
kramdown (1.16.2)
libv8 (3.16.14.19)
liquid (4.0.0)
+ liquid-c (4.0.0)
+ liquid (>= 3.0.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
@@ -76,6 +78,7 @@ DEPENDENCIES
hawkins
jekyll (= 3.7.2)
json (= 2.0.4)
+ liquid-c (= 4.0.0)
octokit (~> 4.3.0)
therubyracer (= 0.12.2)
@@ -83,4 +86,4 @@ RUBY VERSION
ruby 2.3.1p112
BUNDLED WITH
- 1.16.1
+ 1.17.2
[flink] 08/08: [FLINK-13791][docs] Speed up sidenav by using
group_by
Posted by nk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nkruber pushed a commit to branch release-1.8
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 0b43d8dc9b9dfb0b8cfe255ff95f05b55fd4f85a
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Mon Aug 19 23:48:57 2019 +0200
[FLINK-13791][docs] Speed up sidenav by using group_by
_includes/sidenav.html parses through pages_by_language over and over again
trying to find children when building the (recursive) side navigation. By doing
this once with a group_by, we can gain considerable savings in building the
docs via `./build_docs.sh` without any change to the generated HTML pages:
This closes #9487
---
docs/_includes/sidenav.html | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/docs/_includes/sidenav.html b/docs/_includes/sidenav.html
index 3132955..7d1295f 100644
--- a/docs/_includes/sidenav.html
+++ b/docs/_includes/sidenav.html
@@ -63,7 +63,9 @@ level is determined by 'nav-pos'.
{%- assign posStack = site.array -%}
{%- assign elements = site.array -%}
-{%- assign children = (site.pages | where: "nav-parent_id" , "root" | sort: "nav-pos") -%}
+{%- assign all_pages_by_nav_parent = (site.pages | where_exp: "item", "item.nav-parent_id != nil" | group_by: "nav-parent_id") -%}
+{%- assign children = (all_pages_by_nav_parent | where: "name" , "root") -%}
+{%- assign children = (children[0].items | sort: "nav-pos") -%}
{%- if children.size > 0 -%}
{%- assign elements = elements | push: children -%}
{%- endif -%}
@@ -105,8 +107,9 @@ level is determined by 'nav-pos'.
{%- assign pos = pos | plus: 1 -%}
{%- if this.nav-id -%}
- {%- assign children = (site.pages | where: "nav-parent_id" , this.nav-id | sort: "nav-pos") -%}
+ {%- assign children = (all_pages_by_nav_parent | where: "name" , this.nav-id) -%}
{%- if children.size > 0 -%}
+ {%- assign children = (children[0].items | sort: "nav-pos") -%}
{%- capture collapse_target -%}"#collapse-{{ i }}" data-toggle="collapse"{%- if active -%} class="active"{%- endif -%}{%- endcapture -%}
{%- capture expand -%}{%- unless active -%} <i class="fa fa-caret-down pull-right" aria-hidden="true" style="padding-top: 4px"></i>{%- endunless -%}{%- endcapture %}
<li><a href={{ collapse_target }}>{{ title }}{{ expand }}</a><div class="collapse{% if active %} in{% endif %}" id="collapse-{{ i }}"><ul>
[flink] 05/08: [FLINK-13725][docs] use sassc for faster doc
generation
Posted by nk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nkruber pushed a commit to branch release-1.8
in repository https://gitbox.apache.org/repos/asf/flink.git
commit ff954b568f9068d9fcb3f5c007dec296831ded0e
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Wed Aug 14 17:29:43 2019 +0200
[FLINK-13725][docs] use sassc for faster doc generation
Jekyll requires sass but can optionally also use a C-based implementation
provided by sassc. Although we do not use sass directly, there may be some
indirect use inside jekyll. It doesn't seem to hurt to upgrade here.
This closes #9443
---
docs/Gemfile | 1 +
docs/Gemfile.lock | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/docs/Gemfile b/docs/Gemfile
index b6c8251..46ea627 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -26,6 +26,7 @@ gem 'octokit', '4.14.0'
gem 'therubyracer', '0.12.3'
gem 'json', '2.2.0'
gem 'liquid-c', '4.0.0' # speed-up site generation
+gem 'sassc', '2.0.1' # speed-up site generation
group :jekyll_plugins do
gem 'hawkins'
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 03c1ec2..866019c 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -53,6 +53,7 @@ GEM
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.1.1)
+ rake (12.3.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
@@ -65,6 +66,9 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
+ sassc (2.0.1)
+ ffi (~> 1.9)
+ rake
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
@@ -82,6 +86,7 @@ DEPENDENCIES
json (= 2.2.0)
liquid-c (= 4.0.0)
octokit (= 4.14.0)
+ sassc (= 2.0.1)
therubyracer (= 0.12.3)
RUBY VERSION
[flink] 02/08: [FLINK-13724][docs] Remove unnecessary whitespace
from the generated pages
Posted by nk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nkruber pushed a commit to branch release-1.8
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 6d55ababf05f24070053cafd177c9b69cabeff60
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Wed Aug 14 16:18:06 2019 +0200
[FLINK-13724][docs] Remove unnecessary whitespace from the generated pages
Starting command tags with "{%-" will drop all whitespace to the left and ending
with "-%}" will drop all whitespace to the right (including newlines!).
Code like the following would otherwise create quite some unnecessary
whitespace:
{% if parent_id %}
{% assign parent_id = current[0].nav-parent_id %}
{% else %}
{% break %}
{% endif %}
This closes #9440
---
docs/_includes/sidenav.html | 152 ++++++++++++++++++++++----------------------
docs/_layouts/base.html | 6 +-
docs/_layouts/plain.html | 46 +++++++-------
3 files changed, 102 insertions(+), 102 deletions(-)
diff --git a/docs/_includes/sidenav.html b/docs/_includes/sidenav.html
index 3011387..3132955 100644
--- a/docs/_includes/sidenav.html
+++ b/docs/_includes/sidenav.html
@@ -17,30 +17,30 @@ specific language governing permissions and limitations
under the License.
-->
-{% comment %}
+{%- comment -%}
==============================================================================
Extract the active nav IDs.
==============================================================================
-{% endcomment %}
-
-{% assign active_nav_ids = site.array %}
-{% assign parent_id = page.nav-parent_id %}
-
-{% for i in (1..10) %}
- {% if parent_id %}
- {% assign active_nav_ids = active_nav_ids | push: parent_id %}
- {% assign current = (site.pages | where: "nav-id" , parent_id | sort: "nav-pos") %}
- {% if current.size > 0 %}
- {% assign parent_id = current[0].nav-parent_id %}
- {% else %}
- {% break %}
- {% endif %}
- {% else %}
- {% break %}
- {% endif %}
-{% endfor %}
-
-{% comment %}
+{%- endcomment -%}
+
+{%- assign active_nav_ids = site.array -%}
+{%- assign parent_id = page.nav-parent_id -%}
+
+{%- for i in (1..10) -%}
+ {%- if parent_id -%}
+ {%- assign active_nav_ids = active_nav_ids | push: parent_id -%}
+ {%- assign current = (site.pages | where: "nav-id" , parent_id | sort: "nav-pos") -%}
+ {%- if current.size > 0 -%}
+ {%- assign parent_id = current[0].nav-parent_id -%}
+ {%- else -%}
+ {%- break -%}
+ {%- endif -%}
+ {%- else -%}
+ {%- break -%}
+ {%- endif -%}
+{%- endfor -%}
+
+{%- comment -%}
==============================================================================
Build the nested list from nav-id and nav-parent_id relations.
==============================================================================
@@ -57,74 +57,74 @@ Level 0 is made up of all pages, which have nav-parent_id set to 'root'.
The 'title' of the page is used as the default link text. You can
override this via 'nav-title'. The relative position per navigational
level is determined by 'nav-pos'.
-{% endcomment %}
+{%- endcomment -%}
-{% assign elementsPosStack = site.array %}
-{% assign posStack = site.array %}
+{%- assign elementsPosStack = site.array -%}
+{%- assign posStack = site.array -%}
-{% assign elements = site.array %}
-{% assign children = (site.pages | where: "nav-parent_id" , "root" | sort: "nav-pos") %}
-{% if children.size > 0 %}
- {% assign elements = elements | push: children %}
-{% endif %}
+{%- assign elements = site.array -%}
+{%- assign children = (site.pages | where: "nav-parent_id" , "root" | sort: "nav-pos") -%}
+{%- if children.size > 0 -%}
+ {%- assign elements = elements | push: children -%}
+{%- endif -%}
-{% assign elementsPos = 0 %}
-{% assign pos = 0 %}
+{%- assign elementsPos = 0 -%}
+{%- assign pos = 0 -%}
<div class="sidenav-logo">
<p><a href="{{ site.baseurl }}"><img class="bottom" alt="Apache Flink" src="{{ site.baseurl }}/page/img/navbar-brand-logo.jpg"></a> v{{ site.version_title }}</p>
</div>
<ul id="sidenav">
-{% for i in (1..10000) %}
- {% if pos >= elements[elementsPos].size %}
- {% if elementsPos == 0 %}
- {% break %}
- {% else %}
- {% assign elementsPos = elementsPosStack | last %}
- {% assign pos = posStack | last %}
+{%- for i in (1..10000) -%}
+ {%- if pos >= elements[elementsPos].size -%}
+ {%- if elementsPos == 0 -%}
+ {%- break -%}
+ {%- else -%}
+ {%- assign elementsPos = elementsPosStack | last -%}
+ {%- assign pos = posStack | last %}
</ul></div></li>
- {% assign elementsPosStack = elementsPosStack | pop %}
- {% assign posStack = posStack | pop %}
- {% endif %}
- {% else %}
- {% assign this = elements[elementsPos][pos] %}
-
- {% if this.url == page.url %}
- {% assign active = true %}
- {% elsif this.nav-id and active_nav_ids contains this.nav-id %}
- {% assign active = true %}
- {% else %}
- {% assign active = false %}
- {% endif %}
-
- {% capture title %}{% if this.nav-title %}{{ this.nav-title }}{% else %}{{ this.title }}{% endif %}{% endcapture %}
- {% capture target %}"{{ site.baseurl }}{{ this.url }}"{% if active %} class="active"{% endif %}{% endcapture %}
- {% capture overview_target %}"{{ site.baseurl }}{{ this.url }}"{% if this.url == page.url %} class="active"{% endif %}{% endcapture %}
+ {%- assign elementsPosStack = elementsPosStack | pop -%}
+ {%- assign posStack = posStack | pop -%}
+ {%- endif -%}
+ {%- else -%}
+ {%- assign this = elements[elementsPos][pos] -%}
+
+ {%- if this.url == page.url -%}
+ {%- assign active = true -%}
+ {%- elsif this.nav-id and active_nav_ids contains this.nav-id -%}
+ {%- assign active = true -%}
+ {%- else -%}
+ {%- assign active = false -%}
+ {%- endif -%}
+
+ {%- capture title -%}{%- if this.nav-title -%}{{ this.nav-title }}{%- else -%}{{ this.title }}{%- endif -%}{%- endcapture -%}
+ {%- capture target -%}"{{ site.baseurl }}{{ this.url }}"{%- if active %} class="active"{%- endif -%}{%- endcapture -%}
+ {%- capture overview_target -%}"{{ site.baseurl }}{{ this.url }}"{%- if this.url == page.url -%} class="active"{%- endif -%}{%- endcapture -%}
{% if this.section-break %}<hr class="section-break"></hr>{% endif %}
- {% assign pos = pos | plus: 1 %}
- {% if this.nav-id %}
- {% assign children = (site.pages | where: "nav-parent_id" , this.nav-id | sort: "nav-pos") %}
- {% if children.size > 0 %}
- {% capture collapse_target %}"#collapse-{{ i }}" data-toggle="collapse"{% if active %} class="active"{% endif %}{% endcapture %}
- {% capture expand %}{% unless active %} <i class="fa fa-caret-down pull-right" aria-hidden="true" style="padding-top: 4px"></i>{% endunless %}{% endcapture %}
+ {%- assign pos = pos | plus: 1 -%}
+ {%- if this.nav-id -%}
+ {%- assign children = (site.pages | where: "nav-parent_id" , this.nav-id | sort: "nav-pos") -%}
+ {%- if children.size > 0 -%}
+ {%- capture collapse_target -%}"#collapse-{{ i }}" data-toggle="collapse"{%- if active -%} class="active"{%- endif -%}{%- endcapture -%}
+ {%- capture expand -%}{%- unless active -%} <i class="fa fa-caret-down pull-right" aria-hidden="true" style="padding-top: 4px"></i>{%- endunless -%}{%- endcapture %}
<li><a href={{ collapse_target }}>{{ title }}{{ expand }}</a><div class="collapse{% if active %} in{% endif %}" id="collapse-{{ i }}"><ul>
- {% if this.nav-show_overview %}<li><a href={{ overview_target }}>Overview</a></li>{% endif %}
- {% assign elements = elements | push: children %}
- {% assign elementsPosStack = elementsPosStack | push: elementsPos %}
- {% assign posStack = posStack | push: pos %}
-
- {% assign elementsPos = elements.size | minus: 1 %}
- {% assign pos = 0 %}
- {% else %}
+ {%- if this.nav-show_overview %}<li><a href={{ overview_target }}>Overview</a></li>{%- endif -%}
+ {%- assign elements = elements | push: children -%}
+ {%- assign elementsPosStack = elementsPosStack | push: elementsPos -%}
+ {%- assign posStack = posStack | push: pos -%}
+
+ {%- assign elementsPos = elements.size | minus: 1 -%}
+ {%- assign pos = 0 -%}
+ {%- else %}
<li><a href={{ target }}>{{ title }}</a></li>
- {% endif %}
- {% else %}
+ {%- endif -%}
+ {%- else %}
<li><a href={{ target }}>{{ title }}</a></li>
- {% endif %}
- {% endif %}
-{% endfor %}
+ {%- endif -%}
+ {%- endif -%}
+{%- endfor %}
<li class="divider"></li>
<li><a href="{{ site.javadocs_baseurl }}/api/java"><i class="fa fa-external-link title" aria-hidden="true"></i> Javadocs</a></li>
<li><a href="{{ site.javadocs_baseurl }}/api/scala/index.html#org.apache.flink.api.scala.package"><i class="fa fa-external-link title" aria-hidden="true"></i> Scaladocs</a></li>
@@ -145,9 +145,9 @@ level is determined by 'nav-pos'.
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">Pick Docs Version
<span class="caret"></span></button>
<ul class="dropdown-menu">
- {% for d in site.previous_docs %}
+ {%- for d in site.previous_docs %}
<li><a href="{{ d[1] }}">v{{ d[0] }}</a></li>
- {% endfor %}
+ {%- endfor %}
</ul>
</div>
</div>
diff --git a/docs/_layouts/base.html b/docs/_layouts/base.html
index 1dbaa76..8be5cc7 100644
--- a/docs/_layouts/base.html
+++ b/docs/_layouts/base.html
@@ -72,9 +72,9 @@ under the License.
{% include sidenav.html %}
</div>
<div class="col-lg-9 content" id="contentcol">
- {% if page.mathjax %}
- {% include latex_commands.html %}
- {% endif %}
+ {%- if page.mathjax -%}
+ {%- include latex_commands.html -%}
+ {%- endif %}
{{ content }}
</div>
diff --git a/docs/_layouts/plain.html b/docs/_layouts/plain.html
index 44f9e1a..62cae1b 100644
--- a/docs/_layouts/plain.html
+++ b/docs/_layouts/plain.html
@@ -20,36 +20,36 @@ specific language governing permissions and limitations
under the License.
-->
-{% assign active_pages = site.array %}
-{% assign active = page %}
-
-{% for i in (1..10) %}
- {% assign active_pages = active_pages | push: active %}
- {% if active.nav-parent_id %}
- {% assign next = site.pages | where: "nav-id" , active.nav-parent_id %}
- {% if next.size > 0 %}
- {% assign active = next[0] %}
- {% else %}
- {% break %}
- {% endif %}
- {% else %}
- {% break %}
- {% endif %}
-{% endfor %}
+{%- assign active_pages = site.array -%}
+{%- assign active = page -%}
+
+{%- for i in (1..10) -%}
+ {%- assign active_pages = active_pages | push: active -%}
+ {%- if active.nav-parent_id -%}
+ {%- assign next = site.pages | where: "nav-id" , active.nav-parent_id -%}
+ {%- if next.size > 0 -%}
+ {%- assign active = next[0] -%}
+ {%- else -%}
+ {%- break -%}
+ {%- endif -%}
+ {%- else -%}
+ {%- break -%}
+ {%- endif -%}
+{%- endfor -%}
{% assign active_pages = active_pages | reverse %}
<ol class="breadcrumb">
-{% for p in active_pages %}
+{%- for p in active_pages %}
{% capture title %}{% if p.nav-title %}{{ p.nav-title }}{% else %}{{ p.title }}{% endif %}{% endcapture %}
- {% if forloop.last == true %}
+ {%- if forloop.last == true %}
<li class="active">{{ title }}</li>
- {% elsif p.nav-show_overview %}
+ {%- elsif p.nav-show_overview %}
<li><a href="{{ site.baseurl }}{{ p.url }}">{{ title }}</a></li>
- {% else %}
+ {%- else %}
<li>{{ title }}</li>
- {% endif %}
-{% endfor %}
+ {%- endif -%}
+{%- endfor %}
</ol>
<h1>{{ page.title }}{% if page.is_beta %} <span class="beta">Beta</span>{% endif %}</h1>
@@ -57,6 +57,6 @@ under the License.
<div class="alert alert-danger" role="alert">
<strong>This documentation is for an out-of-date version of Apache Flink. We recommend you use <a href="https://ci.apache.org/projects/flink/flink-docs-stable/">the latest stable version</a>.</strong>
</div>
-{% endif %}
+{%- endif %}
{{ content }}
[flink] 04/08: [FLINK-13729][docs] Update website generation
dependencies
Posted by nk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nkruber pushed a commit to branch release-1.8
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 70640a88b1f40aec7378a14ede3de1dde109f917
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Wed Aug 14 16:57:14 2019 +0200
[FLINK-13729][docs] Update website generation dependencies
This seems to come with a much nicer code highlighting.
This closes #9442
---
docs/Gemfile | 8 +++----
docs/Gemfile.lock | 62 ++++++++++++++++++++++++++++---------------------------
2 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/docs/Gemfile b/docs/Gemfile
index 4fbbe71..b6c8251 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -21,10 +21,10 @@ source 'https://rubygems.org'
ruby '>= 2.1.0'
gem 'jekyll', '3.7.2'
-gem 'addressable', '2.4.0'
-gem 'octokit', '~> 4.3.0'
-gem 'therubyracer', '0.12.2'
-gem 'json', '2.0.4'
+gem 'addressable', '2.6.0'
+gem 'octokit', '4.14.0'
+gem 'therubyracer', '0.12.3'
+gem 'json', '2.2.0'
gem 'liquid-c', '4.0.0' # speed-up site generation
group :jekyll_plugins do
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 2daa8dc..03c1ec2 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,22 +1,23 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.4.0)
+ addressable (2.6.0)
+ public_suffix (>= 2.0.2, < 4.0)
colorator (1.1.0)
- concurrent-ruby (1.0.5)
+ concurrent-ruby (1.1.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
- eventmachine (1.2.5)
- faraday (0.9.2)
+ eventmachine (1.2.7)
+ faraday (0.15.4)
multipart-post (>= 1.2, < 3)
- ffi (1.9.18)
+ ffi (1.11.1)
forwardable-extended (2.6.0)
hawkins (2.0.5)
em-websocket (~> 0.5)
jekyll (~> 3.1)
http_parser.rb (0.6.0)
- i18n (0.9.3)
+ i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.7.2)
addressable (~> 2.4)
@@ -31,14 +32,14 @@ GEM
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
- jekyll-sass-converter (1.5.1)
+ jekyll-sass-converter (1.5.2)
sass (~> 3.4)
- jekyll-watch (2.0.0)
+ jekyll-watch (2.2.1)
listen (~> 3.0)
- json (2.0.4)
- kramdown (1.16.2)
+ json (2.2.0)
+ kramdown (1.17.0)
libv8 (3.16.14.19)
- liquid (4.0.0)
+ liquid (4.0.3)
liquid-c (4.0.0)
liquid (>= 3.0.0)
listen (3.1.5)
@@ -46,41 +47,42 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
- multipart-post (2.0.0)
- octokit (4.3.0)
- sawyer (~> 0.7.0, >= 0.5.3)
- pathutil (0.16.1)
+ multipart-post (2.1.1)
+ octokit (4.14.0)
+ sawyer (~> 0.8.0, >= 0.5.3)
+ pathutil (0.16.2)
forwardable-extended (~> 2.6)
- rb-fsevent (0.10.2)
- rb-inotify (0.9.10)
- ffi (>= 0.5.0, < 2)
+ public_suffix (3.1.1)
+ rb-fsevent (0.10.3)
+ rb-inotify (0.10.0)
+ ffi (~> 1.0)
ref (2.0.0)
- rouge (3.1.1)
+ rouge (3.8.0)
ruby_dep (1.5.0)
- safe_yaml (1.0.4)
- sass (3.5.5)
+ 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.7.0)
- addressable (>= 2.3.5, < 2.5)
- faraday (~> 0.8, < 0.10)
- therubyracer (0.12.2)
- libv8 (~> 3.16.14.0)
+ sawyer (0.8.2)
+ addressable (>= 2.3.5)
+ faraday (> 0.8, < 2.0)
+ therubyracer (0.12.3)
+ libv8 (~> 3.16.14.15)
ref
PLATFORMS
ruby
DEPENDENCIES
- addressable (= 2.4.0)
+ addressable (= 2.6.0)
hawkins
jekyll (= 3.7.2)
- json (= 2.0.4)
+ json (= 2.2.0)
liquid-c (= 4.0.0)
- octokit (~> 4.3.0)
- therubyracer (= 0.12.2)
+ octokit (= 4.14.0)
+ therubyracer (= 0.12.3)
RUBY VERSION
ruby 2.3.1p112