diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-03-20 10:31:37 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-03-20 10:31:37 +0000 |
| commit | d9ddfb4662dc3d9ba283e7832f6d1ec0e1451d25 (patch) | |
| tree | 417c4a313b1d6428c1a43f38278d2c828a36b293 /config | |
| parent | df97efaccfc0a5d4e3ef564e74c60987f65ff6fa (diff) | |
| parent | 43fec0e1e3151371929139c4f67c43e7f81f1a80 (diff) | |
Merge branch 'java-maven-multimodules' into 'master'v3.1.2
Detect all licenses for maven multi-module projects.
See merge request gitlab-org/security-products/license-management!123
Diffstat (limited to 'config')
| -rw-r--r-- | config/.bashrc | 2 | ||||
| -rw-r--r-- | config/.m2/settings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/.bashrc b/config/.bashrc index ea68a94..e85ae56 100644 --- a/config/.bashrc +++ b/config/.bashrc @@ -25,7 +25,7 @@ function enable_dev_mode() { export EDITOR=vim set -o vi apt-get update -y - apt-get install -y --no-install-recommends vim less + apt-get install -y --no-install-recommends vim less shellcheck } inflate /opt/asdf.tar.zst /opt diff --git a/config/.m2/settings.xml b/config/.m2/settings.xml index c36a363..9a89d90 100644 --- a/config/.m2/settings.xml +++ b/config/.m2/settings.xml @@ -11,7 +11,7 @@ <repositories> <repository> <id>gitlab-maven</id> - <url>https://gitlab.com/api/v4/projects/${env.CI_PROJECT_ID}/packages/maven</url> + <url>${env.CI_API_V4_URL}/projects/${env.CI_PROJECT_ID}/packages/maven</url> </repository> </repositories> </profile> |