Upgrade default maven

README.md

@@ -2,7 +2,7 @@
 [![Build Status](https://travis-ci.org/NitorCreations/nameless-deploy-tools.svg?branch=master)](https://travis-ci.org/NitorCreations/nameless-deploy-tools)
 [![Coverage Status](https://coveralls.io/repos/github/NitorCreations/nameless-deploy-tools/badge.svg?branch=master)](https://coveralls.io/github/NitorCreations/nameless-deploy-tools?branch=master)
 
-## Released version 1.115
+## Released version 1.116
 
 Nameless deploy tools are a set of tools to implement a true Infrastructure As Code workflow
 with various cloud infrastructure management tools. Currently supported tools are

docker/Dockerfile

@@ -86,6 +86,6 @@ RUN set -ex \
   && wget -O /usr/bin/lein "https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein" \
   && chmod 755 /usr/bin/lein \
   && lein version
-RUN pip install --no-cache-dir nameless-deploy-tools==1.115
+RUN pip install --no-cache-dir nameless-deploy-tools==1.116
 
 ENTRYPOINT ["dockerd-entrypoint.sh"]

docs/commands.md

@@ -1225,9 +1225,9 @@ Traceback (most recent call last):
     return cls._build_from_requirements(__requires__)
   File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 598, in _build_from_requirements
     dists = ws.resolve(reqs, Environment())
-  File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 786, in resolve
-    raise DistributionNotFound(req, requirers)
-pkg_resources.DistributionNotFound: The \'PyYAML==5.2\' distribution was not found and is required by nameless-deploy-tools
+  File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 791, in resolve
+    raise VersionConflict(dist, req).with_context(dependent_req)
+pkg_resources.ContextualVersionConflict: (PyYAML 5.2 (/usr/local/lib/python2.7/dist-packages), Requirement.parse(\'PyYAML<5.2,>=3.10; python_version != "2.6" and python_version != "3.3"\'), set([\'awscli\']))
 ```
 
 ## `[ndt ]cf-logs-to-cloudwatch`
@@ -1246,9 +1246,9 @@ Traceback (most recent call last):
     return cls._build_from_requirements(__requires__)
   File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 598, in _build_from_requirements
     dists = ws.resolve(reqs, Environment())
-  File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 786, in resolve
-    raise DistributionNotFound(req, requirers)
-pkg_resources.DistributionNotFound: The \'PyYAML==5.2\' distribution was not found and is required by nameless-deploy-tools
+  File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 791, in resolve
+    raise VersionConflict(dist, req).with_context(dependent_req)
+pkg_resources.ContextualVersionConflict: (PyYAML 5.2 (/usr/local/lib/python2.7/dist-packages), Requirement.parse(\'PyYAML<5.2,>=3.10; python_version != "2.6" and python_version != "3.3"\'), set([\'awscli\']))
 ```
 
 ## `[ndt ]ec2-associate-eip`
@@ -1267,9 +1267,9 @@ Traceback (most recent call last):
     return cls._build_from_requirements(__requires__)
   File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 598, in _build_from_requirements
     dists = ws.resolve(reqs, Environment())
-  File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 786, in resolve
-    raise DistributionNotFound(req, requirers)
-pkg_resources.DistributionNotFound: The \'PyYAML==5.2\' distribution was not found and is required by nameless-deploy-tools
+  File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 791, in resolve
+    raise VersionConflict(dist, req).with_context(dependent_req)
+pkg_resources.ContextualVersionConflict: (PyYAML 5.2 (/usr/local/lib/python2.7/dist-packages), Requirement.parse(\'PyYAML<5.2,>=3.10; python_version != "2.6" and python_version != "3.3"\'), set([\'awscli\']))
 ```
 
 ## `[ndt ]logs-to-cloudwatch`
@@ -1288,9 +1288,9 @@ Traceback (most recent call last):
     return cls._build_from_requirements(__requires__)
   File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 598, in _build_from_requirements
     dists = ws.resolve(reqs, Environment())
-  File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 786, in resolve
-    raise DistributionNotFound(req, requirers)
-pkg_resources.DistributionNotFound: The \'PyYAML==5.2\' distribution was not found and is required by nameless-deploy-tools
+  File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 791, in resolve
+    raise VersionConflict(dist, req).with_context(dependent_req)
+pkg_resources.ContextualVersionConflict: (PyYAML 5.2 (/usr/local/lib/python2.7/dist-packages), Requirement.parse(\'PyYAML<5.2,>=3.10; python_version != "2.6" and python_version != "3.3"\'), set([\'awscli\']))
 ```
 
 ## `[ndt ]n-include`
@@ -1309,9 +1309,9 @@ Traceback (most recent call last):
     return cls._build_from_requirements(__requires__)
   File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 598, in _build_from_requirements
     dists = ws.resolve(reqs, Environment())
-  File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 786, in resolve
-    raise DistributionNotFound(req, requirers)
-pkg_resources.DistributionNotFound: The \'PyYAML==5.2\' distribution was not found and is required by nameless-deploy-tools
+  File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 791, in resolve
+    raise VersionConflict(dist, req).with_context(dependent_req)
+pkg_resources.ContextualVersionConflict: (PyYAML 5.2 (/usr/local/lib/python2.7/dist-packages), Requirement.parse(\'PyYAML<5.2,>=3.10; python_version != "2.6" and python_version != "3.3"\'), set([\'awscli\']))
 ```
 
 ## `[ndt ]n-include-all`
@@ -1330,9 +1330,9 @@ Traceback (most recent call last):
     return cls._build_from_requirements(__requires__)
   File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 598, in _build_from_requirements
     dists = ws.resolve(reqs, Environment())
-  File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 786, in resolve
-    raise DistributionNotFound(req, requirers)
-pkg_resources.DistributionNotFound: The \'PyYAML==5.2\' distribution was not found and is required by nameless-deploy-tools
+  File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 791, in resolve
+    raise VersionConflict(dist, req).with_context(dependent_req)
+pkg_resources.ContextualVersionConflict: (PyYAML 5.2 (/usr/local/lib/python2.7/dist-packages), Requirement.parse(\'PyYAML<5.2,>=3.10; python_version != "2.6" and python_version != "3.3"\'), set([\'awscli\']))
 ```
 
 ## `[ndt ]signal-cf-status`
@@ -1351,9 +1351,9 @@ Traceback (most recent call last):
     return cls._build_from_requirements(__requires__)
   File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 598, in _build_from_requirements
     dists = ws.resolve(reqs, Environment())
-  File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 786, in resolve
-    raise DistributionNotFound(req, requirers)
-pkg_resources.DistributionNotFound: The \'PyYAML==5.2\' distribution was not found and is required by nameless-deploy-tools
+  File "/usr/local/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 791, in resolve
+    raise VersionConflict(dist, req).with_context(dependent_req)
+pkg_resources.ContextualVersionConflict: (PyYAML 5.2 (/usr/local/lib/python2.7/dist-packages), Requirement.parse(\'PyYAML<5.2,>=3.10; python_version != "2.6" and python_version != "3.3"\'), set([\'awscli\']))
 ```
 
 ## `create-shell-archive.sh`

setup.py

@@ -16,10 +16,10 @@
 from n_utils import PATH_COMMANDS, CONSOLESCRIPTS
 
 setup(name='nameless-deploy-tools',
-      version='1.115',
+      version='1.116',
       description='Tools for deploying to AWS via CloudFormation and Serverless framework that support a pull request based workflow',
       url='http://github.com/NitorCreations/nameless-deploy-tools',
-      download_url='https://github.com/NitorCreations/nameless-deploy-tools/tarball/1.115',
+      download_url='https://github.com/NitorCreations/nameless-deploy-tools/tarball/1.116',
       author='Pasi Niemi',
       author_email='pasi@nitor.com',
       license='Apache 2.0',