Bug Fixing

Apparently I wasn't nearly as clever as I'd thought and my removal of
JAVA_OPTS was a bit too aggressive.  This change cleans things up so that all
containers will work.

Author: nebhale

lib/java_buildpack/container/dist_zip_like.rb

@@ -39,6 +39,8 @@ def compile
 
       # (see JavaBuildpack::Component::BaseComponent#release)
       def release
+        @droplet.environment_variables.add_environment_variable 'JAVA_OPTS', '$JAVA_OPTS'
+
         [
           @droplet.environment_variables.as_env_vars,
           @droplet.java_home.as_env_var,

lib/java_buildpack/container/groovy.rb

@@ -49,6 +49,7 @@ def compile
 
       # (see JavaBuildpack::Component::BaseComponent#release)
       def release
+        @droplet.environment_variables.add_environment_variable 'JAVA_OPTS', '$JAVA_OPTS'
         add_libs
 
         [

lib/java_buildpack/container/spring_boot_cli.rb

@@ -44,7 +44,9 @@ def compile
 
       # (see JavaBuildpack::Component::BaseComponent#release)
       def release
-        @droplet.environment_variables.add_environment_variable 'SERVER_PORT', '$PORT'
+        @droplet.environment_variables
+                .add_environment_variable('JAVA_OPTS', '$JAVA_OPTS')
+                .add_environment_variable('SERVER_PORT', '$PORT')
 
         [
           @droplet.environment_variables.as_env_vars,

lib/java_buildpack/container/tomcat.rb

@@ -34,6 +34,7 @@ class Tomcat < JavaBuildpack::Component::ModularComponent
 
       # (see JavaBuildpack::Component::ModularComponent#command)
       def command
+        @droplet.environment_variables.add_environment_variable 'JAVA_OPTS', '$JAVA_OPTS'
         @droplet.java_opts.add_system_property 'http.port', '$PORT'
 
         [

spec/java_buildpack/container/dist_zip_like_spec.rb

@@ -50,7 +50,8 @@
   it 'returns command',
      app_fixture: 'container_dist_zip' do
 
-    expect(component.release).to eq("test-var-2 test-var-1 #{java_home.as_env_var} exec $PWD/bin/application")
+    expect(component.release).to eq("test-var-2 test-var-1 JAVA_OPTS=$JAVA_OPTS #{java_home.as_env_var} exec " \
+                                    '$PWD/bin/application')
   end
 
 end

spec/java_buildpack/container/groovy_spec.rb

@@ -90,7 +90,7 @@
   it 'returns command',
      app_fixture: 'container_groovy_main_method' do
 
-    expect(component.release).to eq("#{env_vars_str} #{java_home.as_env_var} exec " \
+    expect(component.release).to eq("test-var-2 test-var-1 JAVA_OPTS=$JAVA_OPTS #{java_home.as_env_var} exec " \
                                     '$PWD/.java-buildpack/groovy/bin/groovy -cp $PWD/.additional_libs/test-jar-1.jar:' \
                                     '$PWD/.additional_libs/test-jar-2.jar Application.groovy Alpha.groovy ' \
                                     'directory/Beta.groovy invalid.groovy')
@@ -99,18 +99,10 @@
   it 'returns command with included JARs',
      app_fixture: 'container_groovy_with_jars' do
 
-    expect(component.release).to eq("#{env_vars_str} #{java_home.as_env_var} exec " \
+    expect(component.release).to eq("test-var-2 test-var-1 JAVA_OPTS=$JAVA_OPTS #{java_home.as_env_var} exec " \
                                     '$PWD/.java-buildpack/groovy/bin/groovy -cp $PWD/.additional_libs/test-jar-1.jar:' \
                                     '$PWD/.additional_libs/test-jar-2.jar:$PWD/Alpha.jar:$PWD/directory/Beta.jar ' \
                                     'Application.groovy invalid.groovy')
   end
 
-  def env_vars_str
-    environment_variables.join(' ')
-  end
-
-  def java_opts_str
-    "\"#{java_opts.join(' ')}\""
-  end
-
 end

spec/java_buildpack/container/ratpack_spec.rb

@@ -68,7 +68,8 @@
   it 'returns command',
      app_fixture: 'container_ratpack_staged' do
 
-    expect(component.release).to eq("test-var-2 test-var-1 #{java_home.as_env_var} exec $PWD/bin/application")
+    expect(component.release).to eq("test-var-2 test-var-1 JAVA_OPTS=$JAVA_OPTS #{java_home.as_env_var} exec " \
+                                    '$PWD/bin/application')
   end
 
 end

spec/java_buildpack/container/tomcat_spec.rb

@@ -85,7 +85,7 @@
   end
 
   it 'returns command' do
-    expect(component.command).to eq("test-var-2 test-var-1 #{java_home.as_env_var} exec " \
+    expect(component.command).to eq("test-var-2 test-var-1 JAVA_OPTS=$JAVA_OPTS #{java_home.as_env_var} exec " \
                                     '$PWD/.java-buildpack/tomcat/bin/catalina.sh run')
   end