Skip to content

Commit f7d57f9

Browse files
Merge branch 'master' into landerson/maven-smoke-test-proxy
2 parents f72d4ab + 0c891b7 commit f7d57f9

File tree

3 files changed

+622
-21
lines changed

3 files changed

+622
-21
lines changed

.github/workflows/analyze-changes.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
${{ runner.os }}-gradle-
4141
4242
- name: Initialize CodeQL
43-
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
43+
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
4444
with:
4545
languages: 'java'
4646
build-mode: 'manual'
@@ -57,7 +57,7 @@ jobs:
5757
--build-cache --parallel --stacktrace --no-daemon --max-workers=4
5858
5959
- name: Perform CodeQL Analysis and upload results to GitHub Security tab
60-
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
60+
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
6161

6262
trivy:
6363
name: Analyze changes with Trivy
@@ -122,7 +122,7 @@ jobs:
122122
TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
123123

124124
- name: Upload Trivy scan results to GitHub Security tab
125-
uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
125+
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
126126
if: always()
127127
with:
128128
sarif_file: 'trivy-results.sarif'

dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,6 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
353353
def mavenRepositoryProxy = System.getenv("MAVEN_REPOSITORY_PROXY")
354354
if (mavenRepositoryProxy != null) {
355355
processBuilder.environment().put("MAVEN_REPOSITORY_PROXY", mavenRepositoryProxy)
356-
} else {
357-
println "MAVEN_REPOSITORY_PROXY NOT SET FOR ${mvnCommand}"
358356
}
359357

360358
return processBuilder

0 commit comments

Comments
 (0)