Merge 114796085-link-boot-inf-lib to master

nebhale · nebhale · commit a87f57f4d374 · 2016-03-01T14:57:34.000-08:00
[Completes #114796085]
diff --git a/lib/java_buildpack/container/java_main.rb b/lib/java_buildpack/container/java_main.rb
@@ -45,9 +45,8 @@ def detect
 
       # (see JavaBuildpack::Component::BaseComponent#compile)
       def compile
-        if @spring_boot_utils.is?(@application)
-          @droplet.additional_libraries.link_to(@spring_boot_utils.lib(@droplet))
-        end
+        return unless @spring_boot_utils.is?(@application)
+        @droplet.additional_libraries.link_to(@spring_boot_utils.lib(@droplet))
       end
 
       # (see JavaBuildpack::Component::BaseComponent#release)
@@ -60,7 +59,8 @@ def release
           @droplet.additional_libraries.insert 0, @application.root
         end
 
-        release_text
+        classpath = @spring_boot_utils.is?(@application) ? '-cp $PWD/.' : @droplet.additional_libraries.as_classpath
+        release_text(classpath)
       end
 
       private
@@ -71,29 +71,19 @@ def release
 
       private_constant :ARGUMENTS_PROPERTY, :CLASS_PATH_PROPERTY
 
-      def release_text
-        release = [
+      def release_text(classpath)
+        [
           @droplet.java_opts.as_env_var,
           '&&',
           @droplet.environment_variables.as_env_vars,
           'eval',
           'exec',
           "#{qualify_path @droplet.java_home.root, @droplet.root}/bin/java",
-          '$JAVA_OPTS'
-        ]
-
-        if @spring_boot_utils.is?(@application)
-          release << '-cp $PWD/.'
-        else
-          release << @droplet.additional_libraries.as_classpath
-        end
-
-        release << [
+          '$JAVA_OPTS',
+          classpath,
           main_class,
           arguments
-        ]
-
-        release.flatten.compact.join(' ')
+        ].flatten.compact.join(' ')
       end
 
       def arguments
diff --git a/lib/java_buildpack/util/spring_boot_utils.rb b/lib/java_buildpack/util/spring_boot_utils.rb
@@ -38,7 +38,12 @@ def is?(application)
           @jar_finder.is?(application)
       end
 
+      # The lib directory of Spring Boot used by the 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?
         fail('No lib directory found')
@@ -59,6 +64,10 @@ def version(application)
 
       private_constant :SPRING_BOOT_VERSION
 
+      def boot_inf_lib_dir(droplet)
+        droplet.root + 'BOOT-INF/lib'
+      end
+
       def lib_dir(droplet)
         droplet.root + 'lib'
       end
diff --git a/spec/java_buildpack/util/spring_boot_utils_spec.rb b/spec/java_buildpack/util/spring_boot_utils_spec.rb
@@ -65,6 +65,12 @@
     expect(utils.version(application)).to match(/1.2.5.RELEASE/)
   end
 
+  it 'returns BOOT-INF/lib as lib directory' do
+    FileUtils.mkdir_p(app_dir + 'BOOT-INF/lib')
+
+    expect(utils.lib(droplet)).to eq(droplet.root + 'BOOT-INF/lib')
+  end
+
   it 'returns WEB-INF/lib as lib directory' do
     FileUtils.mkdir_p(app_dir + 'WEB-INF/lib')
 
