diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 0429bbe1..83ed100a 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -129,11 +129,8 @@ jobs: - name: 'Action: Trivy scan' shell: bash run: | - echo "SKIPPING THIS FOR NOW - FIX ME!!!" -# ROOT_DIR=$(realpath $PWD) -# pushd stream-applications > /dev/null -# $ROOT_DIR/scan-folders.sh table -# popd > /dev/null + BUILD_DIR=$(realpath $MAIN_PATH) + $BUILD_DIR/scan-folders.sh table - name: 'Upload: Error logs' if: ${{ failure() }} uses: actions/upload-artifact@v3 diff --git a/applications/stream-applications-integration-tests/README.adoc b/applications/stream-applications-integration-tests/README.adoc index 38a3083a..af5137a4 100644 --- a/applications/stream-applications-integration-tests/README.adoc +++ b/applications/stream-applications-integration-tests/README.adoc @@ -27,16 +27,9 @@ Then we need to verify the result by checking the sink's external resource. To test a processor we publish a message and use an `OutputMatcher` to verify the output. == Configuration -See link:src/test/java/org/springframework/cloud/stream/apps/integration/test/common/Configuration.java[Configuration] for configuration +See link:src/test/java/org/springframework/cloud/stream/app/integration/test/common/Configuration.java[Configuration] for configuration options. These tests use Spring but not boot currently. The most important setting is the image versions to test. To override it, set the System property, e.g., -./mvnw clean test -Dspring.cloud.stream.applications.version=4.0.0-RC1 - - - - - - - +./mvnw clean test -Dspring.cloud.stream.applications.version=5.0.0-RC1 diff --git a/versions.json b/versions.json index 407559ec..a9325767 100644 --- a/versions.json +++ b/versions.json @@ -1,8 +1,8 @@ { - "release_version": "5.0.0-SNAPSHOT", + "release_version": "5.0.0-RC1", "next_dev_version": "5.0.0-SNAPSHOT", "release_train": { - "release_version": "2024.0.0-SNAPSHOT", + "release_version": "2024.0.0-RC1", "next_dev_version": "2024.0.0-SNAPSHOT" } }