diff --git a/doc/user/application_security/dependency_scanning/dependency_scanning_sbom/_index.md b/doc/user/application_security/dependency_scanning/dependency_scanning_sbom/_index.md index 44dde675901..04d986281f4 100644 --- a/doc/user/application_security/dependency_scanning/dependency_scanning_sbom/_index.md +++ b/doc/user/application_security/dependency_scanning/dependency_scanning_sbom/_index.md @@ -346,7 +346,7 @@ build: stage: build script: - mvn install - - mvn dependency:tree -DoutputType=json -DoutputFile=maven.graph.json + - mvn org.apache.maven.plugins:maven-dependency-plugin:3.8.1:tree -DoutputType=json -DoutputFile=maven.graph.json # Collect all maven.graph.json artifacts and pass them onto jobs # in sequential stages. artifacts: diff --git a/spec/lib/gitlab/gitaly_client_spec.rb b/spec/lib/gitlab/gitaly_client_spec.rb index ca61baaab33..856d1bb1e84 100644 --- a/spec/lib/gitlab/gitaly_client_spec.rb +++ b/spec/lib/gitlab/gitaly_client_spec.rb @@ -644,7 +644,7 @@ RSpec.describe Gitlab::GitalyClient, feature_category: :gitaly do expect(kword_args[:metadata][:deadline_type]).to be_nil end - it 'includes only the deadline specified by the timeout when there was no deadline' do + it 'includes only the deadline specified by the timeout when there was no deadline', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/524657' do allow(Gitlab::RequestContext.instance).to receive(:request_deadline).and_return(nil) kword_args = described_class.request_kwargs('default', timeout: 6.hours.to_i)