From 7129453cd96b40b527a14b16cfcd7fee6d342ca2 Mon Sep 17 00:00:00 2001 From: Boyd Hemphill Date: Sun, 19 Jan 2020 23:46:49 -0600 Subject: [PATCH] Maven Central requires TLS (#66611) Fixes: #66609 Maven requires TLS as of 2019-01-15 --- lib/ansible/modules/packaging/language/maven_artifact.py | 6 +++--- .../units/modules/packaging/language/test_maven_artifact.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ansible/modules/packaging/language/maven_artifact.py b/lib/ansible/modules/packaging/language/maven_artifact.py index 47c2c234a54..dbee9ca71ec 100644 --- a/lib/ansible/modules/packaging/language/maven_artifact.py +++ b/lib/ansible/modules/packaging/language/maven_artifact.py @@ -59,7 +59,7 @@ options: - The URL of the Maven Repository to download from. - Use s3://... if the repository is hosted on Amazon S3, added in version 2.2. - Use file://... if the repository is local, added in version 2.6 - default: http://repo1.maven.org/maven2 + default: https://repo1.maven.org/maven2 username: description: - The username to authenticate as to the Maven Repository. Use AWS secret key of the repository is hosted on S3 @@ -553,7 +553,7 @@ def main(): version_by_spec=dict(default=None), classifier=dict(default=''), extension=dict(default='jar'), - repository_url=dict(default='http://repo1.maven.org/maven2'), + repository_url=dict(default='https://repo1.maven.org/maven2'), username=dict(default=None, aliases=['aws_secret_key']), password=dict(default=None, no_log=True, aliases=['aws_secret_access_key']), headers=dict(type='dict'), @@ -577,7 +577,7 @@ def main(): repository_url = module.params["repository_url"] if not repository_url: - repository_url = "http://repo1.maven.org/maven2" + repository_url = "https://repo1.maven.org/maven2" try: parsed_url = urlparse(repository_url) except AttributeError as e: diff --git a/test/units/modules/packaging/language/test_maven_artifact.py b/test/units/modules/packaging/language/test_maven_artifact.py index 8961de04d18..09e3b4e8acf 100644 --- a/test/units/modules/packaging/language/test_maven_artifact.py +++ b/test/units/modules/packaging/language/test_maven_artifact.py @@ -65,6 +65,6 @@ def test_find_version_by_spec(mocker, version_by_spec, version_choosed): _getContent.return_value = maven_metadata_example artifact = maven_artifact.Artifact("junit", "junit", None, version_by_spec, "jar") - mvn_downloader = maven_artifact.MavenDownloader(basic.AnsibleModule, "http://repo1.maven.org/maven2") + mvn_downloader = maven_artifact.MavenDownloader(basic.AnsibleModule, "https://repo1.maven.org/maven2") assert mvn_downloader.find_version_by_spec(artifact) == version_choosed