Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump: Java version to 11 #159

Merged
merged 1 commit into from
Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jobs/credhub/spec
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ templates:


packages:
- openjdk_1.8.0
- openjdk_11.0
- luna-hsm-client-7.4
- credhub

Expand Down
2 changes: 1 addition & 1 deletion jobs/credhub/templates/bpm.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
'RUN_DIR' => '/var/vcap/data/run/credhub',
'LOG_DIR' => '/var/vcap/sys/log/credhub',
'TMP_DIR' => '/var/vcap/data/credhub',
'JAVA_HOME' => '/var/vcap/packages/openjdk_1.8.0/jre',
'JAVA_HOME' => '/var/vcap/packages/openjdk_11.0/jre',
'MAX_HEAP_SIZE' => p('credhub.max_heap_size')
},
'additional_volumes' => [
Expand Down
2 changes: 1 addition & 1 deletion jobs/credhub/templates/credhub.erb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if p('credhub.data_storage.require_tls') || p('credhub.authentication.uaa.enable
end
%>

export JAVA_HOME='/var/vcap/packages/openjdk_1.8.0/jre'
export JAVA_HOME='/var/vcap/packages/openjdk_11.0/jre'
export PATH="$JAVA_HOME/bin:$PATH"
export JAVA_TOOL_OPTIONS

Expand Down
2 changes: 1 addition & 1 deletion jobs/credhub/templates/ctl.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ declare -r max_heap_size=<%= p('credhub.max_heap_size') %>

source $tmp_dir/var-store

export JAVA_HOME=/var/vcap/packages/openjdk_1.8.0/jre
export JAVA_HOME=/var/vcap/packages/openjdk_11.0/jre
export PATH=$JAVA_HOME/bin:$PATH

LOG_DIR=/var/vcap/sys/log/credhub
Expand Down
2 changes: 1 addition & 1 deletion jobs/credhub/templates/init_key_stores.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail

## BEGIN CERTIFICATE INSTALLATION

export JAVA_HOME=/var/vcap/packages/openjdk_1.8.0/jre
export JAVA_HOME=/var/vcap/packages/openjdk_11.0/jre
declare -r tmp_dir=/var/vcap/jobs/credhub/tmp

function generate_password() {
Expand Down
2 changes: 1 addition & 1 deletion jobs/credhub/templates/pre-start.erb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fail_unless_credhub_port_is_open() {

fail_unless_credhub_port_is_open

export JAVA_HOME=/var/vcap/packages/openjdk_1.8.0/jre
export JAVA_HOME=/var/vcap/packages/openjdk_11.0/jre

chown -R vcap /var/vcap/jobs/credhub/config
chmod -R g-rwx,o-rwx /var/vcap/jobs/credhub/config/*
Expand Down
2 changes: 1 addition & 1 deletion packages/credhub/spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: credhub
dependencies:
- openjdk_1.8.0
- openjdk_11.0
files:
- credhub/**/*
5 changes: 0 additions & 5 deletions packages/openjdk_1.8.0/spec

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set -ex

cd ${BOSH_INSTALL_TARGET}
tar zxvf ${BOSH_COMPILE_TARGET}/openjdk_1.8.0/bellsoft-jre*.tar.gz
tar zxvf ${BOSH_COMPILE_TARGET}/openjdk_11.0/bellsoft-jre*.tar.gz
if [[ $? != 0 ]] ; then
echo "Cannot unpack JRE"
exit 1
Expand Down
5 changes: 5 additions & 0 deletions packages/openjdk_11.0/spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
name: openjdk_11.0
dependencies: []
files:
- openjdk_11.0/bellsoft-jre*.tar.gz