improve consistency and testing (#26)

* fix(requirements): include tomli version in requirements files

* chore(java): update java defaults in README, spec, and default files.

* feat(java): now queries for the latest LTS version of java.

Author: marshallwp

CHANGELOG.rst

@@ -1,4 +1,4 @@
-.. SPDX-FileCopyrightText: 2025 Industrial Info Resources, Inc.
+.. SPDX-FileCopyrightText: 2026 Industrial Info Resources, Inc.
 .. SPDX-FileContributor: William P. Marshall
 ..
 .. SPDX-License-Identifier: GPL-3.0-or-later
@@ -9,6 +9,24 @@ Marshallwp General Collection Release Notes
 
 .. contents:: Topics
 
+v1.5.2
+======
+
+Release Summary
+---------------
+
+Update testing to make Python 3.10 happy and improve java documentation, spec, and default values.
+
+Major Changes
+-------------
+
+- The `java` role now queries `Public APIs for Oracle Java Releases <https://docs.oracle.com/en-us/iaas/jms/doc/public-api-oracle-java-releases.html>`_ for the latest LTS version of Java available. This should help reduce the number of updates this role needs that default up-to-date.
+
+Minor Changes
+-------------
+
+- Requirements files now include an explicit tomli version.
+
 v1.5.1
 ======
 

changelogs/.plugin-cache.yaml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2025 Industrial Info Resources, Inc.
+# SPDX-FileCopyrightText: 2026 Industrial Info Resources, Inc.
 # SPDX-FileContributor: William P. Marshall
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -58,4 +58,4 @@ plugins:
   strategy: {}
   test: {}
   vars: {}
-version: 1.5.1
+version: 1.5.2

changelogs/changelog.yaml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2025 Industrial Info Resources, Inc.
+# SPDX-FileCopyrightText: 2026 Industrial Info Resources, Inc.
 # SPDX-FileContributor: William P. Marshall
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -225,3 +225,16 @@ releases:
     fragments:
       - 24-refactor-toml.yaml
     release_date: '2025-11-20'
+  1.5.2:
+    changes:
+      major_changes:
+        - The `java` role now queries `Public APIs for Oracle Java Releases <https://docs.oracle.com/en-us/iaas/jms/doc/public-api-oracle-java-releases.html>`_
+          for the latest LTS version of Java available. This should help reduce the
+          number of updates this role needs that default up-to-date.
+      minor_changes:
+        - Requirements files now include an explicit tomli version.
+      release_summary: Update testing to make Python 3.10 happy and improve java documentation,
+        spec, and default values.
+    fragments:
+      - 26-improve-consistency-and-testing.yml
+    release_date: '2026-01-23'

galaxy.yml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2025 Industrial Info Resources, Inc. <https://www.industrialinfo.com>
+# SPDX-FileCopyrightText: 2026 Industrial Info Resources, Inc. <https://www.industrialinfo.com>
 # SPDX-FileContributor: William P. Marshall
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -10,7 +10,7 @@
 
 namespace: "marshallwp"
 name: "general"
-version: 1.5.1
+version: 1.5.2
 readme: README.md
 authors:
   - William P. Marshall

requirements.txt

@@ -5,4 +5,4 @@
 
 # add python packages that are required for this collection
 tomli-w >= 1.2.0
-tomli ; python_version < '3.11'
+tomli >= 1.1.0 ; python_version < "3.11"

roles/java/README.md

@@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2025 Industrial Info Resources, Inc. <https://www.industrialinfo.com>
+SPDX-FileCopyrightText: 2026 Industrial Info Resources, Inc. <https://www.industrialinfo.com>
 SPDX-FileContributor: William P. Marshall
 
 SPDX-License-Identifier: GPL-3.0-or-later
@@ -23,7 +23,7 @@ Role Variables
 
 | Name | Description | Default |
 | ---- | ----------- | ------- |
-| java_version | Default Java Version.  Should always be a supported version of java. | 21 |
+| java_version | Default Java Version. By default it queries Oracle for the latest LTS version of Java. | |
 | java_type | Indicates whether the role should try to install the JRE or JDK. | jre |
 | java_use_headless | Headless variants exclude GUI components and are good for terminal-only servers. | true |
 | java_vendor | The vendor providing you with Java.  `Default` means your distro's default repositories. | Default |
@@ -53,16 +53,16 @@ Including an example of how to use your role (for instance, with variables passe
     - marshallwp.general.java
     # Install Oracle Java (not OpenJDK)
     - role: marshallwp.general.java
-      java_version: 21
+      java_version: 25
       java_vendor: Oracle
       java_variant: Java
     # Install Bellsoft OpenJDK
     - role: marshallwp.general.java
-      java_version: 21
+      java_version: 25
       java_vendor: Bellsoft
     # Install Amazon Corretto (their OpenJDK Build)
     - role: marshallwp.general.java
-      java_version: 21
+      java_version: 25
       java_vendor: Amazon
       java_variant: OpenJDK
 ```
@@ -74,11 +74,11 @@ Another way to consume this role would be:
   hosts: all
   gather_facts: false
   tasks:
-    - name: Install Azul Zulu 21
+    - name: Install Azul Zulu 25
       ansible.builtin.include_role:
         name: marshallwp.general.java
       vars:
-        java_version: 21
+        java_version: 25
         java_vendor: Azul
         java_variant: OpenJDK
 ```

roles/java/defaults/main.yml

@@ -1,11 +1,16 @@
-# SPDX-FileCopyrightText: 2025 Industrial Info Resources, Inc. <https://www.industrialinfo.com>
+# SPDX-FileCopyrightText: 2026 Industrial Info Resources, Inc. <https://www.industrialinfo.com>
 # SPDX-FileContributor: William P. Marshall
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 ---
-# Default Java Version.  Should always be a supported version of java.
-java_version: 25
+# Default Java Version. The lookup queries for the latest supported LTS version of java.
+java_version: "{{
+  (lookup('ansible.builtin.url',
+      'https://java.oraclecloud.com/currentJavaReleases?isLts=true&isSupportedVersion=true&licenseType=NFTC&sortBy=jdkVersion&sortOrder=DESC')
+    | ansible.builtin.from_json)['items'][0]['jdkDetails']['jdkVersion']
+    | int
+  }}"
 
 # Valid values are JRE or JDK.  JRE is not available for all vendors and variants.
 java_type: jre
@@ -26,8 +31,8 @@ java_install_directory: "/usr/lib/jvm/{{ java_type }}-{{ java_version }}-{{ java
 # Archive download directory for non-repository-based installs.
 java_archive_download_dir: /tmp
 
-# Update the alternatives
-java_update_alternatives: true
+# Enable or disable updating alternatives via update-alternatives for Archive-installed Java
+java_update_alternatives: false
 
 # When not installing from a repository, file extension will determine whether a file is
 # installed via ansible.builtin.package or extracted via ansible.builtin.unarchive.

roles/java/meta/main.yml

@@ -72,7 +72,7 @@ argument_specs:
       java_version:
         description: Default Java Version.  Should always be a supported version of java.
         type: int
-        default: 21
+        default: 25
       java_type:
         description: Indicates whether the role should try to install the JRE or JDK.
         default: jre

roles/java/vars/main.yml

@@ -183,7 +183,7 @@ java_packages:
         packages:
           - "bellsoft-java{{ java_version }}{{ (java_type == 'jre') | ansible.builtin.ternary('-runtime',
               (java_use_headless) | ansible.builtin.ternary('-lite', '')) }}"
-  # https://adoptium.net/blog/2021/12/eclipse-temurin-linux-installers-available/
+  # https://adoptium.net/installation/linux
   Eclipse:
     OpenJDK:  # a.k.a. Temurin
       Alpine:

tests/unit/requirements.txt

@@ -5,4 +5,4 @@
 
 # add python packages that are required for this collection
 tomli-w >= 1.2.0
-tomli ; python_version < '3.11'
+tomli >= 1.1.0 ; python_version < "3.11"