Merge branch 'java-11-keystore' into 'master'v3.25.7

Install x509 cert into Java 11 keystore

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

2 files changed, 6 insertions, 4 deletions

diff --git a/lib/license/management/tool_box.rb b/lib/license/management/tool_box.rb
index 0e39a61..239f88f 100644
--- a/lib/license/management/tool_box.rb
+++ b/lib/license/management/tool_box.rb
@@ -26,7 +26,7 @@ module License
           shell.execute([:asdf, :reshim], env: env)
         end
         install_common_libraries(env: env) if C_BASED_TOOLS.include?(tool.to_sym)
-        install_certificates_into_java_keystore(env) if tool == :java
+        install_certificates_into_java_keystore(env, version) if tool == :java
       end
 
       def install_common_libraries(env: {})
@@ -116,10 +116,12 @@ module License
         asdf_detected_version_of(:java)
       end
 
-      def install_certificates_into_java_keystore(env)
+      def install_certificates_into_java_keystore(env, version)
+        java_home = Pathname.new(env['JAVA_HOME'])
+        keystore_path = java_home.join("8" == version ? "jre/lib/security/cacerts" : "lib/security/cacerts")
+
         Dir.chdir shell.custom_certificate_path.dirname do
           Dir.glob('custom.*.crt').each do |path|
-            keystore_path = "#{env['JAVA_HOME']}/jre/lib/security/cacerts"
             shell.execute([:keytool, '-importcert', '-alias', Time.now.to_i, '-file', File.expand_path(path), '-trustcacerts', '-noprompt', '-storepass', 'changeit', '-keystore', keystore_path], env: env)
             shell.execute([:keytool, '-list', '-v', '-storepass changeit', '-keystore', keystore_path], env: env)
           end
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index cc17c36..8e2f460 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.25.6'
+    VERSION = '3.25.7'
   end
 end