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

2 files changed, 7 insertions, 1 deletions

diff --git a/spec/support/fixture_file_helper.rb b/spec/support/fixture_file_helper.rb
index 5a9599f..313ee35 100644
--- a/spec/support/fixture_file_helper.rb
+++ b/spec/support/fixture_file_helper.rb
@@ -5,7 +5,7 @@ module FixtureFileHelper
 
     ERB
       .new(content)
-      .result(OpenStruct.new(data).send(:binding))
+      .result(OpenStruct.new(data).instance_eval { binding })
   end
 
   def fixture_file(path)
diff --git a/spec/support/integration_test_helper.rb b/spec/support/integration_test_helper.rb
index 52693f2..b25297c 100644
--- a/spec/support/integration_test_helper.rb
+++ b/spec/support/integration_test_helper.rb
@@ -92,6 +92,12 @@ module IntegrationTestHelper
     end
   end
 
+  def private_maven_host
+    @private_maven_host ||= ENV.fetch('PRIVATE_MAVEN_HOST').tap do |host|
+      add_host(host, ENV.fetch('PRIVATE_MAVEN_IP'))
+    end
+  end
+
   def runner(*args)
     @runner ||= IntegrationTestRunner.new(*args)
   end