Merge pull request #2211 from miguelfrde/java-7

Update from Java6 to Java7

Casks/java.rb

@@ -1,8 +1,12 @@
 class Java < Cask
-  url 'http://support.apple.com/downloads/DL1572/en_US/JavaForOSX2013-05.dmg'
-  homepage 'http://support.apple.com/downloads/DL1572'
-  version '1.6.0_65'
-  sha1 'ce78f9a916b91ec408c933bd0bde5973ca8a2dc4'
-  install 'JavaForOSX.pkg'
-  uninstall :pkgutil => 'com.apple.pkg.JavaForMacOSX107'
+  url 'http://download.oracle.com/otn-pub/java/jdk/7u45-b18/jdk-7u45-macosx-x64.dmg',
+      :cookies => { 's_nr' => '1388004420389',
+                    's_cc' => 'true',
+                    'gpw_e24' => 'http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk7-downloads-1880260.html',
+                    's_sq' => '%5B%5BB%5D%5D' }
+  homepage 'http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html'
+  version '1.7.0_45'
+  sha1 'aa1bbf29decda9a6877f0279510cd50eabba68c1'
+  install 'JDK 7 Update 45.pkg'
+  uninstall :files => '/Library/Java/JavaVirtualMachines/jdk1.7.0_45.jdk/'
 end