diff --git a/.github/actions/install-trivy/action.yml b/.github/actions/install-trivy/action.yml index dd2602af..5c2f8007 100644 --- a/.github/actions/install-trivy/action.yml +++ b/.github/actions/install-trivy/action.yml @@ -7,4 +7,4 @@ runs: - name: 'Install Trivy' shell: bash run: | - curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.50.1 + curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.57.1 diff --git a/applications/processor/header-filter-processor/src/test/java/org/springframework/cloud/stream/app/processor/header/filter/HeaderFilterProcessorTests.java b/applications/processor/header-filter-processor/src/test/java/org/springframework/cloud/stream/app/processor/header/filter/HeaderFilterProcessorTests.java index bcef9b86..4378a257 100644 --- a/applications/processor/header-filter-processor/src/test/java/org/springframework/cloud/stream/app/processor/header/filter/HeaderFilterProcessorTests.java +++ b/applications/processor/header-filter-processor/src/test/java/org/springframework/cloud/stream/app/processor/header/filter/HeaderFilterProcessorTests.java @@ -19,7 +19,6 @@ package org.springframework.cloud.stream.app.processor.header.filter; import java.util.HashSet; import java.util.Set; -import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import org.springframework.boot.WebApplicationType; @@ -67,7 +66,6 @@ public class HeaderFilterProcessorTests { } } - @NotNull private static Set getNonReadOnlyHeaders(Message message) { var headers = new HashSet<>(message.getHeaders().keySet()); var accessor = new IntegrationMessageHeaderAccessor(message); diff --git a/applications/stream-applications-core/pom.xml b/applications/stream-applications-core/pom.xml index fbc80cf6..fd5733c6 100644 --- a/applications/stream-applications-core/pom.xml +++ b/applications/stream-applications-core/pom.xml @@ -17,13 +17,13 @@ 5.0.1-SNAPSHOT - 5.0.1-SNAPSHOT - 2.0.0-M1 + 5.0.1 + 2.0.0-M2 1.0.14 1.0.14 1.0.14 3.2.0 - 4.1.5 + 4.1.6 diff --git a/scan-folders.sh b/scan-folders.sh index 4083e574..00968dfa 100755 --- a/scan-folders.sh +++ b/scan-folders.sh @@ -4,19 +4,22 @@ SCDIR=$(realpath $SCDIR) if [ -f $SCDIR/runs.sarif ]; then rm $SCDIR/runs.sarif fi -export TRIVY_UPLOAD=true +TRIVY_UPLOAD=true while [ "$1" != "" ]; do if [ "$1" == "table" ]; then - export TRIVY_UPLOAD=false + TRIVY_UPLOAD=false fi shift done +export TRIVY_UPLOAD REAL_PATH=$(realpath $PWD) echo "Scanning in $REAL_PATH" find . -type d -name target -exec bash "$SCDIR/scan-jars.sh" '{}' \; -echo "{\"version\": \"2.1.0\", \"\$schema\": \"https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json\", \"runs\": [" > "$SCDIR/scan.sarif" -if [ -f "$SCDIR/runs.sarif" ]; then - cat "$SCDIR/runs.sarif" >> "$SCDIR/scan.sarif" -fi -echo "]}" >> "$SCDIR/scan.sarif" -echo "Created $SCDIR/scan.sarif" +if [ "$TRIVY_UPLOAD" = "true" ]; then + echo "{\"version\": \"2.1.0\", \"\$schema\": \"https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json\", \"runs\": [" > "$SCDIR/scan.sarif" + if [ -f "$SCDIR/runs.sarif" ]; then + cat "$SCDIR/runs.sarif" >> "$SCDIR/scan.sarif" + fi + echo "]}" >> "$SCDIR/scan.sarif" + echo "Created $SCDIR/scan.sarif" +fi \ No newline at end of file diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml index a225eeef..85706904 100644 --- a/stream-applications-build/pom.xml +++ b/stream-applications-build/pom.xml @@ -32,26 +32,24 @@ ${checkstyle.location}/nohttp-checkstyle.xml ${checkstyle.location}/checkstyle-suppressions.xml - 0.0.10 + 0.0.11 true - 0.0.35 - 3.3.1 - 6.1.10 - 2023.0.2 - 4.1.2 - 4.1.2 - 4.1.2 + 0.0.43 + 3.3.6 + 6.1.15 + 2023.0.4 + 4.1.5 + 4.1.4 + 4.1.4 1.19.8 5.15.0 - 4.0.21 + 4.0.24 2.5.2 3.1.0 - 3.1.1 - 3.0.7 5.5.0 1 1.26.2 - 2.9.0 + 3.17.0 ${env.BUILD_NAME} @@ -74,16 +72,16 @@ - - com.jayway.jsonpath - json-path - ${json-path.version} - org.apache.commons commons-compress ${commons-compress.version} + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + org.springframework spring-framework-bom @@ -135,13 +133,6 @@ ivy ${apache-ivy.version} - - io.awspring.cloud - spring-cloud-aws-dependencies - ${spring-cloud-aws.version} - pom - import -