From aacde60fd6c942c30582f29672d5102fb5aae188 Mon Sep 17 00:00:00 2001 From: James Annesley Date: Tue, 14 May 2024 11:27:21 +0100 Subject: [PATCH 1/2] upload shasum files and cut content disposition writing for all files --- .../mvnfeed/cli/transfer/transfer.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/mvnfeed_modules/mvnfeed-cli-transfer/mvnfeed/cli/transfer/transfer.py b/src/mvnfeed_modules/mvnfeed-cli-transfer/mvnfeed/cli/transfer/transfer.py index ec1e301..3a10554 100644 --- a/src/mvnfeed_modules/mvnfeed-cli-transfer/mvnfeed/cli/transfer/transfer.py +++ b/src/mvnfeed_modules/mvnfeed-cli-transfer/mvnfeed/cli/transfer/transfer.py @@ -196,12 +196,22 @@ def _java_artifacts(artifact_fullname, artifact_type, artifact_path, transfer_de 'path': artifact_path, 'target': True }, + { + 'name': artifact_fullname + '.jar.sha1', + 'path': artifact_path, + 'target': False + }, { 'name': artifact_fullname + '.pom', 'path': artifact_path, 'transfer_deps': transfer_deps, 'target': False }, + { + 'name': artifact_fullname + '.pom.sha1', + 'path': artifact_path, + 'target': False + }, { 'name': artifact_fullname + '-tests.jar', 'path': artifact_path, @@ -233,6 +243,11 @@ def _untyped_artifacts(artifact_fullname, artifact_type, artifact_path, transfer 'path': artifact_path, 'transfer_deps': transfer_deps, 'target': False + }, + { + 'name': artifact_fullname + '.pom.sha1', + 'path': artifact_path, + 'target': False } ] @@ -319,7 +334,7 @@ def _upload_file(to_repository, path, filename): try: with open(filename, 'rb') as file: - response = requests.put(url, files={filename: file}, headers=headers) + response = requests.put(url, data=file.read(), headers=headers) if not response.ok: logging.error('error while uploading of %s: %s', path, response.text) return True From fce33940b582a557df4dce291d2c9c458c23fde2 Mon Sep 17 00:00:00 2001 From: James Annesley Date: Thu, 16 May 2024 16:46:18 +0100 Subject: [PATCH 2/2] upload shasum source file --- .../mvnfeed-cli-transfer/mvnfeed/cli/transfer/transfer.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mvnfeed_modules/mvnfeed-cli-transfer/mvnfeed/cli/transfer/transfer.py b/src/mvnfeed_modules/mvnfeed-cli-transfer/mvnfeed/cli/transfer/transfer.py index 3a10554..38c8062 100644 --- a/src/mvnfeed_modules/mvnfeed-cli-transfer/mvnfeed/cli/transfer/transfer.py +++ b/src/mvnfeed_modules/mvnfeed-cli-transfer/mvnfeed/cli/transfer/transfer.py @@ -222,6 +222,11 @@ def _java_artifacts(artifact_fullname, artifact_type, artifact_path, transfer_de 'path': artifact_path, 'target': False }, + { + 'name': artifact_fullname + '-sources.jar.sha1', + 'path': artifact_path, + 'target': False + }, { 'name': artifact_fullname + '-javadoc.jar', 'path': artifact_path,