From 89fef89b9da39a9e79b937f2f3f0a9669f166130 Mon Sep 17 00:00:00 2001 From: Martin Nonnenmacher Date: Thu, 29 Aug 2024 16:27:29 +0200 Subject: [PATCH] ci(github): Remove an unnecessary outdated parameter The `gradle-home-cache-cleanup` parameter was renamed to `cache-cleanup` in v4 of the setup Gradle action and is now enabled by default [1]. [1]: https://github.com/gradle/actions/blob/main/docs/deprecation-upgrade-guide.md#the-gradle-home-cache-cleanup-input-parameter-has-been-replaced-by-cache-cleanup Signed-off-by: Martin Nonnenmacher --- .github/workflows/build-and-test.yml | 10 ---------- .github/workflows/docker-build.yml | 2 -- .github/workflows/release.yml | 2 -- .github/workflows/static-analysis.yml | 6 ------ .../nexus-iq/src/main/kotlin/NexusIqConfiguration.kt | 7 +++++-- 5 files changed, 5 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index e3302848dfff1..d357092bce413 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -21,8 +21,6 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - name: Setup Gradle uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4 - with: - gradle-home-cache-cleanup: true - name: Build all classes run: ./gradlew classes codeql-analysis: @@ -40,8 +38,6 @@ jobs: languages: java - name: Setup Gradle uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4 - with: - gradle-home-cache-cleanup: true - name: Build all classes run: ./gradlew -Dorg.gradle.jvmargs=-Xmx1g classes - name: Perform CodeQL Analysis @@ -54,8 +50,6 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - name: Setup Gradle uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4 - with: - gradle-home-cache-cleanup: true - name: Run unit tests run: ./gradlew --scan test jacocoTestReport - name: Create Test Summary @@ -105,8 +99,6 @@ jobs: pip install --no-cache-dir --constraint requirements.txt scancode-toolkit==$SCANCODE_VERSION - name: Setup Gradle uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4 - with: - gradle-home-cache-cleanup: true - name: Run functional tests that do not require external tools run: ./gradlew --scan -Ptests.exclude=org.ossreviewtoolkit.plugins.packagemanagers.* funTest jacocoFunTestReport - name: Create Test Summary @@ -140,8 +132,6 @@ jobs: cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/ort:cache - name: Setup Gradle uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4 - with: - gradle-home-cache-cleanup: true - name: Run functional tests that do require external tools run: | # Run the functional tests in the Docker container. diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 3790206a3fe5c..16ea5a034f398 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -28,8 +28,6 @@ jobs: uses: ./.github/actions/free-disk-space - name: Setup Gradle uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4 - with: - gradle-home-cache-cleanup: true - name: Get ORT version run: | ORT_VERSION=$(./gradlew -q properties --property version | sed -nr "s/version: (.+)/\1/p") diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8a4d7ee77943a..5c1a8fad33281 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,8 +31,6 @@ jobs: fetch-depth: 0 - name: Setup Gradle uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4 - with: - gradle-home-cache-cleanup: true - name: Publish to OSSRH env: ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.OSSRH_USERNAME }} diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 8cae1d8aca6d4..d25a31ab563b0 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -30,8 +30,6 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - name: Setup Gradle uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4 - with: - gradle-home-cache-cleanup: true - name: Check copyrights, license headers, and .gitattributes run: ./gradlew checkCopyrightsInNoticeFile checkLicenseHeaders checkGitAttributes completions: @@ -41,8 +39,6 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - name: Setup Gradle uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4 - with: - gradle-home-cache-cleanup: true - name: Generate completions run: | ./gradlew -q :cli:installDist @@ -72,8 +68,6 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - name: Setup Gradle uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707 # v4 - with: - gradle-home-cache-cleanup: true - name: Check for Detekt Issues run: ./gradlew detektAll - name: Upload SARIF File diff --git a/plugins/advisors/nexus-iq/src/main/kotlin/NexusIqConfiguration.kt b/plugins/advisors/nexus-iq/src/main/kotlin/NexusIqConfiguration.kt index f7666503502c5..d19fac0c753c3 100644 --- a/plugins/advisors/nexus-iq/src/main/kotlin/NexusIqConfiguration.kt +++ b/plugins/advisors/nexus-iq/src/main/kotlin/NexusIqConfiguration.kt @@ -19,6 +19,9 @@ package org.ossreviewtoolkit.plugins.advisors.nexusiq +import org.ossreviewtoolkit.plugins.api.OrtPluginOption +import org.ossreviewtoolkit.plugins.api.Secret + /** * The configuration for Nexus IQ as a security vulnerability provider. */ @@ -37,11 +40,11 @@ data class NexusIqConfiguration( * The username to use for authentication. If not both [username] and [password] are provided, authentication is * disabled. */ - val username: String?, + val username: Secret?, /** * The password to use for authentication. If not both [username] and [password] are provided, authentication is * disabled. */ - val password: String? + val password: Secret? )