diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 26c20ddd..3ff938c3 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -133,13 +133,8 @@ jobs: with: scan-type: 'fs' ignore-unfixed: true - format: 'sarif' - output: 'trivy-results.sarif' + format: 'table' severity: 'CRITICAL,HIGH' - - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v2 - with: - sarif_file: 'trivy-results.sarif' - name: 'Scanned' shell: bash run: echo "::info ::Scanned" diff --git a/functions/common/function-test-support/pom.xml b/functions/common/function-test-support/pom.xml index bca7a1f7..e5f67fe9 100644 --- a/functions/common/function-test-support/pom.xml +++ b/functions/common/function-test-support/pom.xml @@ -15,7 +15,7 @@ 2.7.0 - 1.1.1 + 1.2.0 diff --git a/functions/function/object-detection-function/pom.xml b/functions/function/object-detection-function/pom.xml index 6170a580..0ec4fdd4 100644 --- a/functions/function/object-detection-function/pom.xml +++ b/functions/function/object-detection-function/pom.xml @@ -17,16 +17,16 @@ 3.19.6 - - org.springframework.cloud.fn - tensorflow-common - ${project.version} - com.google.protobuf protobuf-java ${protobuf.version} + + org.springframework.cloud.fn + tensorflow-common + ${project.version} + diff --git a/functions/spring-functions-parent/pom.xml b/functions/spring-functions-parent/pom.xml index 899aa2b0..0a7bdb11 100644 --- a/functions/spring-functions-parent/pom.xml +++ b/functions/spring-functions-parent/pom.xml @@ -14,8 +14,15 @@ org.springframework.cloud.fn spring-functions-parent pom - + + 3.19.6 + + + com.google.protobuf + protobuf-java + ${protobuf.version} + org.springframework.cloud.fn config-common diff --git a/stream-applications-release-train/stream-applications-descriptor/pom.xml b/stream-applications-release-train/stream-applications-descriptor/pom.xml index cd9e65d7..862e0d35 100644 --- a/stream-applications-release-train/stream-applications-descriptor/pom.xml +++ b/stream-applications-release-train/stream-applications-descriptor/pom.xml @@ -30,14 +30,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0 - - false - - org.codehaus.gmavenplus gmavenplus-plugin