Skip to content

Commit cf7c8a7

Browse files
authored
update to json 2.3.1 (#139)
* update json dep to 2.3.x to fix CVE
1 parent 77bf917 commit cf7c8a7

File tree

3 files changed

+54
-61
lines changed

3 files changed

+54
-61
lines changed

Gemfile.lock

+44-55
Original file line numberDiff line numberDiff line change
@@ -3,92 +3,81 @@ PATH
33
specs:
44
launchdarkly-server-sdk (5.8.0)
55
concurrent-ruby (~> 1.0)
6-
json (>= 1.8, < 3)
6+
json (~> 2.3.1)
77
ld-eventsource (= 1.0.3)
88
semantic (~> 1.6)
99

1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
aws-eventstream (1.0.1)
14-
aws-partitions (1.128.0)
15-
aws-sdk-core (3.44.2)
16-
aws-eventstream (~> 1.0)
17-
aws-partitions (~> 1.0)
18-
aws-sigv4 (~> 1.0)
13+
aws-eventstream (1.1.0)
14+
aws-partitions (1.388.0)
15+
aws-sdk-core (3.109.1)
16+
aws-eventstream (~> 1, >= 1.0.2)
17+
aws-partitions (~> 1, >= 1.239.0)
18+
aws-sigv4 (~> 1.1)
1919
jmespath (~> 1.0)
20-
aws-sdk-dynamodb (1.19.0)
21-
aws-sdk-core (~> 3, >= 3.39.0)
22-
aws-sigv4 (~> 1.0)
23-
aws-sigv4 (1.0.3)
24-
codeclimate-test-reporter (0.6.0)
25-
simplecov (>= 0.7.1, < 1.0.0)
26-
concurrent-ruby (1.1.6)
27-
connection_pool (2.2.1)
28-
diff-lcs (1.3)
29-
diplomat (2.0.2)
30-
faraday (~> 0.9)
31-
json
32-
docile (1.1.5)
33-
faraday (0.15.4)
20+
aws-sdk-dynamodb (1.55.0)
21+
aws-sdk-core (~> 3, >= 3.109.0)
22+
aws-sigv4 (~> 1.1)
23+
aws-sigv4 (1.2.2)
24+
aws-eventstream (~> 1, >= 1.0.2)
25+
concurrent-ruby (1.1.7)
26+
connection_pool (2.2.3)
27+
deep_merge (1.2.1)
28+
diff-lcs (1.4.4)
29+
diplomat (2.4.2)
30+
deep_merge (~> 1.0, >= 1.0.1)
31+
faraday (>= 0.9, < 1.1.0)
32+
faraday (0.17.3)
3433
multipart-post (>= 1.2, < 3)
35-
ffi (1.9.25)
36-
ffi (1.9.25-java)
34+
ffi (1.12.0)
3735
hitimes (1.3.1)
38-
hitimes (1.3.1-java)
3936
http_tools (0.4.5)
4037
jmespath (1.4.0)
41-
json (1.8.6)
42-
json (1.8.6-java)
38+
json (2.3.1)
4339
ld-eventsource (1.0.3)
4440
concurrent-ruby (~> 1.0)
4541
http_tools (~> 0.4.5)
4642
socketry (~> 0.5.1)
47-
listen (3.1.5)
48-
rb-fsevent (~> 0.9, >= 0.9.4)
49-
rb-inotify (~> 0.9, >= 0.9.7)
50-
ruby_dep (~> 1.2)
51-
multipart-post (2.0.0)
52-
rb-fsevent (0.10.3)
53-
rb-inotify (0.9.10)
54-
ffi (>= 0.5.0, < 2)
43+
listen (3.2.1)
44+
rb-fsevent (~> 0.10, >= 0.10.3)
45+
rb-inotify (~> 0.9, >= 0.9.10)
46+
multipart-post (2.1.1)
47+
rb-fsevent (0.10.4)
48+
rb-inotify (0.10.1)
49+
ffi (~> 1.0)
5550
redis (3.3.5)
56-
rspec (3.7.0)
57-
rspec-core (~> 3.7.0)
58-
rspec-expectations (~> 3.7.0)
59-
rspec-mocks (~> 3.7.0)
60-
rspec-core (3.7.1)
61-
rspec-support (~> 3.7.0)
62-
rspec-expectations (3.7.0)
51+
rspec (3.9.0)
52+
rspec-core (~> 3.9.0)
53+
rspec-expectations (~> 3.9.0)
54+
rspec-mocks (~> 3.9.0)
55+
rspec-core (3.9.3)
56+
rspec-support (~> 3.9.3)
57+
rspec-expectations (3.9.3)
6358
diff-lcs (>= 1.2.0, < 2.0)
64-
rspec-support (~> 3.7.0)
65-
rspec-mocks (3.7.0)
59+
rspec-support (~> 3.9.0)
60+
rspec-mocks (3.9.1)
6661
diff-lcs (>= 1.2.0, < 2.0)
67-
rspec-support (~> 3.7.0)
68-
rspec-support (3.7.0)
62+
rspec-support (~> 3.9.0)
63+
rspec-support (3.9.4)
6964
rspec_junit_formatter (0.3.0)
7065
rspec-core (>= 2, < 4, != 2.12.0)
71-
ruby_dep (1.5.0)
7266
semantic (1.6.1)
73-
simplecov (0.15.1)
74-
docile (~> 1.1.0)
75-
json (>= 1.8, < 3)
76-
simplecov-html (~> 0.10.0)
77-
simplecov-html (0.10.2)
7867
socketry (0.5.1)
7968
hitimes (~> 1.2)
80-
timecop (0.9.1)
69+
timecop (0.9.2)
8170

8271
PLATFORMS
83-
java
8472
ruby
8573

8674
DEPENDENCIES
8775
aws-sdk-dynamodb (~> 1.18)
88-
bundler (~> 1.7)
89-
codeclimate-test-reporter (~> 0)
76+
bundler (~> 1.17)
9077
connection_pool (>= 2.1.2)
9178
diplomat (>= 2.0.2)
79+
faraday (~> 0.17)
80+
ffi (<= 1.12)
9281
launchdarkly-server-sdk!
9382
listen (~> 3.0)
9483
redis (~> 3.3.5)

launchdarkly-server-sdk.gemspec

+10-3
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,25 @@ Gem::Specification.new do |spec|
2121
spec.require_paths = ["lib"]
2222

2323
spec.add_development_dependency "aws-sdk-dynamodb", "~> 1.18"
24-
spec.add_development_dependency "bundler", "~> 1.7"
24+
spec.add_development_dependency "bundler", "~> 1.17"
2525
spec.add_development_dependency "rspec", "~> 3.2"
26-
spec.add_development_dependency "codeclimate-test-reporter", "~> 0"
2726
spec.add_development_dependency "diplomat", ">= 2.0.2"
2827
spec.add_development_dependency "redis", "~> 3.3.5"
2928
spec.add_development_dependency "connection_pool", ">= 2.1.2"
3029
spec.add_development_dependency "rspec_junit_formatter", "~> 0.3.0"
3130
spec.add_development_dependency "timecop", "~> 0.9.1"
3231
spec.add_development_dependency "listen", "~> 3.0" # see file_data_source.rb
32+
# these are transitive dependencies of listen and consul respectively
33+
# we constrain them here to make sure the ruby 2.2, 2.3, and 2.4 CI
34+
# cases all pass
35+
spec.add_development_dependency "ffi", "<= 1.12" # >1.12 doesnt support ruby 2.2
36+
spec.add_development_dependency "faraday", "~> 0.17" # >=0.18 doesnt support ruby 2.2
3337

34-
spec.add_runtime_dependency "json", [">= 1.8", "< 3"]
3538
spec.add_runtime_dependency "semantic", "~> 1.6"
3639
spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
3740
spec.add_runtime_dependency "ld-eventsource", "1.0.3"
41+
42+
# lock json to 2.3.x as ruby libraries often remove
43+
# support for older ruby versions in minor releases
44+
spec.add_runtime_dependency "json", "~> 2.3.1"
3845
end

spec/spec_helper.rb

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
require "codeclimate-test-reporter"
2-
CodeClimate::TestReporter.start
3-
41
require "ldclient-rb"
52

63
$null_log = ::Logger.new($stdout)

0 commit comments

Comments
 (0)