From ebf908c0836f3400a0cac4c324e65f15f2a86885 Mon Sep 17 00:00:00 2001
From: Jurre Stender <jurre@github.com>
Date: Tue, 12 Jul 2022 11:54:02 +0200
Subject: [PATCH 1/2] Bump bundler from 2.3.13 to 2.3.17

https://github.com/rubygems/rubygems/blob/master/bundler/CHANGELOG.md#2317-june-29-2022
---
 Dockerfile                                     | 2 +-
 bundler/helpers/v2/build                       | 6 +++---
 bundler/lib/dependabot/bundler/helpers.rb      | 2 +-
 bundler/script/ci-test                         | 4 ++--
 bundler/spec/dependabot/bundler/helper_spec.rb | 2 +-
 bundler/spec/spec_helper.rb                    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0589be5b0ee..cf7986150d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -78,7 +78,7 @@ RUN apt-add-repository ppa:brightbox/ruby-ng \
   && apt-get install -y --no-install-recommends ruby2.7 ruby2.7-dev \
   && gem update --system 3.2.20 \
   && gem install bundler -v 1.17.3 --no-document \
-  && gem install bundler -v 2.3.13 --no-document \
+  && gem install bundler -v 2.3.17 --no-document \
   && rm -rf /var/lib/gems/2.7.0/cache/* \
   && rm -rf /var/lib/apt/lists/*
 
diff --git a/bundler/helpers/v2/build b/bundler/helpers/v2/build
index 1cdefbd31b8..b108c55183f 100755
--- a/bundler/helpers/v2/build
+++ b/bundler/helpers/v2/build
@@ -22,6 +22,6 @@ cd "$install_dir"
 
 # NOTE: Sets `BUNDLED WITH` to match the installed v2 version in Gemfile.lock
 # forcing specs and native helpers to run with the same version
-BUNDLER_VERSION=2.3.13 bundle config --local path ".bundle"
-BUNDLER_VERSION=2.3.13 bundle config --local without "test"
-BUNDLER_VERSION=2.3.13 bundle install
+BUNDLER_VERSION=2.3.17 bundle config --local path ".bundle"
+BUNDLER_VERSION=2.3.17 bundle config --local without "test"
+BUNDLER_VERSION=2.3.17 bundle install
diff --git a/bundler/lib/dependabot/bundler/helpers.rb b/bundler/lib/dependabot/bundler/helpers.rb
index 744a611b922..5a77c503635 100644
--- a/bundler/lib/dependabot/bundler/helpers.rb
+++ b/bundler/lib/dependabot/bundler/helpers.rb
@@ -4,7 +4,7 @@ module Dependabot
   module Bundler
     module Helpers
       V1 = "1.17.3"
-      V2 = "2.3.13"
+      V2 = "2.3.17"
       # If we are updating a project with no Gemfile.lock, we default to the
       # newest version we support
       DEFAULT = V2
diff --git a/bundler/script/ci-test b/bundler/script/ci-test
index be409c3529b..082d82a8bd0 100755
--- a/bundler/script/ci-test
+++ b/bundler/script/ci-test
@@ -15,7 +15,7 @@ fi
 
 if [[ "$SUITE_NAME" == "bundler2" ]]; then
   cd helpers/v2 \
-    && BUNDLER_VERSION=2.3.13 bundle install \
-    && BUNDLER_VERSION=2.3.13 bundle exec rspec spec \
+    && BUNDLER_VERSION=2.3.17 bundle install \
+    && BUNDLER_VERSION=2.3.17 bundle exec rspec spec \
     && cd -
 fi
diff --git a/bundler/spec/dependabot/bundler/helper_spec.rb b/bundler/spec/dependabot/bundler/helper_spec.rb
index 60a845defcc..614d3c6597c 100644
--- a/bundler/spec/dependabot/bundler/helper_spec.rb
+++ b/bundler/spec/dependabot/bundler/helper_spec.rb
@@ -41,7 +41,7 @@
   end
 
   let(:v1) { "1.17.3" }
-  let(:v2) { "2.3.13" }
+  let(:v2) { "2.3.17" }
 
   describe "#bundler_version" do
     def described_method(lockfile)
diff --git a/bundler/spec/spec_helper.rb b/bundler/spec/spec_helper.rb
index 7f8f79fd84a..6caa2cf32de 100644
--- a/bundler/spec/spec_helper.rb
+++ b/bundler/spec/spec_helper.rb
@@ -20,7 +20,7 @@ def self.use_bundler_2?
   end
 
   def self.bundler_version
-    use_bundler_2? ? "2.3.13" : "1.17.3"
+    use_bundler_2? ? "2.3.17" : "1.17.3"
   end
 
   def self.bundler_major_version

From afb43903703b4d6639d3013dba8e5ec4f6f22358 Mon Sep 17 00:00:00 2001
From: Jurre Stender <jurre@github.com>
Date: Tue, 12 Jul 2022 13:46:02 +0200
Subject: [PATCH 2/2] Bump rubygems from 3.2.20 to 3.3.17

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cf7986150d7..029e281876a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -76,7 +76,7 @@ ENV PATH="$BUNDLE_BIN:$PATH:$BUNDLE_PATH/bin"
 RUN apt-add-repository ppa:brightbox/ruby-ng \
   && apt-get update \
   && apt-get install -y --no-install-recommends ruby2.7 ruby2.7-dev \
-  && gem update --system 3.2.20 \
+  && gem update --system 3.3.17 \
   && gem install bundler -v 1.17.3 --no-document \
   && gem install bundler -v 2.3.17 --no-document \
   && rm -rf /var/lib/gems/2.7.0/cache/* \