Merge branch '212921-offline-npm' into 'master'v3.8.0

Specify a custom CA for npm

See merge request gitlab-org/security-products/license-management!145

2 files changed, 8 insertions, 3 deletions

diff --git a/lib/license/management/shell.rb b/lib/license/management/shell.rb
index 9ff59c4..9053a3f 100644
--- a/lib/license/management/shell.rb
+++ b/lib/license/management/shell.rb
@@ -48,6 +48,7 @@ module License
           Dir.glob('custom.*.crt').each do |path|
             full_path = File.expand_path(path)
             execute([:openssl, :x509, '-in', full_path, '-text', '-noout'])
+            keystore_path = "#{ENV['JAVA_HOME']}/jre/lib/security/cacerts"
             execute([
               :keytool,
               '-importcert',
@@ -56,9 +57,13 @@ module License
               '-trustcacerts',
               '-noprompt',
               '-storepass', 'changeit',
-              '-keystore', "#{ENV['JAVA_HOME']}/jre/lib/security/cacerts"
+              '-keystore', keystore_path
+            ])
+            execute([
+              :keytool, '-list', '-v',
+              '-storepass changeit',
+              '-keystore', keystore_path
             ])
-            execute(["keytool -list -v -storepass changeit"])
           end
         end
       end
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index cfb570e..881fa37 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.7.6'
+    VERSION = '3.8.0'
   end
 end