summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-04-23 09:57:57 +0000
committerCan Eldem <celdem@gitlab.com>2020-04-23 09:57:57 +0000
commit86950d555fc22d88134360fdc7c3da87ba5f8895 (patch)
treedb395a60486fd6ce255d7281c97cb5c1687c9bca /lib
parentd65dd61597375bfd6e6953fd4d0990a836fc3503 (diff)
parente8aadb0323135defca027c5ac09c2a2e8a2194b4 (diff)
Merge branch '212342-java-root-certificates' into 'master'v3.7.4
Pull packages from a custom mvn repository with a custom root certificate. See merge request gitlab-org/security-products/license-management!139
Diffstat (limited to 'lib')
-rw-r--r--lib/license/management/shell.rb1
-rw-r--r--lib/license/management/version.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/license/management/shell.rb b/lib/license/management/shell.rb
index 6720460..f16537d 100644
--- a/lib/license/management/shell.rb
+++ b/lib/license/management/shell.rb
@@ -42,6 +42,7 @@ module License
custom_certificate_path.write(certificate)
execute("openssl x509 -in #{custom_certificate_path} -text -noout")
execute('update-ca-certificates -v')
+ execute("keytool -importcert -file #{custom_certificate_path} -trustcacerts -noprompt")
end
def present?(item)
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index c00ae73..bc5d85c 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
module License
module Management
- VERSION = '3.7.3'
+ VERSION = '3.7.4'
end
end