Merge RubyGems/Bundler master

  from https://github.com/rubygems/rubygems/commit/bfb0ae69776069155d2092702bfbb5a12617d85a

5 files changed, 74 insertions, 69 deletions

diff --git a/tool/bundler/dev_gems.rb b/tool/bundler/dev_gems.rb
index abeb25821b..1603d5f8bc 100644
--- a/tool/bundler/dev_gems.rb
+++ b/tool/bundler/dev_gems.rb
@@ -2,17 +2,16 @@
 
 source "https://rubygems.org"
 
-gem "rdoc", "6.2.0" # 6.2.1 is required > Ruby 2.3
 gem "test-unit", "~> 3.0"
 gem "rake", "~> 13.0"
 
 gem "webrick", "~> 1.6"
 gem "parallel_tests", "~> 2.29"
-gem "parallel", "1.19.2" # 1.20+ is required > Ruby 2.3
+gem "parallel", "~> 1.19"
 gem "rspec-core", "~> 3.12"
 gem "rspec-expectations", "~> 3.12"
 gem "rspec-mocks", "~> 3.12"
-gem "uri", "~> 0.10.1"
+gem "uri", "~> 0.12.0"
 
 group :doc do
   gem "ronn", "~> 0.7.3", :platform => :ruby
diff --git a/tool/bundler/dev_gems.rb.lock b/tool/bundler/dev_gems.rb.lock
index 526d7d3d86..41e2128bb8 100644
--- a/tool/bundler/dev_gems.rb.lock
+++ b/tool/bundler/dev_gems.rb.lock
@@ -5,13 +5,12 @@ GEM
     hpricot (0.8.6)
     hpricot (0.8.6-java)
     mustache (1.1.1)
-    parallel (1.19.2)
+    parallel (1.22.1)
     parallel_tests (2.32.0)
       parallel
-    power_assert (2.0.1)
+    power_assert (2.0.2)
     rake (13.0.6)
-    rdiscount (2.2.0.2)
-    rdoc (6.2.0)
+    rdiscount (2.2.7)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
@@ -21,13 +20,13 @@ GEM
     rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    test-unit (3.5.3)
+    test-unit (3.5.5)
       power_assert
-    uri (0.10.1)
+    uri (0.12.0)
     webrick (1.7.0)
 
 PLATFORMS
@@ -41,16 +40,15 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  parallel (= 1.19.2)
+  parallel (~> 1.19)
   parallel_tests (~> 2.29)
   rake (~> 13.0)
-  rdoc (= 6.2.0)
   ronn (~> 0.7.3)
   rspec-core (~> 3.12)
   rspec-expectations (~> 3.12)
   rspec-mocks (~> 3.12)
   test-unit (~> 3.0)
-  uri (~> 0.10.1)
+  uri (~> 0.12.0)
   webrick (~> 1.6)
 
 BUNDLED WITH
diff --git a/tool/bundler/rubocop_gems.rb.lock b/tool/bundler/rubocop_gems.rb.lock
index d706d0ce62..dbb7601a11 100644
--- a/tool/bundler/rubocop_gems.rb.lock
+++ b/tool/bundler/rubocop_gems.rb.lock
@@ -3,45 +3,48 @@ GEM
   specs:
     ast (2.4.2)
     diff-lcs (1.5.0)
-    minitest (5.15.0)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    json (2.6.3)
+    json (2.6.3-java)
+    minitest (5.16.3)
+    parallel (1.22.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
-    power_assert (2.0.1)
+    power_assert (2.0.2)
     rainbow (3.1.1)
     rake (13.0.6)
-    rake-compiler (1.1.7)
+    rake-compiler (1.2.0)
       rake
-    regexp_parser (2.2.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.2)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.3)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.24.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.40.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.24.0)
+      parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    test-unit (3.5.3)
+    test-unit (3.5.5)
       power_assert
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   aarch64-linux
diff --git a/tool/bundler/standard_gems.rb.lock b/tool/bundler/standard_gems.rb.lock
index fcac98fe27..198aada23b 100644
--- a/tool/bundler/standard_gems.rb.lock
+++ b/tool/bundler/standard_gems.rb.lock
@@ -3,51 +3,56 @@ GEM
   specs:
     ast (2.4.2)
     diff-lcs (1.5.0)
-    minitest (5.15.0)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    json (2.6.3)
+    json (2.6.3-java)
+    language_server-protocol (3.17.0.2)
+    minitest (5.16.3)
+    parallel (1.22.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
-    power_assert (2.0.1)
+    power_assert (2.0.2)
     rainbow (3.1.1)
     rake (13.0.6)
-    rake-compiler (1.1.7)
+    rake-compiler (1.2.0)
       rake
-    regexp_parser (2.2.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.2)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.3)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.24.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.39.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.13.1)
+    rubocop-ast (1.24.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.15.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    standard (1.6.0)
-      rubocop (= 1.24.1)
-      rubocop-performance (= 1.13.1)
-    test-unit (3.5.3)
+    standard (1.19.1)
+      language_server-protocol (~> 3.17.0.2)
+      rubocop (= 1.39.0)
+      rubocop-performance (= 1.15.1)
+    test-unit (3.5.5)
       power_assert
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   aarch64-linux
diff --git a/tool/bundler/test_gems.rb.lock b/tool/bundler/test_gems.rb.lock
index 8e2f0768a6..62b65c007f 100644
--- a/tool/bundler/test_gems.rb.lock
+++ b/tool/bundler/test_gems.rb.lock
@@ -5,7 +5,7 @@ GEM
       rack-test
     builder (3.2.4)
     compact_index (0.13.0)
-    mustermann (1.1.1)
+    mustermann (1.1.2)
       ruby2_keywords (~> 0.0.1)
     rack (2.0.8)
     rack-protection (2.0.8.1)
@@ -19,7 +19,7 @@ GEM
       rack (~> 2.0)
       rack-protection (= 2.0.8.1)
       tilt (~> 2.0)
-    tilt (2.0.10)
+    tilt (2.0.11)
     webrick (1.7.0)
 
 PLATFORMS