From 1b1cf0ef75f86ff5a595facff6cfe35a24de03ea Mon Sep 17 00:00:00 2001
From: Hongchol Sinn <hsinn@vmware.com>
Date: Wed, 4 Oct 2023 12:50:37 -0700
Subject: [PATCH] bump: Java version to 11

- Update JDK version references

[#184142402]

Co-authored-by: Danny Faught <dfaught@vmware.com>
---
 jobs/credhub/spec                                  | 2 +-
 jobs/credhub/templates/bpm.yml.erb                 | 2 +-
 jobs/credhub/templates/credhub.erb                 | 2 +-
 jobs/credhub/templates/ctl.erb                     | 2 +-
 jobs/credhub/templates/init_key_stores.erb         | 2 +-
 jobs/credhub/templates/pre-start.erb               | 2 +-
 packages/credhub/spec                              | 2 +-
 packages/openjdk_1.8.0/spec                        | 5 -----
 packages/{openjdk_1.8.0 => openjdk_11.0}/packaging | 2 +-
 packages/openjdk_11.0/spec                         | 5 +++++
 10 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 packages/openjdk_1.8.0/spec
 rename packages/{openjdk_1.8.0 => openjdk_11.0}/packaging (75%)
 create mode 100644 packages/openjdk_11.0/spec

diff --git a/jobs/credhub/spec b/jobs/credhub/spec
index a6f4f2b2..56bf3d8a 100644
--- a/jobs/credhub/spec
+++ b/jobs/credhub/spec
@@ -52,7 +52,7 @@ templates:
 
 
 packages:
-- openjdk_1.8.0
+- openjdk_11.0
 - luna-hsm-client-7.4
 - credhub
 
diff --git a/jobs/credhub/templates/bpm.yml.erb b/jobs/credhub/templates/bpm.yml.erb
index 61927571..c01412f6 100644
--- a/jobs/credhub/templates/bpm.yml.erb
+++ b/jobs/credhub/templates/bpm.yml.erb
@@ -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' => [
diff --git a/jobs/credhub/templates/credhub.erb b/jobs/credhub/templates/credhub.erb
index ae591941..e57dff77 100644
--- a/jobs/credhub/templates/credhub.erb
+++ b/jobs/credhub/templates/credhub.erb
@@ -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
 
diff --git a/jobs/credhub/templates/ctl.erb b/jobs/credhub/templates/ctl.erb
index 127b3661..cd0c0bcd 100644
--- a/jobs/credhub/templates/ctl.erb
+++ b/jobs/credhub/templates/ctl.erb
@@ -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
diff --git a/jobs/credhub/templates/init_key_stores.erb b/jobs/credhub/templates/init_key_stores.erb
index ff0e01b7..d0fce9b1 100644
--- a/jobs/credhub/templates/init_key_stores.erb
+++ b/jobs/credhub/templates/init_key_stores.erb
@@ -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() {
diff --git a/jobs/credhub/templates/pre-start.erb b/jobs/credhub/templates/pre-start.erb
index aa25f8e7..4bb47bdf 100644
--- a/jobs/credhub/templates/pre-start.erb
+++ b/jobs/credhub/templates/pre-start.erb
@@ -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/*
diff --git a/packages/credhub/spec b/packages/credhub/spec
index 28be23ab..27ce2e54 100644
--- a/packages/credhub/spec
+++ b/packages/credhub/spec
@@ -1,6 +1,6 @@
 ---
 name: credhub
 dependencies:
-- openjdk_1.8.0
+- openjdk_11.0
 files:
 - credhub/**/*
diff --git a/packages/openjdk_1.8.0/spec b/packages/openjdk_1.8.0/spec
deleted file mode 100644
index 254535a9..00000000
--- a/packages/openjdk_1.8.0/spec
+++ /dev/null
@@ -1,5 +0,0 @@
----
-name: openjdk_1.8.0
-dependencies: []
-files:
-- openjdk_1.8.0/bellsoft-jre*.tar.gz
diff --git a/packages/openjdk_1.8.0/packaging b/packages/openjdk_11.0/packaging
similarity index 75%
rename from packages/openjdk_1.8.0/packaging
rename to packages/openjdk_11.0/packaging
index 42844055..e99dc8a0 100644
--- a/packages/openjdk_1.8.0/packaging
+++ b/packages/openjdk_11.0/packaging
@@ -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
diff --git a/packages/openjdk_11.0/spec b/packages/openjdk_11.0/spec
new file mode 100644
index 00000000..a049c4d4
--- /dev/null
+++ b/packages/openjdk_11.0/spec
@@ -0,0 +1,5 @@
+---
+name: openjdk_11.0
+dependencies: []
+files:
+- openjdk_11.0/bellsoft-jre*.tar.gz