You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@yetus.apache.org by aw...@apache.org on 2020/09/14 15:43:02 UTC
[yetus] branch main updated: YETUS-989. Upgrade middleman to
v4.3.10 (#124)
This is an automated email from the ASF dual-hosted git repository.
aw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/yetus.git
The following commit(s) were added to refs/heads/main by this push:
new c930f38 YETUS-989. Upgrade middleman to v4.3.10 (#124)
c930f38 is described below
commit c930f382af4bdeb7fd36877dcce66ce05131bf5d
Author: Allen Wittenauer <aw...@apache.org>
AuthorDate: Mon Sep 14 08:42:11 2020 -0700
YETUS-989. Upgrade middleman to v4.3.10 (#124)
Signed-off-by: Sean Busbey <bu...@apache.org>
---
asf-site-src/Dockerfile | 3 +--
asf-site-src/Gemfile | 2 ++
asf-site-src/Gemfile.lock | 51 ++++++++++++++++++++++++++---------------------
asf-site-src/config.rb | 1 +
4 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/asf-site-src/Dockerfile b/asf-site-src/Dockerfile
index 41f82e9..5b1d22c 100644
--- a/asf-site-src/Dockerfile
+++ b/asf-site-src/Dockerfile
@@ -56,10 +56,9 @@ ENV GEM_HOME ${BUNDLE_PATH}
# on re-launches
# hadolint ignore=DL3028
RUN gem install bundler \
- middleman:'4.3.6' \
+ middleman:'4.3.10' \
middleman-livereload \
middleman-syntax \
- redcarpet \
therubyracer \
tzinfo-data \
rake:13.0.1 \
diff --git a/asf-site-src/Gemfile b/asf-site-src/Gemfile
index 666a6d6..795473d 100644
--- a/asf-site-src/Gemfile
+++ b/asf-site-src/Gemfile
@@ -37,4 +37,6 @@ gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby]
gem 'therubyracer'
+gem 'kramdown-parser-gfm'
+
# rubocop:enable Style/HashSyntax, Style/SymbolArray
diff --git a/asf-site-src/Gemfile.lock b/asf-site-src/Gemfile.lock
index 16a9718..b24d319 100644
--- a/asf-site-src/Gemfile.lock
+++ b/asf-site-src/Gemfile.lock
@@ -9,21 +9,21 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- activesupport (5.0.7.2)
+ activesupport (5.2.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
- backports (3.16.1)
+ backports (3.18.2)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
- concurrent-ruby (1.1.6)
+ concurrent-ruby (1.1.7)
contracts (0.13.0)
- dotenv (2.7.5)
+ dotenv (2.7.6)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
@@ -31,8 +31,8 @@ GEM
eventmachine (1.2.7)
execjs (2.7.0)
fast_blank (1.0.0)
- fastimage (2.1.7)
- ffi (1.12.2)
+ fastimage (2.2.0)
+ ffi (1.13.1)
haml (5.1.2)
temple (>= 0.8.0)
tilt
@@ -42,22 +42,25 @@ GEM
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
- kramdown (1.17.0)
+ kramdown (2.3.0)
+ rexml
+ kramdown-parser-gfm (1.1.0)
+ kramdown (~> 2.0)
libv8 (3.16.14.19)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
memoist (0.16.2)
- middleman (4.3.6)
+ middleman (4.3.10)
coffee-script (~> 2.2)
haml (>= 4.0.5)
- kramdown (~> 1.2)
- middleman-cli (= 4.3.6)
- middleman-core (= 4.3.6)
- middleman-cli (4.3.6)
+ kramdown (>= 2.3.0)
+ middleman-cli (= 4.3.10)
+ middleman-core (= 4.3.10)
+ middleman-cli (4.3.10)
thor (>= 0.17.0, < 2.0)
- middleman-core (4.3.6)
- activesupport (>= 4.2, < 5.1)
+ middleman-core (4.3.10)
+ activesupport (>= 4.2, < 6.0)
addressable (~> 2.3)
backports (~> 3.6)
bundler
@@ -83,24 +86,25 @@ GEM
em-websocket (~> 0.5.1)
middleman-core (>= 3.3)
rack-livereload (~> 0.3.15)
- minitest (5.14.0)
+ minitest (5.14.2)
padrino-helpers (0.13.3.4)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.13.3.4)
tilt (>= 1.4.1, < 3)
padrino-support (0.13.3.4)
activesupport (>= 3.1)
- parallel (1.19.1)
- public_suffix (4.0.3)
- rack (2.2.2)
+ parallel (1.19.2)
+ public_suffix (4.0.6)
+ rack (2.2.3)
rack-livereload (0.3.17)
rack
- rb-fsevent (0.10.3)
+ rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
ref (2.0.0)
- rouge (3.16.0)
- sassc (2.2.1)
+ rexml (3.2.4)
+ rouge (3.23.0)
+ sassc (2.4.0)
ffi (~> 1.9)
servolux (0.13.0)
temple (0.8.2)
@@ -110,7 +114,7 @@ GEM
thor (1.0.1)
thread_safe (0.3.6)
tilt (2.0.10)
- tzinfo (1.2.6)
+ tzinfo (1.2.7)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
@@ -119,6 +123,7 @@ PLATFORMS
ruby
DEPENDENCIES
+ kramdown-parser-gfm
middleman (~> 4.2)
middleman-livereload
middleman-syntax!
@@ -127,4 +132,4 @@ DEPENDENCIES
wdm (~> 0.1.0)
BUNDLED WITH
- 2.0.2
+ 2.1.4
diff --git a/asf-site-src/config.rb b/asf-site-src/config.rb
index 5f2914e..0e3da82 100644
--- a/asf-site-src/config.rb
+++ b/asf-site-src/config.rb
@@ -18,6 +18,7 @@
#
require 'ruby27_fix_uri'
+require 'kramdown-parser-gfm'
set :markdown_engine, :kramdown
# rubocop:disable Layout/HashAlignment