Merge pull request #1056 from cloudfoundry/java-cfenv-improvement

Improvement to condition to trigger java-cfenv framework

Author: pivotal-david-osullivan

docs/framework-java-cfenv.md

@@ -8,7 +8,7 @@ It also sets the 'cloud' profile for Spring Boot applications, as the Spring Aut
 <table>
   <tr>
     <td><strong>Detection Criterion</strong></td>
-    <td>Existence of a <tt>spring-boot-3*.jar</tt> file in the application directory or a `Spring-Boot-Version: 3.*` manifest entry</td>
+    <td>Existence of a `Spring-Boot-Version: 3.*` manifest entry</td>
     <td>No existing `java-cfenv` library found</td>
   </tr>
   <tr>

lib/java_buildpack/framework/java_cf_env.rb

@@ -53,8 +53,8 @@ def supports?
       private
 
       def spring_boot_3?
-        @spring_boot_utils.is?(@application) && Gem::Version.new((@spring_boot_utils.version @application)).release >=
-          Gem::Version.new('3.0.0')
+        @spring_boot_utils.is?(@application) &&
+        Gem::Version.new((@spring_boot_utils.version_strict @application)).release >= Gem::Version.new('3.0.0')
       end
 
       def java_cfenv?

lib/java_buildpack/util/spring_boot_utils.rb

@@ -87,6 +87,14 @@ def version(application)
           @jar_finder.version(application)
       end
 
+      # The version of Spring Boot used by the application - only considers the MANIFEST entry
+      #
+      # @param [Application] application the application to search
+      # @return [String] the version of Spring Boot used by the application
+      def version_strict(application)
+        JavaBuildpack::Util::JavaMainUtils.manifest(application)[SPRING_BOOT_VERSION]
+      end
+
       private
 
       SPRING_BOOT_LIB = 'Spring-Boot-Lib'

spec/fixtures/framework_java_not_spring_boot3/META-INF/MANIFEST.MF

@@ -0,0 +1,2 @@
+Main-Class: org.springframework.boot.loader.JarLauncher
+

spec/fixtures/framework_java_not_spring_boot3/WEB-INF/lib/spring-boot-3.2.3.RELEASE.jar

@@ -39,6 +39,12 @@
     expect(component.detect).to be_nil
   end
 
+  it 'does not detect with Spring Boot 3 named jar but not Spring Boot 3 Manifest',
+     app_fixture: 'framework_java_not_spring_boot3' do
+
+    expect(component.detect).to be_nil
+  end
+
   it 'does not detect with Spring Boot 3 & java-cfenv present',
      app_fixture: 'framework_java_cf_exists' do