From 16b96dd432918b68bcdd1dbef4c8b9ad2f8066dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Nov 2022 23:13:44 +0000
Subject: [PATCH] Bump sinatra and sinatra-contrib

Bumps [sinatra](https://github.com/sinatra/sinatra) and [sinatra-contrib](https://github.com/sinatra/sinatra). These dependencies needed to be updated together.

Updates `sinatra` from 1.4.8 to 3.0.3
- [Release notes](https://github.com/sinatra/sinatra/releases)
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sinatra/sinatra/compare/v1.4.8...v3.0.3)

Updates `sinatra-contrib` from 1.4.7 to 3.0.3
- [Release notes](https://github.com/sinatra/sinatra/releases)
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sinatra/sinatra/compare/v1.4.7...v3.0.3)

---
updated-dependencies:
- dependency-name: sinatra
  dependency-type: direct:production
- dependency-name: sinatra-contrib
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |  4 ++--
 Gemfile.lock | 45 +++++++++++++++++++++++++++------------------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4245bddc0..e31c8a3e6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,9 +10,9 @@ gem 'oj', '~> 2.0'
 gem 'parseconfig'
 gem 'rack'
 gem 'rake', '~> 10.0'
-gem 'sinatra', '~> 1.0'
+gem 'sinatra', '~> 3.0'
 gem 'sinatra-advanced-routes'
-gem 'sinatra-contrib', '~> 1.0'
+gem 'sinatra-contrib', '~> 3.0'
 
 # Rack middleware
 gem 'ffi'
diff --git a/Gemfile.lock b/Gemfile.lock
index bd866e2b9..b719313f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -209,8 +209,12 @@ GEM
     minitest-stub_any_instance (1.0.3)
     mlanett-redis-lock (0.2.7)
       redis
+    monkey-lib (0.4.2)
+      backports
     multi_json (1.15.0)
     multipart-post (2.2.3)
+    mustermann (3.0.0)
+      ruby2_keywords (~> 0.0.1)
     net-http-persistent (2.9.4)
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
@@ -228,18 +232,18 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.0)
-    rack (1.6.13)
+    rack (2.2.4)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
     rack-cache (1.13.0)
       rack (>= 0.4)
-    rack-cors (1.0.6)
-      rack (>= 1.6.0)
+    rack-cors (1.1.1)
+      rack (>= 2.0.0)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
-    rack-protection (1.5.5)
+    rack-protection (3.0.3)
       rack
     rack-test (2.0.2)
       rack (>= 1.3)
@@ -291,19 +295,24 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-advanced-routes (0.5.3)
-      sinatra (~> 1.0)
-    sinatra-contrib (1.4.7)
-      backports (>= 2.0)
+    sinatra (3.0.3)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.0.3)
+      tilt (~> 2.0)
+    sinatra-advanced-routes (0.4.1)
+      monkey-lib (~> 0.4.0)
+      sinatra (>= 0.9.4)
+      sinatra-sugar (~> 0.4.0)
+    sinatra-contrib (3.0.3)
       multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
+      mustermann (~> 3.0)
+      rack-protection (= 3.0.3)
+      sinatra (= 3.0.3)
+      tilt (~> 2.0)
+    sinatra-sugar (0.4.1)
+      monkey-lib (~> 0.4.0)
+      sinatra (>= 0.9.4)
     sshkit (1.21.3)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
@@ -374,9 +383,9 @@ DEPENDENCIES
   shotgun!
   simplecov
   simplecov-cobertura
-  sinatra (~> 1.0)
+  sinatra (~> 3.0)
   sinatra-advanced-routes
-  sinatra-contrib (~> 1.0)
+  sinatra-contrib (~> 3.0)
   sparql-client!
   unicorn
   unicorn-worker-killer