Skip to content

Commit eb6e892

Browse files
nebhalenebhale
committed
Merge 108647188-java-opts-java-main to master
[Completes #108647188]
2 parents e3eb196 + 4fdf10a commit eb6e892

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

‎lib/java_buildpack/container/java_main.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ def release_text
6060
@droplet.java_opts.as_env_var,
6161
'&&',
6262
@droplet.environment_variables.as_env_vars,
63+
'eval',
6364
"#{qualify_path @droplet.java_home.root, @droplet.root}/bin/java",
6465
'$JAVA_OPTS',
6566
@droplet.additional_libraries.as_classpath,

‎spec/java_buildpack/container/java_main_spec.rb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
it 'returns command' do
6161

6262
expect(component.release).to eq('JAVA_OPTS="test-opt-2 test-opt-1" && test-var-2 test-var-1 ' \
63-
"#{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS " \
63+
"eval #{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS " \
6464
'-cp $PWD/.:$PWD/.additional_libs/test-jar-1.jar:$PWD/' \
6565
'.additional_libs/test-jar-2.jar test-java-main-class')
6666
end
@@ -70,7 +70,7 @@
7070
app_fixture: 'container_main' do
7171

7272
expect(component.release).to eq('JAVA_OPTS="test-opt-2 test-opt-1" && test-var-2 test-var-1 ' \
73-
"#{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS " \
73+
"eval #{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS " \
7474
'-cp $PWD/.:$PWD/.additional_libs/test-jar-1.jar:$PWD/' \
7575
'.additional_libs/test-jar-2.jar:$PWD/alpha.jar:$PWD/bravo.jar:$PWD/' \
7676
'charlie.jar test-main-class')
@@ -82,7 +82,7 @@
8282
it 'returns command line arguments when they are specified' do
8383

8484
expect(component.release).to eq('JAVA_OPTS="test-opt-2 test-opt-1" && test-var-2 test-var-1 ' \
85-
"#{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS " \
85+
"eval #{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS " \
8686
'-cp $PWD/.:$PWD/.additional_libs/test-jar-1.jar:$PWD/.additional_libs/' \
8787
'test-jar-2.jar test-java-main-class some arguments')
8888
end
@@ -92,7 +92,7 @@
9292
app_fixture: 'container_main_spring_boot_jar_launcher' do
9393

9494
expect(component.release).to eq('JAVA_OPTS="test-opt-2 test-opt-1" && test-var-2 test-var-1 SERVER_PORT=$PORT ' \
95-
"#{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS -cp $PWD" \
95+
"eval #{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS -cp $PWD" \
9696
'/.:$PWD/.additional_libs/test-jar-1.jar:$PWD/.additional_libs/test-jar-2.jar' \
9797
' org.springframework.boot.loader.JarLauncher')
9898
end
@@ -101,7 +101,7 @@
101101
app_fixture: 'container_main_spring_boot_war_launcher' do
102102

103103
expect(component.release).to eq('JAVA_OPTS="test-opt-2 test-opt-1" && test-var-2 test-var-1 SERVER_PORT=$PORT ' \
104-
"#{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS -cp $PWD" \
104+
"eval #{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS -cp $PWD" \
105105
'/.:$PWD/.additional_libs/test-jar-1.jar:$PWD/.additional_libs/test-jar-2.jar' \
106106
' org.springframework.boot.loader.WarLauncher')
107107
end
@@ -110,7 +110,7 @@
110110
app_fixture: 'container_main_spring_boot_properties_launcher' do
111111

112112
expect(component.release).to eq('JAVA_OPTS="test-opt-2 test-opt-1" && test-var-2 test-var-1 SERVER_PORT=$PORT ' \
113-
"#{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS -cp $PWD" \
113+
"eval #{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS -cp $PWD" \
114114
'/.:$PWD/.additional_libs/test-jar-1.jar:$PWD/.additional_libs/test-jar-2.jar' \
115115
' org.springframework.boot.loader.PropertiesLauncher')
116116
end
@@ -121,7 +121,7 @@
121121
it 'releases Spring boot applications with a JarLauncher in the configuration by specifying a port' do
122122

123123
expect(component.release).to eq('JAVA_OPTS="test-opt-2 test-opt-1" && test-var-2 test-var-1 SERVER_PORT=$PORT ' \
124-
"#{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS -cp " \
124+
"eval #{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS -cp " \
125125
'$PWD/.:$PWD/.additional_libs/test-jar-1.jar:$PWD/.additional_libs/' \
126126
'test-jar-2.jar org.springframework.boot.loader.JarLauncher')
127127
end
@@ -133,7 +133,7 @@
133133
it 'releases Spring boot applications with a WarLauncher in the configuration by specifying a port' do
134134

135135
expect(component.release).to eq('JAVA_OPTS="test-opt-2 test-opt-1" && test-var-2 test-var-1 SERVER_PORT=$PORT ' \
136-
"#{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS -cp " \
136+
"eval #{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS -cp " \
137137
'$PWD/.:$PWD/.additional_libs/test-jar-1.jar:$PWD/.additional_libs/' \
138138
'test-jar-2.jar org.springframework.boot.loader.WarLauncher')
139139
end
@@ -145,7 +145,7 @@
145145
it 'releases Spring boot applications with a PropertiesLauncher in the configuration by specifying a port' do
146146

147147
expect(component.release).to eq('JAVA_OPTS="test-opt-2 test-opt-1" && test-var-2 test-var-1 SERVER_PORT=$PORT ' \
148-
"#{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS " \
148+
"eval #{qualify_path java_home.root, droplet.root}/bin/java $JAVA_OPTS " \
149149
'-cp $PWD/.:$PWD/.additional_libs/test-jar-1.jar:$PWD/.additional_libs' \
150150
'/test-jar-2.jar org.springframework.boot.loader.' \
151151
'PropertiesLauncher')

0 commit comments

Comments
 (0)