Merge branch 'master' into dependabot/pip/requirements/idna-3.7

gantsign · Nov 17, 2024 · 24765d8 · 24765d8
2 parents 1159848 + c0a615b
commit 24765d8
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 6 deletions.
diff --git a/.devcontainer/.gitignore b/.devcontainer/.gitignore
@@ -0,0 +1 @@
+.devpod-internal
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ galaxy_info: @@
             - '15.4'
         - name: Ubuntu
           versions:
-            - bionic
             - focal
             - jammy
         - name: Debian
@@ Expand Down @@