From 0504283e116660b91f2a41ae196652782df2fff8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 10:11:21 +0000 Subject: [PATCH 1/2] Bump org.openapitools:openapi-generator-maven-plugin Bumps org.openapitools:openapi-generator-maven-plugin from 6.4.0 to 7.1.0. --- updated-dependencies: - dependency-name: org.openapitools:openapi-generator-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- stackrox-container-image-scanner/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stackrox-container-image-scanner/pom.xml b/stackrox-container-image-scanner/pom.xml index ca0c13c7..fb781955 100644 --- a/stackrox-container-image-scanner/pom.xml +++ b/stackrox-container-image-scanner/pom.xml @@ -203,7 +203,7 @@ org.openapitools openapi-generator-maven-plugin - 6.4.0 + 7.1.0 From 8bf009027a838c25f573f2c165fa72aac8469415 Mon Sep 17 00:00:00 2001 From: Tomasz Janiszewski Date: Fri, 15 Dec 2023 14:36:24 +0100 Subject: [PATCH 2/2] Upgrade java to 11 Signed-off-by: Tomasz Janiszewski --- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/tests.yaml | 2 +- .../stackrox/jenkins/plugins/services/DetectionServiceTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 38115e9b..cf7a07b5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '8' + java-version: '11' cache: 'maven' - name: Build with Maven run: cd stackrox-container-image-scanner && ./mvnw -B package hpi:hpi cyclonedx:makeAggregateBom diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e4092c64..9230290a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '8' + java-version: '11' cache: 'maven' - name: Prepare Release run: > diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index c19a5b4a..323cf009 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '8' + java-version: '11' cache: 'maven' - name: Initialize CodeQL diff --git a/stackrox-container-image-scanner/src/test/java/com/stackrox/jenkins/plugins/services/DetectionServiceTest.java b/stackrox-container-image-scanner/src/test/java/com/stackrox/jenkins/plugins/services/DetectionServiceTest.java index e4bd46ad..54d00865 100644 --- a/stackrox-container-image-scanner/src/test/java/com/stackrox/jenkins/plugins/services/DetectionServiceTest.java +++ b/stackrox-container-image-scanner/src/test/java/com/stackrox/jenkins/plugins/services/DetectionServiceTest.java @@ -80,7 +80,7 @@ public void shouldJoinViolations() throws IOException { private MappingBuilder postDetectBuild() { return post(urlEqualTo("/v1/detect/build")) .withHeader("Authorization", equalTo("Bearer {some token}")) - .withRequestBody(equalToJson("{\"imageName\" : \"nginx:latest\", \"policyCategories\" : [ ], \"cluster\" : \"\"}")); + .withRequestBody(equalToJson("{\"imageName\" : \"nginx:latest\", \"cluster\" : \"\"}")); } }