From c0a615bf5fbafda4c32633e84b949267fbbb7fab Mon Sep 17 00:00:00 2001
From: John Freeman <john.freeman.opensource@gmail.com>
Date: Sun, 17 Nov 2024 21:20:56 +0000
Subject: [PATCH] Dropped support for Ubuntu Bionic (#372)

Canonical have ended standard support for Ubuntu Bionic.
---
 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 147a06b..658e0ba 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,6 @@ Requirements
 
         * Ubuntu
 
-            * Bionic (18.04)
             * Focal (20.04)
             * Jammy (22.04)
 
diff --git a/meta/main.yml b/meta/main.yml
index afee54d..6ed6216 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -17,7 +17,6 @@ galaxy_info:
         - '15.4'
     - name: Ubuntu
       versions:
-        - bionic
         - focal
         - jammy
     - 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 045dc9d..a3b53e3 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:18.04
+    image: ubuntu:20.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 42d7fbc..2c66810 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:18.04
+    image: ubuntu:20.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 02e8622..4878187 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:18.04
+    image: ubuntu:20.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 4972d67..6cbb7cb 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:18.04
+    image: ubuntu:20.04
 
 provisioner:
   name: ansible