Merge 67329858-delay-version-resolution to master

nebhale · nebhale · commit 7c1355597637 · 2014-03-24T11:40:55.000Z
[Completes #67329858]
diff --git a/java-buildpack.iml b/java-buildpack.iml
@@ -288,7 +288,7 @@
     <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.19.0, rbenv: 1.9.3-p545) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.19.1, rbenv: 1.9.3-p545) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-debug-base19x (v0.11.30.pre15, rbenv: 1.9.3-p545) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-debug-ide (v0.4.22, rbenv: 1.9.3-p545) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.4.2, rbenv: 1.9.3-p545) [gem]" level="application" />
diff --git a/lib/java_buildpack/jre/open_jdk_like.rb b/lib/java_buildpack/jre/open_jdk_like.rb
@@ -29,10 +29,20 @@ class OpenJDKLike < JavaBuildpack::Component::VersionedDependencyComponent
       #
       # @param [Hash] context a collection of utilities used the component
       def initialize(context)
-        super(context)
+        @application    = context[:application]
+        @component_name = self.class.to_s.space_case
+        @configuration  = context[:configuration]
+        @droplet        = context[:droplet]
+
         @droplet.java_home.root = @droplet.sandbox
       end
 
+      # (see JavaBuildpack::Component::BaseComponent#detect)
+      def detect
+        @version, @uri = JavaBuildpack::Repository::ConfiguredItem.find_item(@component_name, @configuration)
+        super
+      end
+
       # (see JavaBuildpack::Component::BaseComponent#compile)
       def compile
         download_tar
@@ -47,13 +57,6 @@ def release
         .concat memory
       end
 
-      protected
-
-      # (see JavaBuildpack::Component::VersionedDependencyComponent#supports?)
-      def supports?
-        true
-      end
-
       private
 
       KEY_MEMORY_HEURISTICS = 'memory_heuristics'.freeze
diff --git a/spec/java_buildpack/jre/open_jdk_jre_spec.rb b/spec/java_buildpack/jre/open_jdk_jre_spec.rb
@@ -38,6 +38,7 @@
   it 'should extract Java from a GZipped TAR',
      cache_fixture: 'stub-java.tar.gz' do
 
+    component.detect
     component.compile
 
     expect(sandbox + 'bin/java').to exist
@@ -50,13 +51,15 @@
   end
 
   it 'should add memory options to java_opts' do
+    component.detect
     component.release
 
     expect(java_opts).to include('opt-1')
     expect(java_opts).to include('opt-2')
   end
 
   it 'adds OnOutOfMemoryError to java_opts' do
+    component.detect
     component.release
 
     expect(java_opts).to include('-XX:OnOutOfMemoryError=$PWD/.java-buildpack/open_jdk_jre/bin/killjava.sh')
@@ -65,12 +68,14 @@
   it 'places the killjava script (with appropriately substituted content) in the diagnostics directory',
      cache_fixture: 'stub-java.tar.gz' do
 
+    component.detect
     component.compile
 
     expect(sandbox + 'bin/killjava.sh').to exist
   end
 
   it 'adds java.io.tmpdir to java_opts' do
+    component.detect
     component.release
 
     expect(java_opts).to include('-Djava.io.tmpdir=$TMPDIR')
diff --git a/spec/java_buildpack/jre/oracle_jre_spec.rb b/spec/java_buildpack/jre/oracle_jre_spec.rb
@@ -38,6 +38,7 @@
   it 'should extract Java from a GZipped TAR',
      cache_fixture: 'stub-java.tar.gz' do
 
+    component.detect
     component.compile
 
     expect(sandbox + 'bin/java').to exist
@@ -50,13 +51,15 @@
   end
 
   it 'should add memory options to java_opts' do
+    component.detect
     component.release
 
     expect(java_opts).to include('opt-1')
     expect(java_opts).to include('opt-2')
   end
 
   it 'adds OnOutOfMemoryError to java_opts' do
+    component.detect
     component.release
 
     expect(java_opts).to include('-XX:OnOutOfMemoryError=$PWD/.java-buildpack/oracle_jre/bin/killjava.sh')
@@ -65,12 +68,14 @@
   it 'places the killjava script (with appropriately substituted content) in the diagnostics directory',
      cache_fixture: 'stub-java.tar.gz' do
 
+    component.detect
     component.compile
 
     expect(sandbox + 'bin/killjava.sh').to exist
   end
 
   it 'adds java.io.tmpdir to java_opts' do
+    component.detect
     component.release
 
     expect(java_opts).to include('-Djava.io.tmpdir=$TMPDIR')
