Merge pull request travis-ci#489 from travis-ci/ha-bug-puppet-forge

Pin json_pure to '< 2.0'
mattk42 · Aug 2, 2016 · 45fad6e · 45fad6e
2 parents ca2e7d0 + 7d1583f
commit 45fad6e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/dpl/provider/appfog.rb b/lib/dpl/provider/appfog.rb
@@ -1,7 +1,7 @@
 module DPL
   class Provider
     class Appfog < Provider
-      requires 'json_pure', :load => 'json/pure'
+      requires 'json_pure', :version => '< 2.0', :load => 'json/pure'
       requires 'af', :load => 'vmc'
 
       def check_auth

diff --git a/lib/dpl/provider/packagecloud.rb b/lib/dpl/provider/packagecloud.rb
@@ -1,7 +1,7 @@
 module DPL
   class Provider
     class Packagecloud < Provider
-      requires 'json_pure', :load => 'json/pure'
+      requires 'json_pure', :version => '< 2.0', :load => 'json/pure'
       requires 'packagecloud-ruby', :version => "0.2.17", :load => 'packagecloud'
 
       def check_auth

diff --git a/lib/dpl/provider/puppet_forge.rb b/lib/dpl/provider/puppet_forge.rb
@@ -3,7 +3,7 @@ class Provider
     class PuppetForge < Provider
       require 'pathname'
 
-      requires 'json_pure', :load => 'json/pure'
+      requires 'json_pure', :version => '< 2.0', :load => 'json/pure'
       requires 'puppet', :load => 'puppet/face'
       requires 'puppet-blacksmith', :load => 'puppet_blacksmith'