Merge pull request #5482 from hsbt/rubygems-3-3-bundler-2-3

Merge RubyGems 3.3.x and Bundler 2.3.x

6 files changed, 125 insertions, 27 deletions

diff --git a/tool/bundler/dev_gems.rb b/tool/bundler/dev_gems.rb
new file mode 100644
index 0000000000..20a9594f4f
--- /dev/null
+++ b/tool/bundler/dev_gems.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+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"
+
+group :lint do
+  gem "rubocop", "~> 0.80.1"
+  gem "rubocop-performance", "~> 1.5.2"
+end
+
+gem "webrick", "~> 1.6"
+gem "parallel_tests", "~> 2.29"
+gem "parallel", "1.19.2" # 1.20+ is required > Ruby 2.3
+gem "rspec-core", "~> 3.8"
+gem "rspec-expectations", "~> 3.8"
+gem "rspec-mocks", "~> 3.8"
+gem "uri", "~> 0.10.1"
+
+group :doc do
+  gem "ronn", "~> 0.7.3", :platform => :ruby
+end
diff --git a/tool/bundler/dev_gems.rb.lock b/tool/bundler/dev_gems.rb.lock
new file mode 100644
index 0000000000..2465b8ea49
--- /dev/null
+++ b/tool/bundler/dev_gems.rb.lock
@@ -0,0 +1,73 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    diff-lcs (1.5.0)
+    hpricot (0.8.6)
+    jaro_winkler (1.5.4)
+    jaro_winkler (1.5.4-java)
+    mustache (1.1.1)
+    parallel (1.19.2)
+    parallel_tests (2.32.0)
+      parallel
+    parser (3.1.0.0)
+      ast (~> 2.4.1)
+    power_assert (2.0.1)
+    rainbow (3.1.1)
+    rdiscount (2.2.0.2)
+    rdoc (6.2.0)
+    rexml (3.2.5)
+    ronn (0.7.3)
+      hpricot (>= 0.8.2)
+      mustache (>= 0.7.0)
+      rdiscount (>= 1.5.8)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (0.80.1)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.5.2)
+      rubocop (>= 0.71.0)
+    ruby-progressbar (1.11.0)
+    test-unit (3.5.3)
+      power_assert
+    unicode-display_width (1.6.1)
+    uri (0.10.1)
+    webrick (1.7.0)
+
+PLATFORMS
+  java
+  ruby
+  universal-java-11
+  x64-mingw32
+  x86_64-darwin-20
+  x86_64-linux
+
+DEPENDENCIES
+  parallel (= 1.19.2)
+  parallel_tests (~> 2.29)
+  rdoc (= 6.2.0)
+  ronn (~> 0.7.3)
+  rspec-core (~> 3.8)
+  rspec-expectations (~> 3.8)
+  rspec-mocks (~> 3.8)
+  rubocop (~> 0.80.1)
+  rubocop-performance (~> 1.5.2)
+  test-unit (~> 3.0)
+  uri (~> 0.10.1)
+  webrick (~> 1.6)
+
+BUNDLED WITH
+   2.3.6
diff --git a/tool/bundler/rubocop_gems.rb.lock b/tool/bundler/rubocop_gems.rb.lock
index 8c74c71d7d..b3ee29e2e6 100644
--- a/tool/bundler/rubocop_gems.rb.lock
+++ b/tool/bundler/rubocop_gems.rb.lock
@@ -2,17 +2,17 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    diff-lcs (1.4.4)
-    minitest (5.14.4)
+    diff-lcs (1.5.0)
+    minitest (5.15.0)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     power_assert (2.0.1)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    rake-compiler (1.1.1)
+    rake-compiler (1.1.7)
       rake
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -27,19 +27,19 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
-    rubocop (1.23.0)
+    rubocop (1.24.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.13.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
-    test-unit (3.5.1)
+    test-unit (3.5.3)
       power_assert
     unicode-display_width (2.1.0)
 
@@ -60,4 +60,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.3.3
+   2.3.6
diff --git a/tool/bundler/standard_gems.rb.lock b/tool/bundler/standard_gems.rb.lock
index 4201bfd7a0..1120c70259 100644
--- a/tool/bundler/standard_gems.rb.lock
+++ b/tool/bundler/standard_gems.rb.lock
@@ -2,17 +2,17 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    diff-lcs (1.4.4)
-    minitest (5.14.4)
+    diff-lcs (1.5.0)
+    minitest (5.15.0)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     power_assert (2.0.1)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    rake-compiler (1.1.1)
+    rake-compiler (1.1.7)
       rake
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -27,25 +27,25 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
-    rubocop (1.22.3)
+    rubocop (1.24.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.13.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
-    rubocop-performance (1.11.5)
+    rubocop-performance (1.13.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    standard (1.4.0)
-      rubocop (= 1.22.3)
-      rubocop-performance (= 1.11.5)
-    test-unit (3.5.1)
+    standard (1.6.0)
+      rubocop (= 1.24.1)
+      rubocop-performance (= 1.13.1)
+    test-unit (3.5.3)
       power_assert
     unicode-display_width (2.1.0)
 
@@ -66,4 +66,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.3.3
+   2.3.6
diff --git a/tool/bundler/test_gems.rb.lock b/tool/bundler/test_gems.rb.lock
index 8a06010025..bc3c56b824 100644
--- a/tool/bundler/test_gems.rb.lock
+++ b/tool/bundler/test_gems.rb.lock
@@ -41,4 +41,4 @@ DEPENDENCIES
   webrick (= 1.7.0)
 
 BUNDLED WITH
-   2.3.3
+   2.3.6
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 18771085b5..ca5283d2c3 100755
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -101,6 +101,7 @@ def sync_default_gems(gem)
     File.write("lib/bundler/bundler.gemspec", gemspec_content)
 
     cp_r("#{upstream}/bundler/spec", "spec/bundler")
+    cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/dev_gems*"), "tool/bundler")
     cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/test_gems*"), "tool/bundler")
     cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/rubocop_gems*"), "tool/bundler")
     cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/standard_gems*"), "tool/bundler")