Merge pull request #3 from Oefenweb/change-default-version-to-3.8.6

Change default version to 3.8.6

.github/workflows/ci.yml

@@ -23,7 +23,9 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install ansible-lint[community,yamllint]
+        run: |
+          pip install ansible-lint
+          ansible-galaxy install -r requirements.yml
 
       - name: Lint code
         run: |
@@ -43,11 +45,8 @@ jobs:
       matrix:
         include:
           - distro: debian8
-            ansible-version: '<2.10'
           - distro: debian9
           - distro: debian10
-          - distro: ubuntu1604
-            ansible-version: '>=2.9, <2.10'
           - distro: ubuntu1604
             ansible-version: '>=2.10, <2.11'
           - distro: ubuntu1604

Dockerfile

@@ -1,17 +1,20 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 MAINTAINER Mischa ter Smitten <[email protected]>
 
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+
 # python
 RUN apt-get update && \
-  DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal python-dev curl && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y python3-minimal python3-dev curl && \
   apt-get clean
-RUN curl -sL https://bootstrap.pypa.io/pip/2.7/get-pip.py | python -
+RUN curl -sL https://bootstrap.pypa.io/pip/3.6/get-pip.py | python3 -
 RUN rm -rf $HOME/.cache
 
 # ansible
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gcc libffi-dev libssl-dev && \
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3-apt && \
   apt-get clean
-RUN pip install ansible==2.9.15
+RUN pip3 install ansible==2.10.7
 RUN rm -rf $HOME/.cache
 
 # provision

README.md

@@ -11,7 +11,7 @@ None
 
 #### Variables
 
-* `maven_version` [default: `3.8.4`]: Version to install
+* `maven_version` [default: `3.8.6`]: Version to install
 * `maven_install_prefix` [default: `/opt`]: Install prefix
 
 ## Dependencies

defaults/main.yml

@@ -1,4 +1,4 @@
 # defaults file
 ---
-maven_version: 3.8.4
+maven_version: 3.8.6
 maven_install_prefix: /opt

meta/main.yml

@@ -1,13 +1,12 @@
 # meta file
 ---
 galaxy_info:
-  namespace: oefenweb
+  author: oefenweb
   role_name: maven
-  author: Mischa ter Smitten
   company: Oefenweb.nl B.V.
   description: Set up Apache Ant
   license: MIT
-  min_ansible_version: 2.9.0
+  min_ansible_version: 2.10.0
   platforms:
     - name: Ubuntu
       versions:

molecule/default/collections.yml

@@ -0,0 +1,6 @@
+---
+collections:
+  - name: community.docker
+    version: '>=1.2.0,<2'
+  - name: community.general
+    version: '>=2,<3'

requirements.yml

@@ -0,0 +1,3 @@
+# requirements file
+---
+collections: []

tasks/main.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: create (download) directory
-  file:
+  ansible.builtin.file:
     path: "{{ maven_downloads_path }}"
     state: directory
     owner: root
@@ -13,7 +13,7 @@
     - maven-download
 
 - name: download
-  get_url:
+  ansible.builtin.get_url:
     url: "http://apache.cs.uu.nl/maven/maven-{{ maven_version.split('.')[0] }}/{{ maven_version }}/binaries/apache-maven-{{ maven_version }}-bin.tar.gz"
     dest: "{{ maven_downloads_path }}/apache-maven-{{ maven_version }}-bin.tar.gz"
     owner: root
@@ -25,7 +25,7 @@
     - maven-downloads
 
 - name: install
-  unarchive:
+  ansible.builtin.unarchive:
     src: "{{ maven_downloads_path }}/apache-maven-{{ maven_version }}-bin.tar.gz"
     dest: "{{ maven_install_prefix }}"
     creates: "{{ maven_install_prefix }}/apache-maven-{{ maven_version }}"
@@ -36,7 +36,7 @@
     - maven-install
 
 - name: verify
-  command: >
+  ansible.builtin.command: >
     {{ maven_install_prefix }}/apache-maven-{{ maven_version }}/bin/mvn -version
   changed_when: false
   tags:

tests/tasks/pre.yml

@@ -2,7 +2,7 @@
 ---
 # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
 - name: ensure man directory
-  file:
+  ansible.builtin.file:
     path: /usr/share/man/man1
     state: directory
     recurse: true
@@ -11,7 +11,7 @@
     - ansible_distribution_major_version is version('18', '>=')
 
 - name: install dependencies
-  apt:
+  ansible.builtin.apt:
     name:
       - default-jre
     state: "{{ apt_install_state | default('latest') }}"

tests/test.yml

@@ -5,6 +5,6 @@
   become: true
   pre_tasks:
     - name: include tasks
-      include: "{{ playbook_dir }}/tasks/pre.yml"
+      ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../

tests/vagrant.yml

@@ -5,6 +5,6 @@
   become: true
   pre_tasks:
     - name: include tasks
-      include: "{{ playbook_dir }}/tasks/pre.yml"
+      ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../