From 3d8c891e5e2457c108010a307110138603537c33 Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 29 Jan 2024 16:25:43 +0000 Subject: [PATCH 1/3] Update versions in application files --- components/package.json | 2 +- dojo/__init__.py | 2 +- helm/defectdojo/Chart.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/package.json b/components/package.json index 3f7fe72f6dc..262ef7e6f3b 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.30.4", + "version": "2.31.0-dev", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/dojo/__init__.py b/dojo/__init__.py index f5f755a23ad..9406e56f475 100644 --- a/dojo/__init__.py +++ b/dojo/__init__.py @@ -4,6 +4,6 @@ # Django starts so that shared_task will use this app. from .celery import app as celery_app # noqa -__version__ = '2.30.4' +__version__ = '2.31.0-dev' __url__ = 'https://github.com/DefectDojo/django-DefectDojo' __docs__ = 'https://documentation.defectdojo.com' diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index 5ac25d323cc..c723762ee51 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.30.4" +appVersion: "2.31.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.107 +version: 1.6.108-dev icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap From 4499b7b95c782fecce490f73a923deb12cb1b8f3 Mon Sep 17 00:00:00 2001 From: Cody Maffucci <46459665+Maffooch@users.noreply.github.com> Date: Tue, 30 Jan 2024 16:00:21 -0600 Subject: [PATCH 2/3] Update jira-description.tpl (#9403) --- dojo/templates/issue-trackers/jira_full/jira-description.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dojo/templates/issue-trackers/jira_full/jira-description.tpl b/dojo/templates/issue-trackers/jira_full/jira-description.tpl index b4e60a64a88..6fd326efb5f 100644 --- a/dojo/templates/issue-trackers/jira_full/jira-description.tpl +++ b/dojo/templates/issue-trackers/jira_full/jira-description.tpl @@ -25,7 +25,7 @@ {% endif %} {% if finding.cvssv3_score %} -*CVSSv3 Score:* {{ finding.cvssv3_score }} +*CVSSv3 Score:* {{ finding.cvssv3_score }} {% if finding.cvssv3 %}({{ finding.cvssv3 }}){% endif %} {% endif %} *Product/Engagement/Test:* [{{ finding.test.engagement.product.name }}|{{ product_url|full_url }}] / [{{ finding.test.engagement.name }}|{{ engagement_url|full_url }}] / [{{ finding.test }}|{{ test_url|full_url }}] From c263392440eca2809ee322d1377998af017c20d7 Mon Sep 17 00:00:00 2001 From: Paul Osinski <42211303+paulOsinski@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:06:47 -0700 Subject: [PATCH 3/3] Update and rename whitesource.md to mend.md (#9348) * Update and rename whitesource.md to mend.md * Update docs/content/en/integrations/parsers/file/mend.md Co-authored-by: Charles Neill <1749665+cneill@users.noreply.github.com> --------- Co-authored-by: Charles Neill <1749665+cneill@users.noreply.github.com> --- docs/content/en/integrations/parsers/file/mend.md | 15 +++++++++++++++ .../en/integrations/parsers/file/whitesource.md | 5 ----- 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 docs/content/en/integrations/parsers/file/mend.md delete mode 100644 docs/content/en/integrations/parsers/file/whitesource.md diff --git a/docs/content/en/integrations/parsers/file/mend.md b/docs/content/en/integrations/parsers/file/mend.md new file mode 100644 index 00000000000..e45b2d16b8b --- /dev/null +++ b/docs/content/en/integrations/parsers/file/mend.md @@ -0,0 +1,15 @@ +--- +title: "Mend Scan" +toc_hide: true +--- + +### File Types +Accepts a JSON file, generated from the Mend* Unified Agent. + +### Sample Scan Data / Unit Tests +Unit tests for Mend JSON files can be found at https://github.com/DefectDojo/django-DefectDojo/tree/master/unittests/scans/mend + +### Link To Tool +See documentation: https://docs.mend.io/bundle/unified_agent/page/example_of_a_unified_agent_json_report.html + +*Formerly known as Whitesource. diff --git a/docs/content/en/integrations/parsers/file/whitesource.md b/docs/content/en/integrations/parsers/file/whitesource.md deleted file mode 100644 index d647d7cc96f..00000000000 --- a/docs/content/en/integrations/parsers/file/whitesource.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "Whitesource Scan" -toc_hide: true ---- -Import JSON report