diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1eb2b7b8..b5c49889 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-java@v4 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 19faa163..fb6f049b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,7 +33,7 @@ jobs: - uses: actions/setup-java@v4 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 3ae8c1a1..e1260063 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '8' + java-version: '11' cache: 'maven' - name: Initialize CodeQL 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 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\" : \"\"}")); } }