From 0e73b49b4c35a3ae8fd5530a730556b4e4ef4377 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Mon, 2 Nov 2020 19:57:27 +0900
Subject: [PATCH] Promote webrick to bundled gems

---
 doc/maintainers.rdoc      | 6 ++----
 doc/standard_library.rdoc | 2 +-
 gems/bundled_gems         | 1 +
 misc/expand_tabs.rb       | 1 -
 tool/sync_default_gems.rb | 1 -
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc
index c097262f34..8a2fc27fb0 100644
--- a/doc/maintainers.rdoc
+++ b/doc/maintainers.rdoc
@@ -293,10 +293,6 @@ Yukihiro Matsumoto (matz)
   YAMADA, Akira (akira)
   https://github.com/ruby/uri
   https://rubygems.org/gems/uri
-[lib/webrick.rb, lib/webrick/*]
-  Eric Wong (normalperson)
-  https://bugs.ruby-lang.org/
-  https://rubygems.org/gems/webrick
 [lib/yaml.rb, lib/yaml/*]
   Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt)
   https://github.com/ruby/yaml
@@ -419,3 +415,5 @@ Yukihiro Matsumoto (matz)
   https://github.com/ruby/rbs
 [typeprof]
   https://github.com/ruby/typeprof
+[lib/webrick.rb, lib/webrick/*]
+  https://github.com/ruby/webrick
diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc
index d25bfbf428..af13b371ea 100644
--- a/doc/standard_library.rdoc
+++ b/doc/standard_library.rdoc
@@ -79,7 +79,6 @@ Tracer:: Outputs a source level execution trace of a Ruby program
 TSort:: Topological sorting using Tarjan's algorithm
 un.rb:: Utilities to replace common UNIX commands
 URI:: A Ruby module providing support for Uniform Resource Identifiers
-WEBrick:: An HTTP server toolkit for Ruby
 YAML:: Ruby client library for the Psych YAML implementation
 WeakRef:: Allows a referenced object to be garbage-collected
 
@@ -117,3 +116,4 @@ REXML:: An XML toolkit for Ruby
 RSS:: Family of libraries that support various formats of XML "feeds"
 RBS:: RBS is a language to describe the structure of Ruby programs
 TypeProf:: A type analysis tool for Ruby code based on abstract interpretation
+WEBrick:: An HTTP server toolkit for Ruby
diff --git a/gems/bundled_gems b/gems/bundled_gems
index dba6d6721f..d97d6f95f1 100644
--- a/gems/bundled_gems
+++ b/gems/bundled_gems
@@ -7,3 +7,4 @@ rexml 3.2.4 https://github.com/ruby/rexml
 rss 0.2.9 https://github.com/ruby/rss 0.2.9
 rbs 0.20.1 https://github.com/ruby/rbs
 typeprof 0.9.0 https://github.com/ruby/typeprof 91567738bea4a9288bfaec8200702bd19e12a17e
+webrick 1.6.1 https://github.com/ruby/webrick
diff --git a/misc/expand_tabs.rb b/misc/expand_tabs.rb
index b091fecda7..b748ab4a61 100755
--- a/misc/expand_tabs.rb
+++ b/misc/expand_tabs.rb
@@ -81,7 +81,6 @@ DEFAULT_GEM_LIBS = %w[
   sync
   thwait
   tracer
-  webrick
 ]
 
 DEFAULT_GEM_EXTS = %w[
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 7f49642142..1874037e28 100644
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -17,7 +17,6 @@ REPOSITORIES = {
   "io-nonblock": 'ruby/io-nonblock',
   "io-wait": 'ruby/io-wait',
   csv: 'ruby/csv',
-  webrick: 'ruby/webrick',
   dbm: 'ruby/dbm',
   gdbm: 'ruby/gdbm',
   etc: 'ruby/etc',