Merge branch 'testing' into ci-auto-update-18.12.12

README.md

@@ -20,6 +20,7 @@ Apache OFBiz is an open source product for the automation of enterprise processe
 
 
 **Shipped version:** 18.12.12~ynh1
+
 ## Documentation and resources
 
 - Official app website: <https://ofbiz.apache.org>

README_eu.md

@@ -20,6 +20,7 @@ Apache OFBiz is an open source product for the automation of enterprise processe
 
 
 **Paketatutako bertsioa:** 18.12.12~ynh1
+
 ## Dokumentazioa eta baliabideak
 
 - Aplikazioaren webgune ofiziala: <https://ofbiz.apache.org>

README_fr.md

@@ -20,6 +20,7 @@ Apache OFBiz is an open source product for the automation of enterprise processe
 
 
 **Version incluse :** 18.12.12~ynh1
+
 ## Documentations et ressources
 
 - Site officiel de l’app : <https://ofbiz.apache.org>

README_gl.md

@@ -20,6 +20,7 @@ Apache OFBiz is an open source product for the automation of enterprise processe
 
 
 **Versión proporcionada:** 18.12.12~ynh1
+
 ## Documentación e recursos
 
 - Web oficial da app: <https://ofbiz.apache.org>

README_zh_Hans.md

@@ -20,6 +20,7 @@ Apache OFBiz is an open source product for the automation of enterprise processe
 
 
 **分发版本：** 18.12.12~ynh1
+
 ## 文档与资源
 
 - 官方应用网站： <https://ofbiz.apache.org>

manifest.toml

@@ -51,7 +51,14 @@ ram.runtime = "50M"
     main.allowed = "admins"
 
     [resources.apt]
-    packages = ["openjdk-11-jdk", "postgresql"]
-
+    packages = [ "postgresql"]
+    packages_from_raw_bash = """
+    if [[ $YNH_DEBIAN_VERSION == "bullseye" ]]; then
+        echo "openjdk-11-jre";
+    elif [[ $YNH_DEBIAN_VERSION == "bookworm" ]]; then
+        echo "openjdk-17-jre";
+    fi
+    """
+    
     [resources.database]
     type = "postgresql"