Merge 114796139-use-library-from-manifest to master

nebhale · nebhale · commit 54ecf89cd275 · 2016-03-02T10:37:47.000-08:00
[Completes #114796139]
diff --git a/lib/java_buildpack/util/spring_boot_utils.rb b/lib/java_buildpack/util/spring_boot_utils.rb
@@ -43,9 +43,18 @@ def is?(application)
       # @param [Droplet] droplet the droplet to search
       # @return [String] the lib directory of Spring Boot used by the application
       def lib(droplet)
-        return boot_inf_lib_dir(droplet) if boot_inf_lib_dir(droplet).exist?
-        return web_inf_lib_dir(droplet) if web_inf_lib_dir(droplet).exist?
-        return lib_dir(droplet) if lib_dir(droplet).exist?
+        candidate = manifest_lib_dir(droplet)
+        return candidate if candidate && candidate.exist?
+
+        candidate = boot_inf_lib_dir(droplet)
+        return candidate if candidate && candidate.exist?
+
+        candidate = web_inf_lib_dir(droplet)
+        return candidate if candidate && candidate.exist?
+
+        candidate = lib_dir(droplet)
+        return candidate if candidate && candidate.exist?
+
         fail('No lib directory found')
       end
 
@@ -60,14 +69,21 @@ def version(application)
 
       private
 
+      SPRING_BOOT_LIB = 'Spring-Boot-Lib'.freeze
+
       SPRING_BOOT_VERSION = 'Spring-Boot-Version'.freeze
 
-      private_constant :SPRING_BOOT_VERSION
+      private_constant :SPRING_BOOT_LIB, :SPRING_BOOT_VERSION
 
       def boot_inf_lib_dir(droplet)
         droplet.root + 'BOOT-INF/lib'
       end
 
+      def manifest_lib_dir(droplet)
+        value = JavaBuildpack::Util::JavaMainUtils.manifest(droplet)[SPRING_BOOT_LIB]
+        value ? droplet.root + value : nil
+      end
+
       def lib_dir(droplet)
         droplet.root + 'lib'
       end
diff --git a/spec/fixtures/container_main_spring_boot_jar_launcher/META-INF/MANIFEST.MF b/spec/fixtures/container_main_spring_boot_jar_launcher/META-INF/MANIFEST.MF
@@ -1,3 +1,4 @@
+Spring-Boot-Lib: manifest-lib-value/
 Spring-Boot-Version: 1.2.5.RELEASE
 Main-Class: org.springframework.boot.loader.JarLauncher
 
diff --git a/spec/java_buildpack/util/spring_boot_utils_spec.rb b/spec/java_buildpack/util/spring_boot_utils_spec.rb
@@ -83,6 +83,14 @@
     expect(utils.lib(droplet)).to eq(droplet.root + 'lib')
   end
 
+  it 'returns manifest value as lib directory',
+     app_fixture: 'container_main_spring_boot_jar_launcher' do
+
+    FileUtils.mkdir_p(app_dir + 'manifest-lib-value')
+
+    expect(utils.lib(droplet)).to eq(droplet.root + 'manifest-lib-value/')
+  end
+
   it 'fails if there are no lib directories' do
     expect { utils.lib(droplet) }.to raise_error
   end

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+Spring-Boot-Lib: manifest-lib-value/`
`1`	`2`	`Spring-Boot-Version: 1.2.5.RELEASE`
`2`	`3`	`Main-Class: org.springframework.boot.loader.JarLauncher`
`3`	`4`