Spring Boot 1.1.0

Previously, auto-reconfiguration did not work on Spring Boot
applications.  With the upcoming releases of Spring Boot 1.1.0.RELEASE
and Java Buildpack Auto-reconfiguration 1.0.0.RELEASE, this will no
longer be the case.  This change updates the buildpack to work with
Spring Boot 1.1.0.RELEASE and later.

[#49695439]

Author: nebhale

config/spring_boot_cli.yml

@@ -17,5 +17,5 @@
 # Note that the repository is shared with the Play Auto Reconfiguration framework and should be kept in step to
 # avoid conflicts.
 ---
-version: 1.0.0_+
+version: 1.1.+
 repository_root: "{default.repository.root}/spring-boot-cli"

lib/java_buildpack/buildpack.rb

@@ -82,7 +82,7 @@ def release
         'default_process_types' => { 'web' => command }
       }.to_yaml
 
-      @logger.debug { "Release Payload\n#{payload}" }
+      @logger.debug { "Release Payload:\n#{payload}" }
 
       payload
     end

lib/java_buildpack/container/spring_boot_cli.rb

@@ -41,7 +41,6 @@ def initialize(context)
       # (see JavaBuildpack::Component::BaseComponent#compile)
       def compile
         download_tar
-        @droplet.additional_libraries.link_to lib_dir
       end
 
       # (see JavaBuildpack::Component::BaseComponent#release)
@@ -52,6 +51,7 @@ def release
           'SERVER_PORT=$PORT',
           qualify_path(@droplet.sandbox + 'bin/spring', @droplet.root),
           'run',
+          @droplet.additional_libraries.as_classpath,
           relative_groovy_files
         ].flatten.compact.join(' ')
       end
@@ -66,10 +66,6 @@ def supports?
 
       private
 
-      def lib_dir
-        @droplet.sandbox + 'lib'
-      end
-
       def relative_groovy_files
         JavaBuildpack::Util::GroovyUtils.groovy_files(@application).map { |gf| gf.relative_path_from(@application.root) }
       end

lib/java_buildpack/util/spring_boot_utils.rb

@@ -25,7 +25,7 @@ module Util
     class SpringBootUtils < JarFinder
 
       def initialize
-        super(/.*spring-boot-([^-]*)\.jar/)
+        super(/.*spring-boot-([\d].*)\.jar/)
       end
 
     end

spec/java_buildpack/container/spring_boot_cli_spec.rb

@@ -84,31 +84,13 @@
     expect(sandbox + 'bin/spring').to exist
   end
 
-  it 'should link classpath JARs',
-     app_fixture:   'container_spring_boot_cli_valid_app',
-     cache_fixture: 'stub-spring-boot-cli.tar.gz' do
-
-    component.compile
-
-    lib = sandbox + 'lib'
-
-    jar_1 = lib + 'test-jar-1.jar'
-    expect(jar_1).to exist
-    expect(jar_1).to be_symlink
-    expect(jar_1.readlink).to eq((additional_libs_directory + 'test-jar-1.jar').relative_path_from(lib))
-
-    jar_2 = lib + 'test-jar-2.jar'
-    expect(jar_2).to exist
-    expect(jar_2).to be_symlink
-    expect(jar_2.readlink).to eq((additional_libs_directory + 'test-jar-2.jar').relative_path_from(lib))
-  end
-
   it 'should return command',
      app_fixture: 'container_spring_boot_cli_valid_app' do
 
     expect(component.release).to eq("#{java_home.as_env_var} JAVA_OPTS=#{java_opts_str} SERVER_PORT=$PORT " \
-                                      '$PWD/.java-buildpack/spring_boot_cli/bin/spring run directory/pogo_4.groovy ' \
-                                      'invalid.groovy pogo_1.groovy pogo_2.groovy pogo_3.groovy')
+                                      '$PWD/.java-buildpack/spring_boot_cli/bin/spring run ' \
+                                      '-cp $PWD/.additional_libs/test-jar-1.jar:$PWD/.additional_libs/test-jar-2.jar ' \
+                                      'directory/pogo_4.groovy invalid.groovy pogo_1.groovy pogo_2.groovy pogo_3.groovy')
   end
 
   def java_opts_str