Merge branch '212919-pull-custom-conan-packages' into 'master'v3.11.0

Allow custom conan configuration

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

2 files changed, 2 insertions, 2 deletions

diff --git a/spec/integration/java/gradle_spec.rb b/spec/integration/java/gradle_spec.rb
index 25336c1..0e71038 100644
--- a/spec/integration/java/gradle_spec.rb
+++ b/spec/integration/java/gradle_spec.rb
@@ -49,7 +49,7 @@ plugins {
     end
   end
 
-  context 'when scanning a project that needs to connect to multiple TLS endpoints with different custom certificate chains' do
+  context 'when scanning a project that needs to connect to multiple TLS endpoints with different custom certificate chains', environment: 'offline' do
     subject do
       runner.scan(env: {
         'ADDITIONAL_CA_CERT_BUNDLE' => fixture_file_content('java/gradle/offline-environment/bundle.crt'),
diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb
index fa57752..85637b2 100644
--- a/spec/integration/java/maven_spec.rb
+++ b/spec/integration/java/maven_spec.rb
@@ -80,7 +80,7 @@ RSpec.describe "maven" do
     end
   end
 
-  context "when connecting to a custom package registry with a self signed certificate" do
+  context "when connecting to a custom package registry with a self signed certificate", environment: 'offline' do
     let(:bundle) { fixture_file_content('java/maven.crt') }
     let(:report) { runner.scan(env: { 'ADDITIONAL_CA_CERT_BUNDLE' => bundle, 'LOG_LEVEL' => 'debug' }) }