Merge branch 'propagate-ds-java-version-in-dependency-scanning' into 'master'

Propagate DS_JAVA_VERSION for dependency scanning See merge request gitlab-org/gitlab!36448

Merge branch 'propagate-ds-java-version-in-dependency-scanning' into 'master'
Propagate DS_JAVA_VERSION for dependency scanning See merge request gitlab-org/gitlab!36448
c203b6ae · Fabio Pitino · e86a0646 · 3489db4a · c203b6ae · c203b6ae
Commit c203b6ae authored Jul 10, 2020 by Fabio Pitino
2 changed files
--- a/changelogs/unreleased/propagate-ds-java-version-in-dependency-scanning.yml
+++ b/changelogs/unreleased/propagate-ds-java-version-in-dependency-scanning.yml
+---
+title: Propagate DS_JAVA_VERSION for dependency scanning
+merge_request: 36448
+author:
+type: fixed
--- a/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml
@@ -52,6 +52,7 @@ dependency_scanning:
          DS_PYTHON_VERSION \
          DS_PIP_VERSION \
          DS_PIP_DEPENDENCY_PATH \
+          DS_JAVA_VERSION \
          GEMNASIUM_DB_LOCAL_PATH \
          GEMNASIUM_DB_REMOTE_URL \
          GEMNASIUM_DB_REF_NAME \