From cf9e98eb08914f8c7df387f2362f30725dfb9e14 Mon Sep 17 00:00:00 2001
From: John Freeman <john.freeman.opensource@gmail.com>
Date: Mon, 18 Nov 2024 22:59:23 +0000
Subject: [PATCH] Dropped support for Ubuntu Focal

Canonical have ended standard support for Ubuntu Focal.
---
 README.md                                                | 1 -
 meta/main.yml                                            | 1 -
 molecule/ubuntu-min-java-max-lts-online/molecule.yml     | 2 +-
 molecule/ubuntu-min-java-max-non-lts-online/molecule.yml | 2 +-
 molecule/ubuntu-min-java-min-online/molecule.yml         | 2 +-
 molecule/ubuntu-min-java-old-lts-online/molecule.yml     | 2 +-
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 7196cb6..4b35c2e 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,6 @@ Requirements
 
         * Ubuntu
 
-            * Focal (20.04)
             * Jammy (22.04)
             * Noble (24.04)
 
diff --git a/meta/main.yml b/meta/main.yml
index 2d25e39..f188c86 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -17,7 +17,6 @@ galaxy_info:
         - 'all'
     - name: Ubuntu
       versions:
-        - focal
         - jammy
         - noble
     - name: Debian
diff --git a/molecule/ubuntu-min-java-max-lts-online/molecule.yml b/molecule/ubuntu-min-java-max-lts-online/molecule.yml
index a3b53e3..1f641b4 100644
--- a/molecule/ubuntu-min-java-max-lts-online/molecule.yml
+++ b/molecule/ubuntu-min-java-max-lts-online/molecule.yml
@@ -9,7 +9,7 @@ role_name_check: 2
 
 platforms:
   - name: ansible-role-java-ubuntu-min-java-max-lts
-    image: ubuntu:20.04
+    image: ubuntu:22.04
 
 provisioner:
   name: ansible
diff --git a/molecule/ubuntu-min-java-max-non-lts-online/molecule.yml b/molecule/ubuntu-min-java-max-non-lts-online/molecule.yml
index 2c66810..cb4940b 100644
--- a/molecule/ubuntu-min-java-max-non-lts-online/molecule.yml
+++ b/molecule/ubuntu-min-java-max-non-lts-online/molecule.yml
@@ -9,7 +9,7 @@ role_name_check: 2
 
 platforms:
   - name: ansible-role-java-ubuntu-min-java-max-non-lts
-    image: ubuntu:20.04
+    image: ubuntu:22.04
 
 provisioner:
   name: ansible
diff --git a/molecule/ubuntu-min-java-min-online/molecule.yml b/molecule/ubuntu-min-java-min-online/molecule.yml
index 4878187..0ee424d 100644
--- a/molecule/ubuntu-min-java-min-online/molecule.yml
+++ b/molecule/ubuntu-min-java-min-online/molecule.yml
@@ -9,7 +9,7 @@ role_name_check: 2
 
 platforms:
   - name: ansible-role-java-ubuntu-min
-    image: ubuntu:20.04
+    image: ubuntu:22.04
 
 provisioner:
   name: ansible
diff --git a/molecule/ubuntu-min-java-old-lts-online/molecule.yml b/molecule/ubuntu-min-java-old-lts-online/molecule.yml
index 6cbb7cb..649548d 100644
--- a/molecule/ubuntu-min-java-old-lts-online/molecule.yml
+++ b/molecule/ubuntu-min-java-old-lts-online/molecule.yml
@@ -9,7 +9,7 @@ role_name_check: 2
 
 platforms:
   - name: ansible-role-java-ubuntu-min-java-old-lts
-    image: ubuntu:20.04
+    image: ubuntu:22.04
 
 provisioner:
   name: ansible