fixes bug with logic for SAR

Author: David O'Sullivan

lib/java_buildpack/framework/java_cf_env.rb

@@ -41,7 +41,8 @@ def compile
       # (see JavaBuildpack::Component::BaseComponent#release)
       def release
         @droplet.additional_libraries << (@droplet.sandbox + jar_name)
-        @droplet.environment_variables.add_environment_variable 'SPRING_PROFILES_INCLUDE', 'cloud'
+        @droplet.environment_variables.add_environment_variable \
+          'SPRING_PROFILES_INCLUDE', '$SPRING_PROFILES_INCLUDE,cloud'
       end
 
       protected

lib/java_buildpack/framework/spring_auto_reconfiguration.rb

@@ -33,6 +33,7 @@ def initialize(context)
       # (see JavaBuildpack::Component::BaseComponent#compile)
       def compile
         log_warning_scc_manual if spring_cloud_connectors?
+        return if java_cf_env_framework?
 
         download_jar
         @droplet.additional_libraries << (@droplet.sandbox + jar_name)
@@ -42,6 +43,8 @@ def compile
 
       # (see JavaBuildpack::Component::BaseComponent#release)
       def release
+        return if java_cf_env_framework?
+
         @droplet.additional_libraries << (@droplet.sandbox + jar_name)
       end
 
@@ -59,8 +62,12 @@ def spring?
       end
 
       def java_cfenv?
-        (@droplet.root + '**/*java-cfenv*.jar').glob.any? || @droplet.additional_libraries.any? do |additional_library|
-          additional_library.instance_variable_get(:@pathname).fnmatch?('*java-cfenv*.jar')
+        (@droplet.root + '**/*java-cfenv*.jar').glob.any? || java_cf_env_framework?
+      end
+
+      def java_cf_env_framework?
+        @droplet.additional_libraries.any? do |additional_library|
+          additional_library.instance_variable_get(:@pathname).fnmatch?('*java_cf_env*.jar')
         end
       end
 

spec/java_buildpack/framework/java_cfenv_spec.rb

@@ -79,6 +79,6 @@
 
     component.release
 
-    expect(environment_variables).to include('SPRING_PROFILES_INCLUDE=cloud')
+    expect(environment_variables).to include('SPRING_PROFILES_INCLUDE=$SPRING_PROFILES_INCLUDE,cloud')
   end
 end

spec/java_buildpack/framework/spring_auto_reconfiguration_spec.rb

@@ -107,11 +107,11 @@
   context('when java-cfenv injects its lib') do
 
     before do
-      additional_libraries.insert 0, additional_libs_directory + 'stub-java-cfenv.jar'
+      additional_libraries.insert 0, additional_libs_directory + 'java_cf_env.jar'
     end
 
     after do
-      additional_libraries.delete additional_libs_directory + 'stub-java-cfenv.jar'
+      additional_libraries.delete additional_libs_directory + 'java_cf_env.jar'
     end
 
     it 'does not detect with Spring JAR and injected cfenv',