Add Java 11 Support

Signed-off-by: Ethan Dye <[email protected]>
openhab · May 29, 2020 · 11000b7 · 11000b7
1 parent 66141c0
commit 11000b7
Show file tree

Hide file tree

Showing 9 changed files with 239 additions and 104 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -43,7 +43,7 @@ jobs:
       env: aarch64
       arch: arm64
       script:
-        - sed -i 's/^java_opt=.*/java_opt=Zulu64/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-64/' build-image/openhabian.conf
         - docker build -t openhabian/dev-openhabian -f Dockerfile.openhabian-aarch64-native .
         - docker run -i openhabian/dev-openhabian bash -c '/usr/local/bin/bats -r -f "dev-." .'
         - docker run -i openhabian/dev-openhabian bash -c '/usr/local/bin/bats -r -f "unit-." .'
@@ -60,7 +60,7 @@ jobs:
       script:
         # 64bit Azul Java native on 64bit x86 on 64bit OS on Travis AMD64 HW
         - export HW=x86
-        - sed -i 's/^java_opt=.*/java_opt=Zulu64/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-64/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-x86 .
         - echo -e "\n\e[36mopenHABian test installation 64bit Azul Enterprise Java on virtual $HW ...\n"
         - docker run --name "openhabian-${HW}" -d openhabian/${HW}-openhabian;
@@ -70,7 +70,7 @@ jobs:
       script:
         # 32bit Azul Java on 32bit ARMv6hf (RPi0(W) and RPi1) on 32bit OS on Travis Arm64 HW
         - export HW=rpi01
-        - sed -i 's/^java_opt=.*/java_opt=Zulu32/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-32/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-ARMv6hf-native .
         - echo -e "\n\e[36mopenHABian test installation 32bit Azul Embedded Java on virtual $HW ...\n"
         - docker run --name "openhabian-${HW}" -d openhabian/${HW}-openhabian;
@@ -80,7 +80,7 @@ jobs:
       script:
         # 32bit Azul Java on 32bit ARMv7l (RPi2) on 32bit OS on Travis Arm64 HW
         - export HW=rpi2
-        - sed -i 's/^java_opt=.*/java_opt=Zulu32/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-32/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-arm32hf-native .
         - echo -e "\n\e[36mopenHABian test installation 32bit Azul Embedded Java on virtual $HW ...\n"
         - docker run --memory="1g" --memory-reservation="1g" --name "openhabian-${HW}" -d openhabian/${HW}-openhabian
@@ -90,7 +90,7 @@ jobs:
       script:
         # 32bit Azul Java on 64bit ARMv8 (CM3, RPi3) on 32bit OS on Travis Arm64 HW
         - export HW=cm3
-        - sed -i 's/^java_opt=.*/java_opt=Zulu32/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-32/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-arm32hf-CM3 .
         - echo -e "\n\e[36mopenHABian test installation 32bit Azul Embedded Java on virtual $HW ...\n"
         - docker run --memory="1g" --memory-reservation="1g" --name "openhabian-${HW}" -d openhabian/${HW}-openhabian;
@@ -101,7 +101,7 @@ jobs:
         # 64bit Azul Java on 32bit ARMv8 (RPi3, CM3) on 32bit OS on Travis Arm64 HW
         # This is known to not work - openHABian is supposed to downgrade to 32bit on install.
         - export HW=rpi3
-        - sed -i 's/^java_opt=.*/java_opt=Zulu64/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-64/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-arm32hf-native .
         - echo -e "\n\e[36mopenHABian test installation 64bit Azul Embedded Java on virtual $HW ..."
         - echo -e "\e[31m ** This is known to not work. openHABian is supposed to force install down to 32bit **\n"
@@ -113,7 +113,7 @@ jobs:
         # 64bit Azul Java on 64bit ARMv8 (RPi3,4) on 32bit OS on Travis Arm64 HW
         # This is known to not work - openHABian is supposed to downgrade to 32bit on install.
         - export HW=rpi3
-        - sed -i 's/^java_opt=.*/java_opt=Zulu64/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-64/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-aarch64-native .
         - echo -e "\n\e[36mopenHABian test installation 64bit Azul Embedded Java on virtual $HW ..."
         - echo -e "\e[31m ** This is known to not work. openHABian is supposed to force install down to 32bit **\n"
@@ -124,7 +124,7 @@ jobs:
       script:
         # 64bit Azul Java on 64bit ARMv8 (RPi3,4) on 64bit OS on Travis Arm64 HW
         - export HW=rpi4
-        - sed -i 's/^java_opt=.*/java_opt=Zulu64/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-64/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-aarch64-64bit .
         - echo -e "\n\e[36mopenHABian test installation 64bit Azul Embedded Java \e[31m on 64bit OS\e[36m on virtual $HW ...\n"
         - docker run --memory="2G" --memory-reservation="2G" --name "openhabian-${HW}" -d openhabian/${HW}-openhabian;

diff --git a/build-image/openhabian.conf b/build-image/openhabian.conf
@@ -52,7 +52,7 @@ mode=unattended
 #release=buster
 
 # Java architecture mode
-# Valid arguments: "AdoptOpenJDK", "Zulu32", or "Zulu64"
-java_opt=Zulu32
+# Valid arguments: "AdoptOpenJDK", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
+java_opt=Zulu8-32
 
 # vim: filetype=sh
diff --git a/build-image/openhabian.pi-raspbian.conf b/build-image/openhabian.pi-raspbian.conf
@@ -52,7 +52,7 @@ mode=unattended
 #release=buster
 
 # Java architecture mode
-# Valid arguments: "AdoptOpenJDK", "Zulu32", or "Zulu64"
-java_opt=Zulu32
+# Valid arguments: "AdoptOpenJDK", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
+java_opt=Zulu8-32
 
 # vim: filetype=sh
diff --git a/build-image/openhabian.pine64-xenial.conf b/build-image/openhabian.pine64-xenial.conf
@@ -26,5 +26,5 @@ wifi_country=""
 # vim: filetype=sh
 
 # Java architecture mode
-# Valid arguments: "AdoptOpenJDK", "Zulu32", or "Zulu64"
-java_opt=Zulu32
+# Valid arguments: "AdoptOpenJDK", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
+java_opt=Zulu8-32
diff --git a/functions/config.bash b/functions/config.bash
@@ -31,16 +31,16 @@ clean_config_userpw() {
 }
 
 ## Update java architecture in config file
-## Valid options: "Zulu32", "Zulu64", "AdoptOpenJDK"
+## Valid arguments: "AdoptOpenJDK", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
 update_config_java() {
-  if [ "$1" == "Zulu64" ]; then
+  if [ "$1" == "Zulu8-64" ] || [ "$1" == "Zulu11-64" ]; then
     if (! is_x86_64 && ! [ "$(getconf LONG_BIT)" == "64" ]) || (! is_aarch64 && ! [ "$(getconf LONG_BIT)" == "64" ]); then
       if [ -n "$INTERACTIVE" ]; then
-        whiptail --title "Incompatible hardware detected" --msgbox "Zulu OpenJDK 64-bit: this option does not currently work on your platform.\\n\\nDefaulting to 32-bit installation." 10 60
+        whiptail --title "Incompatible hardware detected" --msgbox "Zulu OpenJDK 64-bit: this option does not currently work on your platform.\\n\\nDefaulting to Java Zulu 8 32-bit installation." 10 60
       else
-        echo "Zulu OpenJDK 64-bit: this option does not currently work on your platform. Defaulting to 32-bit installation."
+        echo "Zulu OpenJDK 64-bit: this option does not currently work on your platform. Defaulting to Java Zulu 8 32-bit installation."
       fi
-      cond_redirect grep -q '^java_opt' "$CONFIGFILE" && sed -i "s/^java_opt.*/java_opt=Zulu32/" "$CONFIGFILE" || echo "java_opt=Zulu32" >> "$CONFIGFILE"
+      cond_redirect grep -q '^java_opt' "$CONFIGFILE" && sed -i "s/^java_opt.*/java_opt=Zulu8-32/" "$CONFIGFILE" || echo "java_opt=Zulu8-32" >> "$CONFIGFILE"
     fi
   else
     cond_redirect grep -q '^java_opt' "$CONFIGFILE" && sed -i "s/^java_opt.*/java_opt=$1/" "$CONFIGFILE" || echo "java_opt=$1" >> "$CONFIGFILE"