Skip to content

Commit 0a1cec5

Browse files
committed
[doc] Migrate sinatra example to sinatra 3
Validated it works correctly with a prerelease warbler version on Tomcat 9. (cherry picked from commit bf48123)
1 parent 6f182b3 commit 0a1cec5

File tree

2 files changed

+30
-7
lines changed

2 files changed

+30
-7
lines changed

examples/sinatra/Gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ source 'https://rubygems.org'
22

33
gem 'sinatra', '< 4.0'
44
gem 'webrick'
5-
gem "jruby-rack", "~> 1.2"
6-
gem 'rack', '2.2.8'
5+
gem "jruby-rack", "~> 1.2.4"
6+
gem 'rack', '~> 2.2.0'
7+
gem "jruby-jars", "~> 9.4"

examples/sinatra/Gemfile.lock

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,34 @@
11
GEM
2-
remote: http://rubygems.org/
2+
remote: https://rubygems.org/
33
specs:
4-
rack (1.3.3)
5-
sinatra (1.0)
6-
rack (>= 1.0)
4+
base64 (0.3.0)
5+
jruby-jars (9.4.13.0)
6+
jruby-rack (1.2.4)
7+
mustermann (3.0.4)
8+
ruby2_keywords (~> 0.0.1)
9+
rack (2.2.17)
10+
rack-protection (3.2.0)
11+
base64 (>= 0.1.0)
12+
rack (~> 2.2, >= 2.2.4)
13+
ruby2_keywords (0.0.5)
14+
sinatra (3.2.0)
15+
mustermann (~> 3.0)
16+
rack (~> 2.2, >= 2.2.4)
17+
rack-protection (= 3.2.0)
18+
tilt (~> 2.0)
19+
tilt (2.6.1)
20+
webrick (1.9.1)
721

822
PLATFORMS
923
java
24+
x86_64-linux
1025

1126
DEPENDENCIES
12-
sinatra
27+
jruby-jars (~> 9.4)
28+
jruby-rack (~> 1.2.4)
29+
rack (~> 2.2.0)
30+
sinatra (< 4.0)
31+
webrick
32+
33+
BUNDLED WITH
34+
2.6.9

0 commit comments

Comments
 (0)