loosening the version constraing on java. upgrading the gemfile

RallySoftware-cookbooks · Feb 11, 2014 · 7f7f0a3 · 7f7f0a3
1 parent 7a783c6
commit 7f7f0a3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 34 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'cookbook-development', :git => 'https://github.com/RallySoftware-cookbooks/cookbook-development'
-gem 'berkshelf', :git => 'https://github.com/berkshelf/berkshelf'
-
 gem 'logrotate'
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,25 +1,24 @@
 GIT
   remote: https://github.com/RallySoftware-cookbooks/cookbook-development
-  revision: f21935b842d4f2be24d5470b60ef16363931b9aa
+  revision: 76d2e7a909c53fd436d28f48316f16c996e20b4f
   specs:
     cookbook-development (0.0.15)
-      berkshelf (= 3.0.0.beta5)
+      berkshelf (= 3.0.0.beta6)
       bundler (~> 1.3)
       chef (~> 11.6)
       chefspec (~> 3.0)
       faraday (= 0.8.9)
       foodcritic (~> 3.0)
-      json (= 1.7.7)
       kitchen-vagrant (~> 0.11)
       rake (~> 10.0)
       test-kitchen
       version (~> 1.0)
 
-GIT
-  remote: https://github.com/berkshelf/berkshelf
-  revision: 5c434dc284fb70d459ed7f73ecbce55b2ecd686b
+GEM
+  remote: https://rubygems.org/
   specs:
-    berkshelf (3.0.0.beta5)
+    addressable (2.3.5)
+    berkshelf (3.0.0.beta6)
       addressable (~> 2.3.4)
       berkshelf-api-client (~> 1.1)
       buff-config (~> 0.2)
@@ -32,11 +31,6 @@ GIT
       ridley (~> 2.3)
       solve (>= 0.8.0)
       thor (~> 0.18.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.5)
     berkshelf-api-client (1.1.1)
       faraday (~> 0.8.5)
     buff-config (0.4.0)
@@ -52,20 +46,20 @@ GEM
     celluloid-io (0.15.0)
       celluloid (>= 0.15.0)
       nio4r (>= 0.5.0)
-    chef (11.8.2)
-      chef-zero (~> 1.6, >= 1.6.2)
+    chef (11.10.0)
+      chef-zero (~> 1.7, >= 1.7.2)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       highline (~> 1.6, >= 1.6.9)
-      json (>= 1.4.4, <= 1.7.7)
+      json (>= 1.4.4, <= 1.8.1)
       mime-types (~> 1.16)
       mixlib-authentication (~> 1.3)
-      mixlib-cli (~> 1.3)
+      mixlib-cli (~> 1.4)
       mixlib-config (~> 2.0)
       mixlib-log (~> 1.3)
-      mixlib-shellout (~> 1.2)
+      mixlib-shellout (~> 1.3)
       net-ssh (~> 2.6)
-      net-ssh-multi (~> 1.1.0)
+      net-ssh-multi (~> 1.1)
       ohai (~> 6.0)
       pry (~> 0.9)
       puma (~> 1.6)
@@ -77,7 +71,7 @@ GEM
       mixlib-log (~> 1.3)
       moneta (< 0.7.0)
       rack
-    chefspec (3.1.4)
+    chefspec (3.2.0)
       chef (~> 11.0)
       fauxhai (~> 2.0)
       i18n (>= 0.6.9, < 1.0.0)
@@ -103,7 +97,7 @@ GEM
     highline (1.6.20)
     i18n (0.6.9)
     ipaddress (0.8.0)
-    json (1.7.7)
+    json (1.8.1)
     kitchen-vagrant (0.14.0)
       test-kitchen (~> 1.0)
     logrotate (1.2.1)
@@ -119,15 +113,15 @@ GEM
     moneta (0.6.0)
     multi_json (1.8.4)
     multipart-post (1.2.0)
-    net-http-persistent (2.9.1)
+    net-http-persistent (2.9.4)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
+    net-ssh (2.8.0)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    net-ssh-multi (1.1)
-      net-ssh (>= 2.1.4)
-      net-ssh-gateway (>= 0.99.0)
+    net-ssh-multi (1.2.0)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
     nio4r (1.0.0)
     nokogiri (1.5.11)
     octokit (2.7.1)
@@ -151,8 +145,8 @@ GEM
     rake (10.1.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    retryable (1.3.4)
-    ridley (2.4.2)
+    retryable (1.3.5)
+    ridley (2.5.0)
       addressable
       buff-config (~> 0.2)
       buff-extensions (~> 0.3)
@@ -174,9 +168,9 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.14.5)
     safe_yaml (0.9.7)
     sawyer (0.5.3)
       addressable (~> 2.3.5)
@@ -205,6 +199,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  berkshelf!
   cookbook-development!
   logrotate
diff --git a/metadata.rb b/metadata.rb
@@ -8,5 +8,5 @@
 
 supports 'centos'
 
-depends 'java', '1.16.2'
+depends 'java', '~>1.16'
 depends 'bluepill'
diff --git a/test/cookbooks/java_service_test/recipes/default.rb b/test/cookbooks/java_service_test/recipes/default.rb
@@ -12,7 +12,7 @@
   content "Main-Class: EchoServer\n"
 end
 
-execute 'jar cvfm server.jar manifest.txt EchoServer.class' do
+execute '/usr/lib/jvm/java-1.6.0/bin/jar cvfm server.jar manifest.txt EchoServer.class' do
   cwd '/root'
 end