Java 17 is default (#89)

lean-delivery · Nov 12, 2024 · e6b2312 · e6b2312
1 parent eac688d
commit e6b2312
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Requirements
 ------------
 
  - Minimal Version of the ansible for installation: 2.7
- - **Java 8** [![Build Status](https://travis-ci.org/lean-delivery/ansible-role-java.svg?branch=master)](https://travis-ci.org/lean-delivery/ansible-role-java)
+ - **Java 17**
  - **Supported OS**:
    - CentOS
      - 8
@@ -668,7 +668,7 @@ Example Playbook
   roles:
     - role: lean_delivery.java
       java_distribution: openjdk
-      java_major_version: 11
+      java_major_version: 17
       transport: repositories
     - role: lean_delivery.jenkins
 ```

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -13,8 +13,10 @@ jenkins2_home_directory: /var/lib/jenkins
 
 jenkins2_config_java_cmd: ''
 jenkins2_config_java_options: >-
-  -Djava.awt.headless=true -Djenkins.install.runSetupWizard=false
-  -Dmail.smtp.starttls.enable='true' -Dhudson.slaves.WorkspaceList=_
+  -Djava.awt.headless=true
+  -Djenkins.install.runSetupWizard=false
+  -Dmail.smtp.starttls.enable='true'
+  -Dhudson.slaves.WorkspaceList=_
   -Dhudson.security.csrf.DefaultCrumbIssuer.EXCLUDE_SESSION_ID='true'
 
 jenkins2_config_http_port: 8080

diff --git a/molecule/resources/prepare.yml b/molecule/resources/prepare.yml
@@ -3,7 +3,7 @@
   hosts: all
   roles:
     - role: lean_delivery.java
-      java_major_version: 8
+      java_major_version: 17
       java_package: jdk
       transport: repositories
       java_tarball_install: false
diff --git a/playbook.yml b/playbook.yml
@@ -4,7 +4,7 @@
     - role: lean_delivery.java
       java_distribution: zulu
       transport: fallback
-      java_major_version: 11
+      java_major_version: 17
       java_package: jdk
     - role: ansible-role-jenkins
       jenkins2_jcasc_config:

diff --git a/templates/jenkins_system_config/jenkins.service b/templates/jenkins_system_config/jenkins.service
@@ -37,7 +37,7 @@ Environment="JENKINS_WEBROOT=%C/jenkins/war"
 #Environment="JENKINS_LOG=%L/jenkins/jenkins.log"
 
 # The Java home directory. When left empty, JENKINS_OCMD and PATH are consulted.
-#Environment="JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64"
+#Environment="JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64"
 
 # The Java executable. When left empty, JAVA_HOME and PATH are consulted.
 #Environment="JENKINS_JAVA_CMD=/etc/alternatives/java"