Merge pull request #96 from airbnb/airbnb/vvassiliouk/require-nokogir…

…i-1.8.2 Require nokogiri ~> 1.8.2 due to vulnerability in libxml2
airbnb · Jul 12, 2018 · 5bbc81c · 5bbc81c
2 parents fd5de6d + ab3723e
commit 5bbc81c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 1.9.3
   - 2.1.2
   - 2.2.4
   - 2.3.1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.12.0
+- Require Nokogiri ~> 1.8.2 due to vulnerability CVE-2017-15412
+- Require ruby version >= 2.1 for Nokogiri compatibility
+
 # 0.11.11
 - Fix set_classic_link issue - vpc_id could be nil or false
 

diff --git a/Gemfile b/Gemfile
@@ -9,4 +9,4 @@ group :test do
   gem 'rake', '~> 10.3.2'
 end
 
-gem 'nokogiri', '< 1.7.0'
+gem 'nokogiri', '~> 1.8.2'
diff --git a/lib/stemcell/version.rb b/lib/stemcell/version.rb
@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.11.11"
+  VERSION = "0.12.0"
 end
diff --git a/stemcell.gemspec b/stemcell.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   # version dependency. lets explicitly include it here. if this becomes
   # no-longer a dependency of chef via chef-zero, then remove it
   s.add_runtime_dependency 'rack', '< 2.0.0'
-  s.add_runtime_dependency 'nokogiri', '< 1.7.0'
+  s.add_runtime_dependency 'nokogiri', '~> 1.8.2'
   s.add_runtime_dependency 'ffi-yajl', '< 2.3.1'
 
   s.add_runtime_dependency 'trollop',    '~> 2.1'
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ sudo: false @@
     language: ruby
     cache: bundler
     rvm:
-      - 1.9.3
       - 2.1.2
       - 2.2.4
       - 2.3.1
@@ Expand Down @@