release: v0.52.2 [release/v0.52] (#6896)

Co-authored-by: DmitriyLewen <91113035+DmitriyLewen@users.noreply.github.com>

.github/CODEOWNERS

@@ -15,8 +15,8 @@ pkg/cloud/                           @simar7 @nikpivkin
 pkg/iac/                             @simar7 @nikpivkin
 
 # Helm chart
-helm/trivy/ @afdesk
+helm/trivy/ @chen-keinan
 
 # Kubernetes scanning
-pkg/k8s/                         @afdesk
-docs/docs/target/kubernetes.md   @afdesk
+pkg/k8s/                         @chen-keinan
+docs/docs/target/kubernetes.md   @chen-keinan

.github/DISCUSSION_TEMPLATE/bugs.yml

@@ -116,7 +116,7 @@ body:
       label: Checklist
       description: Have you tried the following?
       options:
-        - label: Run `trivy clean --all`
+        - label: Run `trivy image --reset`
         - label: Read [the troubleshooting](https://aquasecurity.github.io/trivy/latest/docs/references/troubleshooting/)
   - type: markdown
     attributes:

.github/actions/trivy-triage/Makefile

@@ -1,3 +0,0 @@
-.PHONEY: test
-test: helpers.js helpers.test.js
-	node --test helpers.test.js

.github/actions/trivy-triage/action.yaml

@@ -1,29 +0,0 @@
-name: 'trivy-discussion-triage'
-description: 'automatic triage of Trivy discussions'
-inputs:
-  discussion_num:
-    description: 'Discussion number to triage'
-    required: false
-runs:
-  using: "composite"
-  steps:
-    - name: Conditionally label discussions based on category and content
-      env:
-        GH_TOKEN: ${{ github.token }}
-      uses: actions/github-script@v6
-      with:
-        script: |
-          const {detectDiscussionLabels, fetchDiscussion, labelDiscussion } = require('${{ github.action_path }}/helpers.js');
-          const config = require('${{ github.action_path }}/config.json');
-          discussionNum = parseInt(${{ inputs.discussion_num }});
-          let discussion;
-          if (discussionNum > 0) {
-              discussion = (await fetchDiscussion(github, context.repo.owner, context.repo.repo, discussionNum)).repository.discussion;
-          } else {
-              discussion = context.payload.discussion;
-          }
-          const labels = detectDiscussionLabels(discussion, config.discussionLabels);
-          if (labels.length > 0) {
-              console.log(`Adding labels ${labels} to discussion ${discussion.node_id}`);
-              labelDiscussion(github, discussion.node_id, labels);
-          }

.github/actions/trivy-triage/config.json

@@ -1,14 +0,0 @@
-{
-    "discussionLabels": {
-        "Container Image":"LA_kwDOCsUTCM75TTQU",
-        "Filesystem":"LA_kwDOCsUTCM75TTQX",
-        "Git Repository":"LA_kwDOCsUTCM75TTQk",
-        "Virtual Machine Image":"LA_kwDOCsUTCM8AAAABMpz1bw",
-        "Kubernetes":"LA_kwDOCsUTCM75TTQv",
-        "AWS":"LA_kwDOCsUTCM8AAAABMpz1aA",
-        "Vulnerability":"LA_kwDOCsUTCM75TTPa",
-        "Misconfiguration":"LA_kwDOCsUTCM75TTP8",
-        "License":"LA_kwDOCsUTCM77ztRR",
-        "Secret":"LA_kwDOCsUTCM75TTQL"
-    }
-}

.github/actions/trivy-triage/helpers.js

@@ -1,70 +0,0 @@
-module.exports = {
-    detectDiscussionLabels: (discussion, configDiscussionLabels) => {
-        res = [];
-        const discussionId = discussion.id;
-        const category = discussion.category.name;
-        const body = discussion.body;
-        if (category !== "Ideas") {
-            console.log(`skipping discussion with category ${category} and body ${body}`);
-            return [];
-        }
-        const scannerPattern = /### Scanner\n\n(.+)/;
-        const scannerFound = body.match(scannerPattern);
-        if (scannerFound && scannerFound.length > 1) {
-            res.push(configDiscussionLabels[scannerFound[1]]);
-        }
-        const targetPattern = /### Target\n\n(.+)/;
-        const targetFound = body.match(targetPattern);
-        if (targetFound && targetFound.length > 1) {
-            res.push(configDiscussionLabels[targetFound[1]]);
-        }
-        return res;
-    },
-    fetchDiscussion: async (github, owner, repo, discussionNum) => {
-        const query = `query Discussion ($owner: String!, $repo: String!, $discussion_num: Int!){
-            repository(name: $repo, owner: $owner) {
-                discussion(number: $discussion_num) {
-                    number,
-                    id,
-                    body,
-                    category {
-                        id,
-                        name
-                    },
-                    labels(first: 100) {
-                        edges {
-                            node {
-                                id,
-                                name
-                            }
-                        }
-                    }
-                }
-            }
-        }`;
-        const vars = {
-            owner: owner,
-            repo: repo,
-            discussion_num: discussionNum
-        };
-        return github.graphql(query, vars);
-    },
-    labelDiscussion: async (github, discussionId, labelIds) => {
-        const query = `mutation AddLabels($labelId: ID!, $labelableId:ID!) {
-            addLabelsToLabelable(
-                input: {labelIds: [$labelId], labelableId: $labelableId}
-            ) {
-                clientMutationId
-            }
-        }`;
-        // TODO: add all labels in one call
-        labelIds.forEach((labelId) => {
-            const vars = {
-                labelId: labelId,
-                labelableId: discussionId
-            };
-            github.graphql(query, vars);
-        });
-    }
-};
-

.github/actions/trivy-triage/helpers.test.js

@@ -1,87 +0,0 @@
-const assert = require('node:assert/strict');
-const { describe, it } = require('node:test');
-const {detectDiscussionLabels} = require('./helpers.js');
-
-const configDiscussionLabels = {
-  "Container Image":"ContainerImageLabel",
-  "Filesystem":"FilesystemLabel",
-  "Vulnerability":"VulnerabilityLabel",
-  "Misconfiguration":"MisconfigurationLabel",
-};
-
-describe('trivy-triage', async function() {
-  describe('detectDiscussionLabels', async function() {
-    it('detect scanner label', async function() {
-      const discussion = {
-        body: 'hello hello\nbla bla.\n### Scanner\n\nVulnerability\n### Target\n\nContainer Image\nbye bye.', 
-        category: {
-          name: 'Ideas'
-        }
-      };
-      const labels = detectDiscussionLabels(discussion, configDiscussionLabels);
-      assert(labels.includes('VulnerabilityLabel'));
-    });
-    it('detect target label', async function() {
-      const discussion = {
-        body: 'hello hello\nbla bla.\n### Scanner\n\nVulnerability\n### Target\n\nContainer Image\nbye bye.', 
-        category: {
-          name: 'Ideas'
-        }
-      };
-      const labels = detectDiscussionLabels(discussion, configDiscussionLabels);
-      assert(labels.includes('ContainerImageLabel'));
-    });
-    it('detect label when it is first', async function() {
-      const discussion = {
-        body: '### Scanner\n\nVulnerability\n### Target\n\nContainer Image\nbye bye.', 
-        category: {
-          name: 'Ideas'
-        }
-      };
-      const labels = detectDiscussionLabels(discussion, configDiscussionLabels);
-      assert(labels.includes('ContainerImageLabel'));
-    });
-    it('detect label when it is last', async function() {
-      const discussion = {
-        body: '### Scanner\n\nVulnerability\n### Target\n\nContainer Image', 
-        category: {
-          name: 'Ideas'
-        }
-      };
-      const labels = detectDiscussionLabels(discussion, configDiscussionLabels);
-      assert(labels.includes('ContainerImageLabel'));
-    });
-    it('detect scanner and target labels', async function() {
-      const discussion = {
-        body: 'hello hello\nbla bla.\n### Scanner\n\nVulnerability\n### Target\n\nContainer Image\nbye bye.', 
-        category: {
-          name: 'Ideas'
-        }
-      };
-      const labels = detectDiscussionLabels(discussion, configDiscussionLabels);
-      assert(labels.includes('ContainerImageLabel'));
-      assert(labels.includes('VulnerabilityLabel'));
-    });
-    it('not detect other labels', async function() {
-      const discussion = {
-        body: 'hello hello\nbla bla.\n### Scanner\n\nVulnerability\n### Target\n\nContainer Image\nbye bye.', 
-        category: {
-          name: 'Ideas'
-        }
-      };
-      const labels = detectDiscussionLabels(discussion, configDiscussionLabels);
-      assert(!labels.includes('FilesystemLabel'));
-      assert(!labels.includes('MisconfigurationLabel'));
-    });
-    it('process only relevant categories', async function() {
-      const discussion = {
-        body: 'hello world', 
-        category: {
-          name: 'Announcements'
-        }
-      };
-      const labels = detectDiscussionLabels(discussion, configDiscussionLabels);
-      assert(labels.length === 0);
-    });
-  });
-});

.github/actions/trivy-triage/testutils/discussion-payload-sample.json

@@ -1,65 +0,0 @@
-{
-    "active_lock_reason": null,
-    "answer_chosen_at": null,
-    "answer_chosen_by": null,
-    "answer_html_url": null,
-    "author_association": "OWNER",
-    "body": "### Description\n\nlfdjs lfkdj dflsakjfd ';djk \r\nfadfd \r\nasdlkf \r\na;df \r\ndfsal;kfd ;akjl\n\n### Target\n\nContainer Image\n\n### Scanner\n\nMisconfiguration",
-    "category": {
-      "created_at": "2023-07-02T10:14:46.000+03:00",
-      "description": "Share ideas for new features",
-      "emoji": ":bulb:",
-      "id": 39743708,
-      "is_answerable": false,
-      "name": "Ideas",
-      "node_id": "DIC_kwDOE0GiPM4CXnDc",
-      "repository_id": 323068476,
-      "slug": "ideas",
-      "updated_at": "2023-07-02T10:14:46.000+03:00"
-    },
-    "comments": 0,
-    "created_at": "2023-09-11T08:40:11Z",
-    "html_url": "https://github.com/itaysk/testactions/discussions/9",
-    "id": 5614504,
-    "locked": false,
-    "node_id": "D_kwDOE0GiPM4AVauo",
-    "number": 9,
-    "reactions": {
-      "+1": 0,
-      "-1": 0,
-      "confused": 0,
-      "eyes": 0,
-      "heart": 0,
-      "hooray": 0,
-      "laugh": 0,
-      "rocket": 0,
-      "total_count": 0,
-      "url": "https://api.github.com/repos/itaysk/testactions/discussions/9/reactions"
-    },
-    "repository_url": "https://api.github.com/repos/itaysk/testactions",
-    "state": "open",
-    "state_reason": null,
-    "timeline_url": "https://api.github.com/repos/itaysk/testactions/discussions/9/timeline",
-    "title": "Title title",
-    "updated_at": "2023-09-11T08:40:11Z",
-    "user": {
-      "avatar_url": "https://avatars.githubusercontent.com/u/1161307?v=4",
-      "events_url": "https://api.github.com/users/itaysk/events{/privacy}",
-      "followers_url": "https://api.github.com/users/itaysk/followers",
-      "following_url": "https://api.github.com/users/itaysk/following{/other_user}",
-      "gists_url": "https://api.github.com/users/itaysk/gists{/gist_id}",
-      "gravatar_id": "",
-      "html_url": "https://github.com/itaysk",
-      "id": 1161307,
-      "login": "itaysk",
-      "node_id": "MDQ6VXNlcjExNjEzMDc=",
-      "organizations_url": "https://api.github.com/users/itaysk/orgs",
-      "received_events_url": "https://api.github.com/users/itaysk/received_events",
-      "repos_url": "https://api.github.com/users/itaysk/repos",
-      "site_admin": false,
-      "starred_url": "https://api.github.com/users/itaysk/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/itaysk/subscriptions",
-      "type": "User",
-      "url": "https://api.github.com/users/itaysk"
-    }
-}

.github/actions/trivy-triage/testutils/fetchDiscussion.sh

@@ -1,29 +0,0 @@
-#! /bin/bash
-# fetch discussion by discussion number
-# requires authenticated gh cli, assumes repo but current git repository
-# args:
-#   $1: discussion number, e.g 123, required
-
-discussion_num="$1"
-gh api graphql -F discussion_num="$discussion_num" -F repo="{repo}" -F owner="{owner}" -f query='
-    query Discussion ($owner: String!, $repo: String!, $discussion_num: Int!){
-    repository(name: $repo, owner: $owner) {
-        discussion(number: $discussion_num) {
-        number,
-        id,
-        body,
-        category {
-            id,
-            name
-        },
-        labels(first: 100) {
-            edges {
-            node {
-                id,
-                name
-            }
-            }
-        }
-        }
-    }
-    }'

.github/actions/trivy-triage/testutils/fetchLabels.sh

@@ -1,16 +0,0 @@
-#! /bin/bash
-# fetch labels and their IDs
-# requires authenticated gh cli, assumes repo but current git repository
-
-gh api graphql -F repo="{repo}" -F owner="{owner}" -f query='
-    query GetLabelIds($owner: String!, $repo: String!) {
-    repository(name: $repo, owner: $owner) {
-        id
-        labels(first: 100) {
-        nodes {
-            id
-            name
-        }
-        }
-    }
-    }'

.github/actions/trivy-triage/testutils/labelDiscussion.sh

@@ -1,16 +0,0 @@
-#! /bin/bash
-# add a label to a discussion
-# requires authenticated gh cli, assumes repo but current git repository
-# args:
-#   $1: discussion ID (not number!), e.g DIC_kwDOE0GiPM4CXnDc, required
-#   $2: label ID, e.g. MDU6TGFiZWwzNjIzNjY0MjQ=, required
-discussion_id="$1"
-label_id="$2"
-gh api graphql -F labelableId="$discussion_id" -F labelId="$label_id" -F repo="{repo}" -F owner="{owner}" -f query='
-        mutation AddLabels($labelId: ID!, $labelableId:ID!) {
-            addLabelsToLabelable(
-                input: {labelIds: [$labelId], labelableId: $labelableId}
-            ) {
-                clientMutationId
-            }
-        }'

.github/dependabot.yml

@@ -21,8 +21,6 @@ updates:
     directory: /
     schedule:
       interval: weekly
-    ignore:
-      - dependency-name: "github.com/aquasecurity/trivy-*" ## `trivy-*` dependencies are updated manually
     groups:
       aws:
         patterns:
@@ -35,7 +33,5 @@ updates:
         patterns:
           - "github.com/testcontainers/*"
       common:
-        exclude-patterns:
-          - "github.com/aquasecurity/trivy-*"
         patterns:
           - "*"

.github/workflows/auto-update-labels.yaml

@@ -20,7 +20,6 @@ jobs:
         with:
           # cf. https://github.com/aquasecurity/trivy/pull/6711
           go-version: ${{ env.GO_VERSION }}
-          cache: false
 
       - name: Install aqua tools
         uses: aquaproj/aqua-installer@v3.0.1

.github/workflows/backport.yaml

@@ -1,58 +0,0 @@
-name: Automatic Backporting
-
-on:
-  issue_comment:
-    types: [created]
-
-jobs:
-  check_permission:
-    name: Check comment author permissions
-    runs-on: ubuntu-latest
-    outputs:
-      is_maintainer: ${{ steps.check_permission.outputs.is_maintainer }}
-    steps:
-      - name: Check permission
-        id: check_permission
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          PERMISSION=$(gh api /repos/${{ github.repository }}/collaborators/${{ github.actor }}/permission --jq '.permission')
-          if [ "$PERMISSION" == "admin" ] || [ "$PERMISSION" == "write" ]; then
-           echo "is_maintainer=true" >> $GITHUB_OUTPUT
-          else
-           echo "is_maintainer=false" >> $GITHUB_OUTPUT
-          fi
-  
-
-  backport:
-    name: Backport PR
-    needs: check_permission # run this job after checking permissions
-    if: |
-      needs.check_permission.outputs.is_maintainer == 'true' &&      
-      github.event.issue.pull_request &&
-      github.event.issue.pull_request.merged_at != null &&
-      startsWith(github.event.comment.body, '@aqua-bot backport release/')
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Extract branch name
-        run: |
-          BRANCH_NAME=$(echo ${{ github.event.comment.body }} | grep -oE '@aqua-bot backport\s+(\S+)' | awk '{print $3}')
-          echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
-
-      - name: Set up Git user
-        run: |
-          git config --global user.email "actions@github.com"
-          git config --global user.name "GitHub Actions"
-
-      - name: Run backport script
-        run: ./misc/backport/backport.sh ${{ env.BRANCH_NAME }} ${{ github.event.issue.number }}
-        env:
-          # Use ORG_REPO_TOKEN instead of GITHUB_TOKEN
-          # This allows the created PR to trigger tests and other workflows
-          GITHUB_TOKEN: ${{ secrets.ORG_REPO_TOKEN }}

.github/workflows/bypass-test.yaml

@@ -8,26 +8,24 @@ on:
       - 'docs/**'
       - 'mkdocs.yml'
       - 'LICENSE'
-      - '.release-please-manifest.json'
   pull_request:
     paths:
       - '**.md'
       - 'docs/**'
       - 'mkdocs.yml'
       - 'LICENSE'
-      - '.release-please-manifest.json'
 jobs:
   test:
     name: Test
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+        operating-system: [ubuntu-latest-m, windows-latest, macos-latest]
     steps:
       - run: 'echo "No test required"'
 
   integration:
     name: Integration Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-m
     steps:
       - run: 'echo "No test required"'

.github/workflows/cache-test-images.yaml

@@ -1,86 +0,0 @@
-name: Cache test images
-on:
-  schedule:
-    - cron: "0 0 * * *" # Run this workflow every day at 00:00 to avoid cache deletion.
-  workflow_dispatch:
-
-jobs:
-  test-images:
-    name: Cache test images
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4.1.6
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-          cache: false
-
-      - name: Install tools
-        uses: aquaproj/aqua-installer@v3.0.1
-        with:
-          aqua_version: v1.25.0
-
-      - name: Generate image list digest
-        if: github.ref_name == 'main'
-        id: image-digest
-        run: |
-          IMAGE_LIST=$(skopeo list-tags docker://ghcr.io/aquasecurity/trivy-test-images)
-          DIGEST=$(echo "$IMAGE_LIST" | sha256sum | cut -d' ' -f1)
-          echo "digest=$DIGEST" >> $GITHUB_OUTPUT
-
-      ## We need to work with test image cache only for main branch
-      - name: Restore and save test images cache
-        if: github.ref_name == 'main'
-        uses: actions/cache@v4
-        with:
-          path: integration/testdata/fixtures/images
-          key: cache-test-images-${{ steps.image-digest.outputs.digest }}
-          restore-keys:
-            cache-test-images-
-
-      - name: Download test images
-        if: github.ref_name == 'main'
-        run: mage test:fixtureContainerImages
-
-  test-vm-images:
-    name: Cache test VM images
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4.1.6
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-          cache: false
-
-      - name: Install tools
-        uses: aquaproj/aqua-installer@v3.0.1
-        with:
-          aqua_version: v1.25.0
-
-      - name: Generate image list digest
-        if: github.ref_name == 'main'
-        id: image-digest
-        run: |
-          IMAGE_LIST=$(skopeo list-tags docker://ghcr.io/aquasecurity/trivy-test-vm-images)
-          DIGEST=$(echo "$IMAGE_LIST" | sha256sum | cut -d' ' -f1)
-          echo "digest=$DIGEST" >> $GITHUB_OUTPUT
-
-      ## We need to work with test VM image cache only for main branch
-      - name: Restore and save test VM images cache
-        if: github.ref_name == 'main'
-        uses: actions/cache@v4
-        with:
-          path: integration/testdata/fixtures/vm-images
-          key: cache-test-vm-images-${{ steps.image-digest.outputs.digest }}
-          restore-keys:
-            cache-test-vm-images-
-
-      - name: Download test VM images
-        if: github.ref_name == 'main'
-        run: mage test:fixtureVMImages

.github/workflows/release-please.yaml

@@ -50,13 +50,12 @@ jobs:
         run: |
           echo "version=$( echo "${{ github.event.head_commit.message }}" | sed 's/^release: v\([0-9]\+\.[0-9]\+\.[0-9]\+\).*$/\1/' )" >> $GITHUB_OUTPUT
           echo "pr_number=$( echo "${{ github.event.head_commit.message }}" | sed 's/.*(\#\([0-9]\+\)).*$/\1/' )" >> $GITHUB_OUTPUT
-          echo "release_branch=release/v$( echo "${{ github.event.head_commit.message }}" | sed 's/^release: v\([0-9]\+\.[0-9]\+\).*$/\1/' )" >> $GITHUB_OUTPUT
 
       - name: Tag release
         if: ${{ steps.extract_info.outputs.version }}
         uses: actions/github-script@v7
         with:
-          github-token: ${{ secrets.ORG_REPO_TOKEN }} # To trigger another workflow
+          github-token: ${{ secrets.ORG_REPO_TOKEN }}
           script: |
             await github.rest.git.createRef({
               owner: context.repo.owner,
@@ -65,32 +64,6 @@ jobs:
               sha: context.sha
             });
 
-      # When v0.50.0 is released, a release branch "release/v0.50" is created.
-      - name: Create release branch for patch versions
-        if: ${{ endsWith(steps.extract_info.outputs.version, '.0') }}
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }} # Should not trigger the workflow again
-          script: |
-            const releaseBranch = '${{ steps.extract_info.outputs.release_branch }}';
-            await github.rest.git.createRef({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              ref: `refs/heads/${releaseBranch}`,
-              sha: context.sha
-            });
-      
-
-      # Add release branch to rulesets to enable merge queue
-      - name: Add release branch to rulesets
-        if: ${{ endsWith(steps.extract_info.outputs.version, '.0') }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.ORG_REPO_TOKEN }}
-        shell: bash
-        run: |
-          RULESET_ID=$(gh api /repos/${{ github.repository }}/rulesets --jq '.[] | select(.name=="release") | .id')
-          gh api /repos/${{ github.repository }}/rulesets/$RULESET_ID | jq '{conditions}' | jq '.conditions.ref_name.include += ["refs/heads/${{ steps.extract_info.outputs.release_branch }}"]' | gh api --method put --input - /repos/${{ github.repository }}/rulesets/$RULESET_ID
-
       # Since skip-github-release is specified, googleapis/release-please-action doesn't delete the label from PR.
       # This label prevents the subsequent PRs from being created. Therefore, we need to delete it ourselves.
       # cf. https://github.com/googleapis/release-please?tab=readme-ov-file#release-please-bot-does-not-create-a-release-pr-why
@@ -98,7 +71,7 @@ jobs:
         if: ${{ steps.extract_info.outputs.pr_number }}
         uses: actions/github-script@v7
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: ${{ secrets.ORG_REPO_TOKEN }}
           script: |
             const prNumber = parseInt('${{ steps.extract_info.outputs.pr_number }}', 10);
             github.rest.issues.removeLabel({

.github/workflows/reusable-release.yaml

@@ -91,7 +91,7 @@ jobs:
       - name: GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:
-          version: v2.1.0
+          version: v2.0.0
           args: release -f=${{ inputs.goreleaser_config}} ${{ inputs.goreleaser_options}}
         env:
           GITHUB_TOKEN: ${{ secrets.ORG_REPO_TOKEN }}
@@ -108,7 +108,7 @@ jobs:
       # because GoReleaser Free doesn't support pushing images with the `--snapshot` flag.
       - name: Build and push
         if: ${{ inputs.goreleaser_config == 'goreleaser-canary.yml' }}
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64, linux/arm64
           file: ./Dockerfile.canary # path to Dockerfile

.github/workflows/roadmap.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # 'kind/feature' AND 'priority/backlog' labels -> 'Backlog' column
-      - uses: actions/add-to-project@v1.0.2 # add new issue to project
+      - uses: actions/add-to-project@v1.0.1 # add new issue to project
         with:
           project-url: https://github.com/orgs/aquasecurity/projects/25
           github-token: ${{ secrets.ORG_PROJECT_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
           field-values: Backlog
 
       # 'kind/feature' AND 'priority/important-longterm' labels -> 'Important (long-term)' column
-      - uses: actions/add-to-project@v1.0.2 # add new issue to project
+      - uses: actions/add-to-project@v1.0.1 # add new issue to project
         with:
           project-url: https://github.com/orgs/aquasecurity/projects/25
           github-token: ${{ secrets.ORG_PROJECT_TOKEN }}
@@ -45,7 +45,7 @@ jobs:
           field-values: Important (long-term)
 
       # 'kind/feature' AND 'priority/important-soon' labels -> 'Important (soon)' column
-      - uses: actions/add-to-project@v1.0.2 # add new issue to project
+      - uses: actions/add-to-project@v1.0.1 # add new issue to project
         with:
           project-url: https://github.com/orgs/aquasecurity/projects/25
           github-token: ${{ secrets.ORG_PROJECT_TOKEN }}
@@ -62,7 +62,7 @@ jobs:
           field-values: Important (soon)
 
       # 'kind/feature' AND 'priority/critical-urgent' labels -> 'Urgent' column
-      - uses: actions/add-to-project@v1.0.2 # add new issue to project
+      - uses: actions/add-to-project@v1.0.1 # add new issue to project
         with:
           project-url: https://github.com/orgs/aquasecurity/projects/25
           github-token: ${{ secrets.ORG_PROJECT_TOKEN }}

.github/workflows/semantic-pr.yaml

@@ -29,6 +29,7 @@ jobs:
             chore
             revert
             release
+            BREAKING
 
           scopes: |
             vuln

.github/workflows/test.yaml

@@ -6,10 +6,7 @@ on:
       - 'docs/**'
       - 'mkdocs.yml'
       - 'LICENSE'
-      - '.release-please-manifest.json' ## don't run tests for release-please PRs
   merge_group:
-  workflow_dispatch:
-
 env:
   GO_VERSION: '1.22'
 jobs:
@@ -18,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+        operating-system: [ubuntu-latest-m, windows-latest, macos-latest]
     steps:
       - uses: actions/checkout@v4.1.6
 
@@ -26,8 +23,6 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
-          cache: false
-
       - name: go mod tidy
         run: |
           go mod tidy
@@ -35,15 +30,15 @@ jobs:
             echo "Run 'go mod tidy' and push it"
             exit 1
           fi
-        if: matrix.operating-system == 'ubuntu-latest'
+        if: matrix.operating-system == 'ubuntu-latest-m'
 
       - name: Lint
         id: lint
         uses: golangci/golangci-lint-action@v6.0.1
         with:
-          version: v1.59
+          version: v1.58
           args: --verbose --out-format=line-number
-        if: matrix.operating-system == 'ubuntu-latest'
+        if: matrix.operating-system == 'ubuntu-latest-m'
 
       - name: Check if linter failed
         run: |
@@ -64,14 +59,14 @@ jobs:
             echo "Run 'mage docs:generate' and push it"
             exit 1
           fi
-        if: matrix.operating-system == 'ubuntu-latest'
+        if: matrix.operating-system == 'ubuntu-latest-m'
 
       - name: Run unit tests
         run: mage test:unit
 
   integration:
     name: Integration Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-m
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4.1.6
@@ -80,34 +75,18 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
-          cache: false
 
       - name: Install tools
         uses: aquaproj/aqua-installer@v3.0.1
         with:
           aqua_version: v1.25.0
 
-      - name: Generate image list digest
-        id: image-digest
-        run: |
-          IMAGE_LIST=$(skopeo list-tags docker://ghcr.io/aquasecurity/trivy-test-images)
-          DIGEST=$(echo "$IMAGE_LIST" | sha256sum | cut -d' ' -f1)
-          echo "digest=$DIGEST" >> $GITHUB_OUTPUT
-
-      - name: Restore test images from cache
-        uses: actions/cache/restore@v4
-        with:
-          path: integration/testdata/fixtures/images
-          key: cache-test-images-${{ steps.image-digest.outputs.digest }}
-          restore-keys:
-            cache-test-images-
-
       - name: Run integration tests
         run: mage test:integration
 
   k8s-integration:
     name: K8s Integration Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-m
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4.1.6
@@ -116,7 +95,6 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
-          cache: false
 
       - name: Install tools
         uses: aquaproj/aqua-installer@v3.0.1
@@ -137,28 +115,12 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
-          cache: false
 
       - name: Install tools
         uses: aquaproj/aqua-installer@v3.0.1
         with:
           aqua_version: v1.25.0
 
-      - name: Generate image list digest
-        id: image-digest
-        run: |
-          IMAGE_LIST=$(skopeo list-tags docker://ghcr.io/aquasecurity/trivy-test-images)
-          DIGEST=$(echo "$IMAGE_LIST" | sha256sum | cut -d' ' -f1)
-          echo "digest=$DIGEST" >> $GITHUB_OUTPUT
-
-      - name: Restore test images from cache
-        uses: actions/cache/restore@v4
-        with:
-          path: integration/testdata/fixtures/images
-          key: cache-test-images-${{ steps.image-digest.outputs.digest }}
-          restore-keys:
-            cache-test-images-
-
       - name: Run module integration tests
         shell: bash
         run: |
@@ -166,7 +128,7 @@ jobs:
 
   vm-test:
     name: VM Integration Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-m
     steps:
       - name: Checkout
         uses: actions/checkout@v4.1.6
@@ -175,28 +137,10 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
-          cache: false
-
       - name: Install tools
         uses: aquaproj/aqua-installer@v3.0.1
         with:
           aqua_version: v1.25.0
-
-      - name: Generate image list digest
-        id: image-digest
-        run: |
-          IMAGE_LIST=$(skopeo list-tags docker://ghcr.io/aquasecurity/trivy-test-vm-images)
-          DIGEST=$(echo "$IMAGE_LIST" | sha256sum | cut -d' ' -f1)
-          echo "digest=$DIGEST" >> $GITHUB_OUTPUT
-
-      - name: Restore test VM images from cache
-        uses: actions/cache/restore@v4
-        with:
-          path: integration/testdata/fixtures/vm-images
-          key: cache-test-vm-images-${{ steps.image-digest.outputs.digest }}
-          restore-keys:
-            cache-test-vm-images-
-
       - name: Run vm integration tests
         run: |
           mage test:vm
@@ -206,7 +150,7 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+        operating-system: [ubuntu-latest-m, windows-latest, macos-latest]
     env:
       DOCKER_CLI_EXPERIMENTAL: "enabled"
     steps:
@@ -217,7 +161,6 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GO_VERSION }}
-        cache: false
 
     - name: Determine GoReleaser ID
       id: goreleaser_id
@@ -234,5 +177,5 @@ jobs:
     - name: Run GoReleaser
       uses: goreleaser/goreleaser-action@v6
       with:
-        version: v2.1.0
+        version: v2.0.0
         args: build --snapshot --clean --timeout 90m ${{ steps.goreleaser_id.outputs.id }}

.github/workflows/triage.yaml

@@ -1,16 +0,0 @@
-name: Triage Discussion
-on:
-  discussion:
-    types: [created]
-  workflow_dispatch:
-    inputs:
-      discussion_num:
-        required: true
-jobs:
-  label:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/trivy-triage
-        with:
-          discussion_num: ${{ github.event.inputs.discussion_num }}

.gitignore

@@ -39,6 +39,3 @@ dist
 # Signing
 gpg.key
 cmd/trivy/trivy
-
-# RPM
-*.rpm

.golangci.yaml

@@ -1,14 +1,4 @@
 linters-settings:
-  depguard:
-    rules:
-      main:
-        list-mode: lax
-        deny:
-          # Cannot use gomodguard, which examines go.mod, as "golang.org/x/exp/slices" is not a module and doesn't appear in go.mod.
-          - pkg: "golang.org/x/exp/slices"
-            desc: "Use 'slices' instead"
-          - pkg: "golang.org/x/exp/maps"
-            desc: "Use 'maps' or 'github.com/samber/lo' instead"
   dupl:
     threshold: 100
   errcheck:
@@ -84,11 +74,13 @@ linters-settings:
     ignore-generated-header: true
   testifylint:
     enable-all: true
+    disable:
+      - float-compare
+
 linters:
   disable-all: true
   enable:
     - bodyclose
-    - depguard
     - gci
     - goconst
     - gocritic

.release-please-manifest.json

@@ -1 +1 @@
-{".":"0.56.1"}
+{".":"0.52.2"}

.vex/oci.openvex.json

@@ -1,244 +0,0 @@
-{
-  "@context": "https://openvex.dev/ns/v0.2.0",
-  "@id": "https://openvex.dev/docs/public/vex-8e30ed756ae8e4196af93bf43edf68360f396a98c0268787453a3443b26e7d6c",
-  "author": "Aqua Security",
-  "timestamp": "2024-07-10T12:17:44.60495+04:00",
-  "version": 1,
-  "statements": [
-    {
-      "vulnerability": {
-        "name": "CVE-2023-42363"
-      },
-      "products": [
-        {
-          "@id": "pkg:oci/trivy?repository_url=index.docker.io%2Faquasec%2Ftrivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/busybox"},
-            {"@id": "pkg:apk/alpine/busybox-binsh"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        },
-        {
-          "@id": "pkg:oci/trivy?repository_url=public.ecr.aws%2Faquasecurity%2Ftrivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/busybox"},
-            {"@id": "pkg:apk/alpine/busybox-binsh"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        },
-        {
-          "@id": "pkg:oci/trivy?repository_url=ghcr.io/aquasecurity/trivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/busybox"},
-            {"@id": "pkg:apk/alpine/busybox-binsh"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_cannot_be_controlled_by_adversary",
-      "impact_statement": "awk is not used"
-    },
-    {
-      "vulnerability": {
-        "name": "CVE-2023-42364"
-      },
-      "products": [
-        {
-          "@id": "pkg:oci/trivy?repository_url=index.docker.io%2Faquasec%2Ftrivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/busybox"},
-            {"@id": "pkg:apk/alpine/busybox-binsh"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        },
-        {
-          "@id": "pkg:oci/trivy?repository_url=public.ecr.aws%2Faquasecurity%2Ftrivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/busybox"},
-            {"@id": "pkg:apk/alpine/busybox-binsh"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        },
-        {
-          "@id": "pkg:oci/trivy?repository_url=ghcr.io/aquasecurity/trivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/busybox"},
-            {"@id": "pkg:apk/alpine/busybox-binsh"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_cannot_be_controlled_by_adversary",
-      "impact_statement": "awk is not used"
-    },
-    {
-      "vulnerability": {
-        "name": "CVE-2023-42365"
-      },
-      "products": [
-        {
-          "@id": "pkg:oci/trivy?repository_url=index.docker.io%2Faquasec%2Ftrivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/busybox"},
-            {"@id": "pkg:apk/alpine/busybox-binsh"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        },
-        {
-          "@id": "pkg:oci/trivy?repository_url=public.ecr.aws%2Faquasecurity%2Ftrivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/busybox"},
-            {"@id": "pkg:apk/alpine/busybox-binsh"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        },
-        {
-          "@id": "pkg:oci/trivy?repository_url=ghcr.io/aquasecurity/trivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/busybox"},
-            {"@id": "pkg:apk/alpine/busybox-binsh"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_cannot_be_controlled_by_adversary",
-      "impact_statement": "awk is not used"
-    },
-    {
-      "vulnerability": {
-        "name": "CVE-2023-42366"
-      },
-      "products": [
-        {
-          "@id": "pkg:oci/trivy?repository_url=index.docker.io%2Faquasec%2Ftrivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/busybox"},
-            {"@id": "pkg:apk/alpine/busybox-binsh"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        },
-        {
-          "@id": "pkg:oci/trivy?repository_url=public.ecr.aws%2Faquasecurity%2Ftrivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/busybox"},
-            {"@id": "pkg:apk/alpine/busybox-binsh"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        },
-        {
-          "@id": "pkg:oci/trivy?repository_url=ghcr.io/aquasecurity/trivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/busybox"},
-            {"@id": "pkg:apk/alpine/busybox-binsh"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_cannot_be_controlled_by_adversary",
-      "impact_statement": "awk is not used"
-    },
-    {
-      "vulnerability": {
-        "name": "CVE-2024-4741"
-      },
-      "products": [
-        {
-          "@id": "pkg:oci/trivy?repository_url=index.docker.io%2Faquasec%2Ftrivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/libcrypto3"},
-            {"@id": "pkg:apk/alpine/libssl3"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        },
-        {
-          "@id": "pkg:oci/trivy?repository_url=public.ecr.aws%2Faquasecurity%2Ftrivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/libcrypto3"},
-            {"@id": "pkg:apk/alpine/libssl3"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        },
-        {
-          "@id": "pkg:oci/trivy?repository_url=ghcr.io/aquasecurity/trivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/libcrypto3"},
-            {"@id": "pkg:apk/alpine/libssl3"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_cannot_be_controlled_by_adversary",
-      "impact_statement": "openssl is not used"
-    },
-    {
-      "vulnerability": {
-        "name": "CVE-2024-5535"
-      },
-      "products": [
-        {
-          "@id": "pkg:oci/trivy?repository_url=index.docker.io%2Faquasec%2Ftrivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/libcrypto3"},
-            {"@id": "pkg:apk/alpine/libssl3"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        },
-        {
-          "@id": "pkg:oci/trivy?repository_url=public.ecr.aws%2Faquasecurity%2Ftrivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/libcrypto3"},
-            {"@id": "pkg:apk/alpine/libssl3"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        },
-        {
-          "@id": "pkg:oci/trivy?repository_url=ghcr.io/aquasecurity/trivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/libcrypto3"},
-            {"@id": "pkg:apk/alpine/libssl3"},
-            {"@id": "pkg:apk/alpine/ssl_client"}
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_cannot_be_controlled_by_adversary",
-      "impact_statement": "openssl is not used"
-    },
-    {
-      "vulnerability": {
-        "name": "CVE-2024-6119"
-      },
-      "products": [
-        {
-          "@id": "pkg:oci/trivy?repository_url=index.docker.io%2Faquasec%2Ftrivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/libcrypto3"},
-            {"@id": "pkg:apk/alpine/libssl3"}
-          ]
-        },
-        {
-          "@id": "pkg:oci/trivy?repository_url=public.ecr.aws%2Faquasecurity%2Ftrivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/libcrypto3"},
-            {"@id": "pkg:apk/alpine/libssl3"}
-          ]
-        },
-        {
-          "@id": "pkg:oci/trivy?repository_url=ghcr.io/aquasecurity/trivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/libcrypto3"},
-            {"@id": "pkg:apk/alpine/libssl3"}
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_cannot_be_controlled_by_adversary",
-      "impact_statement": "openssl is not used"
-    }
-  ]
-}

.vex/trivy.openvex.json

@@ -1,545 +0,0 @@
-{
-  "@context": "https://openvex.dev/ns/v0.2.0",
-  "@id": "aquasecurity/trivy:613fd55abbc2857b5ca28b07a26f3cd4c8b0ddc4c8a97c57497a2d4c4880d7fc",
-  "author": "Aqua Security",
-  "timestamp": "2024-07-09T11:38:00.115697+04:00",
-  "version": 1,
-  "tooling": "https://github.com/aquasecurity/trivy/tree/main/magefiles/vex.go",
-  "statements": [
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2024-2575",
-        "name": "GO-2024-2575",
-        "description": "Helm's Missing YAML Content Leads To Panic in helm.sh/helm/v3",
-        "aliases": [
-          "CVE-2024-26147",
-          "GHSA-r53h-jv2g-vpx6"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/helm.sh/helm/v3",
-              "identifiers": {
-                "purl": "pkg:golang/helm.sh/helm/v3"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_in_execute_path",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2023-1765",
-        "name": "GO-2023-1765",
-        "description": "Leaked shared secret and weak blinding in github.com/cloudflare/circl",
-        "aliases": [
-          "CVE-2023-1732",
-          "GHSA-2q89-485c-9j2x"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/github.com/cloudflare/circl",
-              "identifiers": {
-                "purl": "pkg:golang/github.com/cloudflare/circl"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_present",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2024-2512",
-        "name": "GO-2024-2512",
-        "description": "Classic builder cache poisoning in github.com/docker/docker",
-        "aliases": [
-          "CVE-2024-24557",
-          "GHSA-xw73-rw38-6vjc"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/github.com/docker/docker",
-              "identifiers": {
-                "purl": "pkg:golang/github.com/docker/docker"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_present",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2024-2453",
-        "name": "GO-2024-2453",
-        "description": "Timing side channel in github.com/cloudflare/circl",
-        "aliases": [
-          "GHSA-9763-4f94-gfch"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/github.com/cloudflare/circl",
-              "identifiers": {
-                "purl": "pkg:golang/github.com/cloudflare/circl"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_present",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2023-2048",
-        "name": "GO-2023-2048",
-        "description": "Paths outside of the rootfs could be produced on Windows in github.com/cyphar/filepath-securejoin",
-        "aliases": [
-          "GHSA-6xv5-86q9-7xr8"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/github.com/cyphar/filepath-securejoin",
-              "identifiers": {
-                "purl": "pkg:golang/github.com/cyphar/filepath-securejoin"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_in_execute_path",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2024-2497",
-        "name": "GO-2024-2497",
-        "description": "Privilege escalation in github.com/moby/buildkit",
-        "aliases": [
-          "CVE-2024-23653",
-          "GHSA-wr6v-9f75-vh2g"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/github.com/moby/buildkit",
-              "identifiers": {
-                "purl": "pkg:golang/github.com/moby/buildkit"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_present",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2023-2102",
-        "name": "GO-2023-2102",
-        "description": "HTTP/2 rapid reset can cause excessive work in net/http",
-        "aliases": [
-          "CVE-2023-39325",
-          "GHSA-4374-p667-p6c8"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/golang.org/x/net",
-              "identifiers": {
-                "purl": "pkg:golang/golang.org/x/net"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_in_execute_path",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2024-2493",
-        "name": "GO-2024-2493",
-        "description": "Host system file access in github.com/moby/buildkit",
-        "aliases": [
-          "CVE-2024-23651",
-          "GHSA-m3r6-h7wv-7xxv"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/github.com/moby/buildkit",
-              "identifiers": {
-                "purl": "pkg:golang/github.com/moby/buildkit"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_present",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2024-2491",
-        "name": "GO-2024-2491",
-        "description": "Container breakout through process.cwd trickery and leaked fds in github.com/opencontainers/runc",
-        "aliases": [
-          "CVE-2024-21626",
-          "GHSA-xr7r-f8xq-vfvv"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/github.com/opencontainers/runc",
-              "identifiers": {
-                "purl": "pkg:golang/github.com/opencontainers/runc"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_present",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2024-2494",
-        "name": "GO-2024-2494",
-        "description": "Host system modification in github.com/moby/buildkit",
-        "aliases": [
-          "CVE-2024-23652",
-          "GHSA-4v98-7qmw-rqr8"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/github.com/moby/buildkit",
-              "identifiers": {
-                "purl": "pkg:golang/github.com/moby/buildkit"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_present",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2023-2412",
-        "name": "GO-2023-2412",
-        "description": "RAPL accessibility in github.com/containerd/containerd",
-        "aliases": [
-          "GHSA-7ww5-4wqc-m92c"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/github.com/containerd/containerd",
-              "identifiers": {
-                "purl": "pkg:golang/github.com/containerd/containerd"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_present",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2023-1988",
-        "name": "GO-2023-1988",
-        "description": "Improper rendering of text nodes in golang.org/x/net/html",
-        "aliases": [
-          "CVE-2023-3978",
-          "GHSA-2wrh-6pvc-2jm9"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/golang.org/x/net",
-              "identifiers": {
-                "purl": "pkg:golang/golang.org/x/net"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_in_execute_path",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2024-2492",
-        "name": "GO-2024-2492",
-        "description": "Panic in github.com/moby/buildkit",
-        "aliases": [
-          "CVE-2024-23650",
-          "GHSA-9p26-698r-w4hx"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/github.com/moby/buildkit",
-              "identifiers": {
-                "purl": "pkg:golang/github.com/moby/buildkit"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_present",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2022-0646",
-        "name": "GO-2022-0646",
-        "description": "Use of risky cryptographic algorithm in github.com/aws/aws-sdk-go",
-        "aliases": [
-          "CVE-2020-8911",
-          "CVE-2020-8912",
-          "GHSA-7f33-f4f5-xwgw",
-          "GHSA-f5pg-7wfw-84q9"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/github.com/aws/aws-sdk-go",
-              "identifiers": {
-                "purl": "pkg:golang/github.com/aws/aws-sdk-go"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_present",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2023-2153",
-        "name": "GO-2023-2153",
-        "description": "Denial of service from HTTP/2 Rapid Reset in google.golang.org/grpc",
-        "aliases": [
-          "GHSA-m425-mq94-257g"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/google.golang.org/grpc",
-              "identifiers": {
-                "purl": "pkg:golang/google.golang.org/grpc"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_in_execute_path",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2024-3105",
-        "name": "GO-2024-3105",
-        "description": "Stack exhaustion in all Parse functions in go/parser",
-        "aliases": [
-          "CVE-2024-34155"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/stdlib",
-              "identifiers": {
-                "purl": "pkg:golang/stdlib"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_in_execute_path",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2024-3106",
-        "name": "GO-2024-3106",
-        "description": "Stack exhaustion in Decoder.Decode in encoding/gob",
-        "aliases": [
-          "CVE-2024-34156"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/stdlib",
-              "identifiers": {
-                "purl": "pkg:golang/stdlib"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_in_execute_path",
-      "impact_statement": "Govulncheck incorrectly marks this vulnerability as affected. The vulnerable code isn't called. See https://github.com/aquasecurity/trivy/issues/7478"
-    },
-    {
-      "vulnerability": {
-        "@id": "https://pkg.go.dev/vuln/GO-2024-3107",
-        "name": "GO-2024-3107",
-        "description": "Stack exhaustion in Parse in go/build/constraint",
-        "aliases": [
-          "CVE-2024-34158"
-        ]
-      },
-      "products": [
-        {
-          "@id": "pkg:golang/github.com/aquasecurity/trivy",
-          "identifiers": {
-            "purl": "pkg:golang/github.com/aquasecurity/trivy"
-          },
-          "subcomponents": [
-            {
-              "@id": "pkg:golang/stdlib",
-              "identifiers": {
-                "purl": "pkg:golang/stdlib"
-              }
-            }
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_not_in_execute_path",
-      "impact_statement": "Govulncheck determined that the vulnerable code isn't called"
-    }
-  ]
-}

CHANGELOG.md

@@ -1,220 +1,21 @@
 # Changelog
 
-## [0.56.1](https://github.com/aquasecurity/trivy/compare/v0.56.0...v0.56.1) (2024-10-03)
+## [0.52.2](https://github.com/aquasecurity/trivy/compare/v0.52.1...v0.52.2) (2024-06-14)
 
 
 ### Bug Fixes
 
-* **db:** fix javadb downloading error handling [backport: release/v0.56] ([#7646](https://github.com/aquasecurity/trivy/issues/7646)) ([5dbdadf](https://github.com/aquasecurity/trivy/commit/5dbdadfe4578288d5c3f2a5b625fff4a3580f8c5))
+* **debian:** take installed files from the origin layer [backport: release/v0.52] ([#6892](https://github.com/aquasecurity/trivy/issues/6892)) ([8f8c76a](https://github.com/aquasecurity/trivy/commit/8f8c76a2abd3987ad0dad03be29be479fc8308be))
 
-## [0.56.0](https://github.com/aquasecurity/trivy/compare/v0.55.0...v0.56.0) (2024-10-03)
-
-
-### Features
-
-* **java:** add empty versions if `pom.xml` dependency versions can't be detected ([#7520](https://github.com/aquasecurity/trivy/issues/7520)) ([b836232](https://github.com/aquasecurity/trivy/commit/b8362321adb2af220830c5de31c29978423d47da))
-* **license:** improve license normalization ([#7131](https://github.com/aquasecurity/trivy/issues/7131)) ([6472e3c](https://github.com/aquasecurity/trivy/commit/6472e3c9da2a8e7ba41598a45c80df8f18e57d4c))
-* **misconf:** add ability to disable checks by ID ([#7536](https://github.com/aquasecurity/trivy/issues/7536)) ([ef0a27d](https://github.com/aquasecurity/trivy/commit/ef0a27d515ff80762bf1959d44a8bde017ae06ec))
-* **misconf:** Register checks only when needed ([#7435](https://github.com/aquasecurity/trivy/issues/7435)) ([f768d3a](https://github.com/aquasecurity/trivy/commit/f768d3a767a99a86b0372f19d9f49a2de35dbe59))
-* **misconf:** Support `--skip-*` for all included modules  ([#7579](https://github.com/aquasecurity/trivy/issues/7579)) ([c0e8da3](https://github.com/aquasecurity/trivy/commit/c0e8da3828e9d3a0b30d1f6568037db8dc827765))
-* **secret:** enhance secret scanning for python binary files ([#7223](https://github.com/aquasecurity/trivy/issues/7223)) ([60725f8](https://github.com/aquasecurity/trivy/commit/60725f879ba014c5c57583db6afc290b78facae8))
-* support multiple DB repositories for vulnerability and Java DB ([#7605](https://github.com/aquasecurity/trivy/issues/7605)) ([3562529](https://github.com/aquasecurity/trivy/commit/3562529ddfb26d301311ed450c192e17011353df))
-* support RPM archives ([#7628](https://github.com/aquasecurity/trivy/issues/7628)) ([69bf7e0](https://github.com/aquasecurity/trivy/commit/69bf7e00ea5ab483692db830fdded26a31f03183))
-* **suse:** added SUSE Linux Enterprise Micro support ([#7294](https://github.com/aquasecurity/trivy/issues/7294)) ([efdb68d](https://github.com/aquasecurity/trivy/commit/efdb68d3b9ddf9dfaf45ea5855b31c43a4366bab))
+## [0.52.1](https://github.com/aquasecurity/trivy/compare/v0.52.0...v0.52.1) (2024-06-10)
 
 
 ### Bug Fixes
 
-* allow access to '..' in mapfs ([#7575](https://github.com/aquasecurity/trivy/issues/7575)) ([a8fbe46](https://github.com/aquasecurity/trivy/commit/a8fbe46119adbd89f827a75c75b9e97d392f1842))
-* **db:** check `DownloadedAt` for `trivy-java-db` ([#7592](https://github.com/aquasecurity/trivy/issues/7592)) ([13ef3e7](https://github.com/aquasecurity/trivy/commit/13ef3e7d62ba2bcb3a04d7b44f79b1299674b480))
-* **java:** use `dependencyManagement` from root/child pom's for dependencies from parents ([#7497](https://github.com/aquasecurity/trivy/issues/7497)) ([5442949](https://github.com/aquasecurity/trivy/commit/54429497e7d6a87eac236771d4efb8a5a7faaac5))
-* **license:** stop spliting a long license text ([#7336](https://github.com/aquasecurity/trivy/issues/7336)) ([4926da7](https://github.com/aquasecurity/trivy/commit/4926da79de901fba73819d71845ec0355b68ae0f))
-* **misconf:** Disable deprecated checks by default ([#7632](https://github.com/aquasecurity/trivy/issues/7632)) ([82e2adc](https://github.com/aquasecurity/trivy/commit/82e2adc6f8e68d0cc0021031170c2adb60d213ba))
-* **misconf:** disable DS016 check for image history analyzer ([#7540](https://github.com/aquasecurity/trivy/issues/7540)) ([de40df9](https://github.com/aquasecurity/trivy/commit/de40df9408d6d856a3ad384ec9f086edce3aa382))
-* **misconf:** escape all special sequences ([#7558](https://github.com/aquasecurity/trivy/issues/7558)) ([ea0cf03](https://github.com/aquasecurity/trivy/commit/ea0cf0379aff0348fde87356dab37947800fc1b6))
-* **misconf:** Fix logging typo ([#7473](https://github.com/aquasecurity/trivy/issues/7473)) ([56db43c](https://github.com/aquasecurity/trivy/commit/56db43c24f4f6be92891be85faaf9492cad516ac))
-* **misconf:** Fixed scope for China Cloud ([#7560](https://github.com/aquasecurity/trivy/issues/7560)) ([37d549e](https://github.com/aquasecurity/trivy/commit/37d549e5b86a1c5dce6710fbfd2310aec9abe949))
-* **misconf:** not to warn about missing selectors of libraries ([#7638](https://github.com/aquasecurity/trivy/issues/7638)) ([fcaea74](https://github.com/aquasecurity/trivy/commit/fcaea740808d5784c120e5c5d65f5f94e1d931d4))
-* **oracle:** Update EOL date for Oracle 7 ([#7480](https://github.com/aquasecurity/trivy/issues/7480)) ([dd0a64a](https://github.com/aquasecurity/trivy/commit/dd0a64a1cf0cd76e6f81e3ff55fa6ccb95ce3c3d))
-* **report:** change a receiver of MarshalJSON ([#7483](https://github.com/aquasecurity/trivy/issues/7483)) ([927c6e0](https://github.com/aquasecurity/trivy/commit/927c6e0c9d4d4a3f1be00f0f661c1d18325d9440))
-* **report:** fix error with unmarshal of `ExperimentalModifiedFindings` ([#7463](https://github.com/aquasecurity/trivy/issues/7463)) ([7ff9aff](https://github.com/aquasecurity/trivy/commit/7ff9aff2739b2eee4a98175b98914795e4077060))
-* **sbom:** export bom-ref when converting a package to a component ([#7340](https://github.com/aquasecurity/trivy/issues/7340)) ([5dd94eb](https://github.com/aquasecurity/trivy/commit/5dd94ebc1ffe3f1df511dee6381f92a5daefadf2))
-* **sbom:** parse type `framework` as `library` when unmarshalling `CycloneDX` files ([#7527](https://github.com/aquasecurity/trivy/issues/7527)) ([aeb7039](https://github.com/aquasecurity/trivy/commit/aeb7039d7ce090e243d29f0bf16c9e4e24252a01))
-* **secret:** change grafana token regex to find them without unquoted ([#7627](https://github.com/aquasecurity/trivy/issues/7627)) ([3e1fa21](https://github.com/aquasecurity/trivy/commit/3e1fa2100074e840bacdd65947425b08750b7d9a))
-
-
-### Performance Improvements
-
-* **misconf:** use port ranges instead of enumeration ([#7549](https://github.com/aquasecurity/trivy/issues/7549)) ([1f9fc13](https://github.com/aquasecurity/trivy/commit/1f9fc13da4a1e7c76c978e4f8e119bfd61a0480e))
-
-
-### Reverts
-
-* **java:** stop supporting of `test` scope for `pom.xml` files ([#7488](https://github.com/aquasecurity/trivy/issues/7488)) ([b0222fe](https://github.com/aquasecurity/trivy/commit/b0222feeb586ec59904bb321fda8f3f22496d07b))
-
-## [0.55.0](https://github.com/aquasecurity/trivy/compare/v0.54.0...v0.55.0) (2024-09-03)
-
-
-### ⚠ BREAKING CHANGES
-
-* **cli:** delete deprecated SBOM flags ([#7266](https://github.com/aquasecurity/trivy/issues/7266))
-
-### Features
-
-* **cli:** delete deprecated SBOM flags ([#7266](https://github.com/aquasecurity/trivy/issues/7266)) ([7024572](https://github.com/aquasecurity/trivy/commit/70245721372720027b7089bd61c693df48add865))
-* **go:** use `toolchain` as `stdlib` version for `go.mod` files ([#7163](https://github.com/aquasecurity/trivy/issues/7163)) ([2d80769](https://github.com/aquasecurity/trivy/commit/2d80769c34b118851640411fff9dac0b3e353e82))
-* **java:** add `test` scope support for `pom.xml` files ([#7414](https://github.com/aquasecurity/trivy/issues/7414)) ([2d97700](https://github.com/aquasecurity/trivy/commit/2d97700d10665142d2f66d7910202bec82116209))
-* **misconf:** Add support for using spec from on-disk bundle ([#7179](https://github.com/aquasecurity/trivy/issues/7179)) ([be86126](https://github.com/aquasecurity/trivy/commit/be861265cafc89787fda09c59b2ef175e3d04204))
-* **misconf:** ignore duplicate checks ([#7317](https://github.com/aquasecurity/trivy/issues/7317)) ([9ef05fc](https://github.com/aquasecurity/trivy/commit/9ef05fc6b171a264516a025b0b0bcbbc8cff10bc))
-* **misconf:** iterator argument support for dynamic blocks ([#7236](https://github.com/aquasecurity/trivy/issues/7236)) ([fe92072](https://github.com/aquasecurity/trivy/commit/fe9207255a4f7f984ec1447f8a9219ae60e560c4))
-* **misconf:** port and protocol support for EC2 networks ([#7146](https://github.com/aquasecurity/trivy/issues/7146)) ([98e136e](https://github.com/aquasecurity/trivy/commit/98e136eb7baa2b66f4233d96875c1490144e1594))
-* **misconf:** scanning support for YAML and JSON ([#7311](https://github.com/aquasecurity/trivy/issues/7311)) ([efdbd8f](https://github.com/aquasecurity/trivy/commit/efdbd8f19ab0ab0c3b48293d43e51c81b7b03b89))
-* **misconf:** support for ignore by nested attributes ([#7205](https://github.com/aquasecurity/trivy/issues/7205)) ([44e4686](https://github.com/aquasecurity/trivy/commit/44e468603d44b077cc4606327fb3e7d7ca435e05))
-* **misconf:** support for policy and bucket grants ([#7284](https://github.com/aquasecurity/trivy/issues/7284)) ([a817fae](https://github.com/aquasecurity/trivy/commit/a817fae85b7272b391b737ec86673a7cab722bae))
-* **misconf:** variable support for Terraform Plan ([#7228](https://github.com/aquasecurity/trivy/issues/7228)) ([db2c955](https://github.com/aquasecurity/trivy/commit/db2c95598da098ca610825089eb4ab63b789b215))
-* **python:** use minimum version for pip packages ([#7348](https://github.com/aquasecurity/trivy/issues/7348)) ([e9b43f8](https://github.com/aquasecurity/trivy/commit/e9b43f81e67789b067352fcb6aa55bc9478bc518))
-* **report:** export modified findings in JSON ([#7383](https://github.com/aquasecurity/trivy/issues/7383)) ([7aea79d](https://github.com/aquasecurity/trivy/commit/7aea79dd93cfb61453766dbbb2e3fc0fbd317852))
-* **sbom:** set User-Agent header on requests to Rekor ([#7396](https://github.com/aquasecurity/trivy/issues/7396)) ([af1d257](https://github.com/aquasecurity/trivy/commit/af1d257730422d238871beb674767f8f83c5d06a))
-* **server:** add internal `--path-prefix` flag for client/server mode ([#7321](https://github.com/aquasecurity/trivy/issues/7321)) ([24a4563](https://github.com/aquasecurity/trivy/commit/24a45636867b893ff54c5ce07197f3b5c6db1d9b))
-* **server:** Make Trivy Server Multiplexer Exported ([#7389](https://github.com/aquasecurity/trivy/issues/7389)) ([4c6e8ca](https://github.com/aquasecurity/trivy/commit/4c6e8ca9cc9591799907cc73075f2d740e303b8f))
-* **vm:** Support direct filesystem ([#7058](https://github.com/aquasecurity/trivy/issues/7058)) ([45b3f34](https://github.com/aquasecurity/trivy/commit/45b3f344042bcd90ca63ab696b69bff0e9ab4e36))
-* **vm:** support the Ext2/Ext3 filesystems ([#6983](https://github.com/aquasecurity/trivy/issues/6983)) ([35c60f0](https://github.com/aquasecurity/trivy/commit/35c60f030fa48de8d8e57958e5ba379814126831))
-* **vuln:** Add `--detection-priority` flag for accuracy tuning ([#7288](https://github.com/aquasecurity/trivy/issues/7288)) ([fd8348d](https://github.com/aquasecurity/trivy/commit/fd8348d610f20c6c33da81cd7b0e7d5504ce26be))
-
-
-### Bug Fixes
-
-* **aws:** handle ECR repositories in different regions ([#6217](https://github.com/aquasecurity/trivy/issues/6217)) ([feaef96](https://github.com/aquasecurity/trivy/commit/feaef9699df5d8ca399770e701a59d7c0ff979a3))
-* **flag:** incorrect behavior for deprected flag `--clear-cache` ([#7281](https://github.com/aquasecurity/trivy/issues/7281)) ([2a0e529](https://github.com/aquasecurity/trivy/commit/2a0e529c36057b572119815af59c28e4790034ca))
-* **helm:** explicitly define `kind` and `apiVersion` of `volumeClaimTemplate` element ([#7362](https://github.com/aquasecurity/trivy/issues/7362)) ([da4ebfa](https://github.com/aquasecurity/trivy/commit/da4ebfa1a741f3f8b0b43289b4028afe763f7d43))
-* **java:** Return error when trying to find a remote pom to avoid segfault ([#7275](https://github.com/aquasecurity/trivy/issues/7275)) ([49d5270](https://github.com/aquasecurity/trivy/commit/49d5270163e305f88fedcf50412973736e69dc69))
-* **license:** add license handling to JUnit template ([#7409](https://github.com/aquasecurity/trivy/issues/7409)) ([f80183c](https://github.com/aquasecurity/trivy/commit/f80183c1139b21bb95bc64e216358f4a76001a65))
-* logger initialization before flags parsing ([#7372](https://github.com/aquasecurity/trivy/issues/7372)) ([c929290](https://github.com/aquasecurity/trivy/commit/c929290c3c0e4e91337264d69e75ccb60522bc65))
-* **misconf:** change default TLS values for the Azure storage account ([#7345](https://github.com/aquasecurity/trivy/issues/7345)) ([aadb090](https://github.com/aquasecurity/trivy/commit/aadb09078843250c66087f46db9a2aa48094a118))
-* **misconf:** do not filter Terraform plan JSON by name ([#7406](https://github.com/aquasecurity/trivy/issues/7406)) ([9d7264a](https://github.com/aquasecurity/trivy/commit/9d7264af8e85bcc0dba600b8366d0470d455251c))
-* **misconf:** do not recreate filesystem map ([#7416](https://github.com/aquasecurity/trivy/issues/7416)) ([3a5d091](https://github.com/aquasecurity/trivy/commit/3a5d091759564496992a83fb2015a21c84a22213))
-* **misconf:** do not register Rego libs in checks registry ([#7420](https://github.com/aquasecurity/trivy/issues/7420)) ([a5aa63e](https://github.com/aquasecurity/trivy/commit/a5aa63eff7e229744090f9ad300c1bec3259397e))
-* **misconf:** do not set default value for default_cache_behavior ([#7234](https://github.com/aquasecurity/trivy/issues/7234)) ([f0ed5e4](https://github.com/aquasecurity/trivy/commit/f0ed5e4ced7e60af35c88d5d084aa4b7237f4973))
-* **misconf:** fix infer type for null value ([#7424](https://github.com/aquasecurity/trivy/issues/7424)) ([0cac3ac](https://github.com/aquasecurity/trivy/commit/0cac3ac7075017628a21a7990941df04cbc16dbe))
-* **misconf:** init frameworks before updating them ([#7376](https://github.com/aquasecurity/trivy/issues/7376)) ([b65b32d](https://github.com/aquasecurity/trivy/commit/b65b32ddfa6fc62ac81ad9fa580e1f5a327864f5))
-* **misconf:** load only submodule if it is specified in source ([#7112](https://github.com/aquasecurity/trivy/issues/7112)) ([a4180bd](https://github.com/aquasecurity/trivy/commit/a4180bddd43d86e479edf0afe0c362021d071482))
-* **misconf:** support deprecating for Go checks ([#7377](https://github.com/aquasecurity/trivy/issues/7377)) ([2a6c7ab](https://github.com/aquasecurity/trivy/commit/2a6c7ab3b338ce4a8f99d6ac3508c2531dcbe812))
-* **misconf:** use module to log when metadata retrieval fails ([#7405](https://github.com/aquasecurity/trivy/issues/7405)) ([0799770](https://github.com/aquasecurity/trivy/commit/0799770b8827a8276ad0d6d9ac7e0381c286757c))
-* **misconf:** wrap Azure PortRange in iac types ([#7357](https://github.com/aquasecurity/trivy/issues/7357)) ([c5c62d5](https://github.com/aquasecurity/trivy/commit/c5c62d5ff05420321f9cdbfb93e2591e0866a342))
-* **nodejs:** check all `importers` to detect dev deps from pnpm-lock.yaml file ([#7387](https://github.com/aquasecurity/trivy/issues/7387)) ([fd9ed3a](https://github.com/aquasecurity/trivy/commit/fd9ed3a330bc66e229bcbdc262dc296a3bf01f54))
-* **plugin:** do not call GitHub content API for releases and tags ([#7274](https://github.com/aquasecurity/trivy/issues/7274)) ([b3ee6da](https://github.com/aquasecurity/trivy/commit/b3ee6dac269bd7847674f3ce985a5ff7f8f0ba38))
-* **report:** escape `Message` field in `asff.tpl` template ([#7401](https://github.com/aquasecurity/trivy/issues/7401)) ([dd9733e](https://github.com/aquasecurity/trivy/commit/dd9733e950d3127aa2ac90c45ec7e2b88a2b47ca))
-* safely check if the directory exists ([#7353](https://github.com/aquasecurity/trivy/issues/7353)) ([05a8297](https://github.com/aquasecurity/trivy/commit/05a829715f99cd90b122c64cd2f40157854e467b))
-* **sbom:** use `NOASSERTION` for licenses fields in SPDX formats ([#7403](https://github.com/aquasecurity/trivy/issues/7403)) ([c96dcdd](https://github.com/aquasecurity/trivy/commit/c96dcdd440a14cdd1b01ac473b2c15e4698e387b))
-* **secret:** use `.eyJ` keyword for JWT secret ([#7410](https://github.com/aquasecurity/trivy/issues/7410)) ([bf64003](https://github.com/aquasecurity/trivy/commit/bf64003ac8b209f34b88f228918a96d4f9dac5e0))
-* **secret:** use only line with secret for long secret lines ([#7412](https://github.com/aquasecurity/trivy/issues/7412)) ([391448a](https://github.com/aquasecurity/trivy/commit/391448aba9fcb0a4138225e5ab305e4e6707c603))
-* **terraform:** add aws_region name to presets ([#7184](https://github.com/aquasecurity/trivy/issues/7184)) ([bb2e26a](https://github.com/aquasecurity/trivy/commit/bb2e26a0ab707b718f6a890cbc87e2492298b6e5))
-
-
-### Performance Improvements
-
-* **misconf:** do not convert contents of a YAML file to string ([#7292](https://github.com/aquasecurity/trivy/issues/7292)) ([85dadf5](https://github.com/aquasecurity/trivy/commit/85dadf56265647c000191561db10b08a4948c140))
-* **misconf:** optimize work with context ([#6968](https://github.com/aquasecurity/trivy/issues/6968)) ([2b6d8d9](https://github.com/aquasecurity/trivy/commit/2b6d8d9227fb6ecc9386a14333964c23c0370a52))
-* **misconf:** use json.Valid to check validity of JSON ([#7308](https://github.com/aquasecurity/trivy/issues/7308)) ([c766831](https://github.com/aquasecurity/trivy/commit/c766831069e188226efafeec184e41498685ed85))
-
-## [0.54.0](https://github.com/aquasecurity/trivy/compare/v0.53.0...v0.54.0) (2024-07-30)
-
-
-### Features
-
-* add `log.FilePath()` function for logger ([#7080](https://github.com/aquasecurity/trivy/issues/7080)) ([1f5f348](https://github.com/aquasecurity/trivy/commit/1f5f34895823fae81bf521fc939bee743a50e304))
-* add openSUSE tumbleweed detection and scanning ([#6965](https://github.com/aquasecurity/trivy/issues/6965)) ([17b5dbf](https://github.com/aquasecurity/trivy/commit/17b5dbfa12180414b87859c6c46bfe6cc5ecf7ba))
-* **cli:** rename `--vuln-type` flag to `--pkg-types` flag ([#7104](https://github.com/aquasecurity/trivy/issues/7104)) ([7cbdb0a](https://github.com/aquasecurity/trivy/commit/7cbdb0a0b5dff33e506e1c1f3119951fa241b432))
-* **mariner:** Add support for Azure Linux ([#7186](https://github.com/aquasecurity/trivy/issues/7186)) ([5cbc452](https://github.com/aquasecurity/trivy/commit/5cbc452a09822d1bf300ead88f0d613d4cf0349a))
-* **misconf:** enabled China configuration for ACRs ([#7156](https://github.com/aquasecurity/trivy/issues/7156)) ([d1ec89d](https://github.com/aquasecurity/trivy/commit/d1ec89d1db4b039f0e31076ccd1ca969fb15628e))
-* **nodejs:** add license parser to pnpm analyser ([#7036](https://github.com/aquasecurity/trivy/issues/7036)) ([03ac93d](https://github.com/aquasecurity/trivy/commit/03ac93dc208f1b40896f3fa11fa1d45293176dca))
-* **sbom:** add image labels into `SPDX` and `CycloneDX` reports ([#7257](https://github.com/aquasecurity/trivy/issues/7257)) ([4a2f492](https://github.com/aquasecurity/trivy/commit/4a2f492c6e685ff577fb96a7006cd0c43755baf4))
-* **sbom:** add vulnerability support for SPDX formats ([#7213](https://github.com/aquasecurity/trivy/issues/7213)) ([efb1f69](https://github.com/aquasecurity/trivy/commit/efb1f6938321eec3529ef4fea6608261f6771ae0))
-* share build-in rules ([#7207](https://github.com/aquasecurity/trivy/issues/7207)) ([bff317c](https://github.com/aquasecurity/trivy/commit/bff317c77bf4a5f615a80d9875d129213bd52f6d))
-* **vex:** retrieve VEX attestations from OCI registries ([#7249](https://github.com/aquasecurity/trivy/issues/7249)) ([c2fd2e0](https://github.com/aquasecurity/trivy/commit/c2fd2e0d89567a0ccd996dda8790f3c3305ea6f7))
-* **vex:** VEX Repository support ([#7206](https://github.com/aquasecurity/trivy/issues/7206)) ([88ba460](https://github.com/aquasecurity/trivy/commit/88ba46047c93e6046292523ae701de774dfdc4dc))
-* **vuln:** add `--pkg-relationships` ([#7237](https://github.com/aquasecurity/trivy/issues/7237)) ([5c37361](https://github.com/aquasecurity/trivy/commit/5c37361600d922db27dd594b2a80c010a19b3a6e))
-
-
-### Bug Fixes
-
-* Add dependencyManagement exclusions to the child exclusions ([#6969](https://github.com/aquasecurity/trivy/issues/6969)) ([dc68a66](https://github.com/aquasecurity/trivy/commit/dc68a662a701980d6529f61a65006f1e4728a3e5))
-* add missing platform and type to spec ([#7149](https://github.com/aquasecurity/trivy/issues/7149)) ([c8a7abd](https://github.com/aquasecurity/trivy/commit/c8a7abd3b508975fcf10c254d13d1a2cd42da657))
-* **cli:** error on missing config file ([#7154](https://github.com/aquasecurity/trivy/issues/7154)) ([7fa5e7d](https://github.com/aquasecurity/trivy/commit/7fa5e7d0ab67f20d434b2922725988695e32e6af))
-* close file when failed to open gzip ([#7164](https://github.com/aquasecurity/trivy/issues/7164)) ([2a577a7](https://github.com/aquasecurity/trivy/commit/2a577a7bae37e5731dceaea8740683573b6b70a5))
-* **dotnet:** don't include non-runtime libraries into report for `*.deps.json` files ([#7039](https://github.com/aquasecurity/trivy/issues/7039)) ([5bc662b](https://github.com/aquasecurity/trivy/commit/5bc662be9a8f072599f90abfd3b400c8ab055ed6))
-* **dotnet:** show `nuget package dir not found` log only when checking `nuget` packages ([#7194](https://github.com/aquasecurity/trivy/issues/7194)) ([d76feba](https://github.com/aquasecurity/trivy/commit/d76febaee107c645e864da0f4d74a8f6ae4ad232))
-* ignore nodes when listing permission is not allowed ([#7107](https://github.com/aquasecurity/trivy/issues/7107)) ([25f8143](https://github.com/aquasecurity/trivy/commit/25f8143f120965c636c5ea8386398b211b082398))
-* **java:** avoid panic if deps from `pom` in `it` dir are not found ([#7245](https://github.com/aquasecurity/trivy/issues/7245)) ([4e54a7e](https://github.com/aquasecurity/trivy/commit/4e54a7e84c33c1be80c52c6db78c634bc3911715))
-* **java:** use `go-mvn-version` to remove `Package` duplicates ([#7088](https://github.com/aquasecurity/trivy/issues/7088)) ([a7a304d](https://github.com/aquasecurity/trivy/commit/a7a304d53e1ce230f881c28c4f35885774cf3b9a))
-* **misconf:** do not evaluate TF when a load error occurs ([#7109](https://github.com/aquasecurity/trivy/issues/7109)) ([f27c236](https://github.com/aquasecurity/trivy/commit/f27c236d6e155cb366aeef619b6ea96d20fb93da))
-* **nodejs:** detect direct dependencies when using `latest` version for files `yarn.lock` + `package.json` ([#7110](https://github.com/aquasecurity/trivy/issues/7110)) ([54bb8bd](https://github.com/aquasecurity/trivy/commit/54bb8bdfb934d114b5570005853bf4bc0d40c609))
-* **report:** hide empty table when all secrets/license/misconfigs are ignored ([#7171](https://github.com/aquasecurity/trivy/issues/7171)) ([c3036de](https://github.com/aquasecurity/trivy/commit/c3036de6d7719323d306a9666ccc8d928d936f9a))
-* **secret:** skip regular strings contain secret patterns ([#7182](https://github.com/aquasecurity/trivy/issues/7182)) ([174b1e3](https://github.com/aquasecurity/trivy/commit/174b1e3515a6394cf8d523216d6267c1aefb820a))
-* **secret:** trim excessively long lines ([#7192](https://github.com/aquasecurity/trivy/issues/7192)) ([92b13be](https://github.com/aquasecurity/trivy/commit/92b13be668bd20f8e9dac2f0cb8e5a2708b9b3b5))
-* **secret:** update length of `hugging-face-access-token` ([#7216](https://github.com/aquasecurity/trivy/issues/7216)) ([8c87194](https://github.com/aquasecurity/trivy/commit/8c87194f0a6b194bc5d340c8a65bd99a3132d973))
-* **server:** pass license categories to options ([#7203](https://github.com/aquasecurity/trivy/issues/7203)) ([9d52018](https://github.com/aquasecurity/trivy/commit/9d5201808da89607ae43570bdf1f335b482a6b79))
-
-
-### Performance Improvements
-
-* **debian:** use `bytes.Index` in `emptyLineSplit` to cut allocation ([#7065](https://github.com/aquasecurity/trivy/issues/7065)) ([acbec05](https://github.com/aquasecurity/trivy/commit/acbec053c985388a26d899e73b4b7f5a6d1fa210))
-
-## [0.53.0](https://github.com/aquasecurity/trivy/compare/v0.52.0...v0.53.0) (2024-07-01)
-
-
-### ⚠ BREAKING CHANGES
-
-* **k8s:** node-collector dynamic commands support ([#6861](https://github.com/aquasecurity/trivy/issues/6861))
-* add clean subcommand ([#6993](https://github.com/aquasecurity/trivy/issues/6993))
-* **aws:** Remove aws subcommand ([#6995](https://github.com/aquasecurity/trivy/issues/6995))
-
-### Features
-
-* add clean subcommand ([#6993](https://github.com/aquasecurity/trivy/issues/6993)) ([8d0ae1f](https://github.com/aquasecurity/trivy/commit/8d0ae1f5de72d92a043dcd6b7c164d30e51b6047))
-* Add local ImageID to SARIF metadata ([#6522](https://github.com/aquasecurity/trivy/issues/6522)) ([f144e91](https://github.com/aquasecurity/trivy/commit/f144e912d34234f00b5a13b7a11a0019fa978b27))
-* add memory cache backend ([#7048](https://github.com/aquasecurity/trivy/issues/7048)) ([55ccd06](https://github.com/aquasecurity/trivy/commit/55ccd06df43f6ff28685f46d215ccb70f55916d2))
-* **aws:** Remove aws subcommand ([#6995](https://github.com/aquasecurity/trivy/issues/6995)) ([979e118](https://github.com/aquasecurity/trivy/commit/979e118a9e0ca8943bef9143f492d7eb1fd4d863))
-* **conda:** add licenses support for `environment.yml` files ([#6953](https://github.com/aquasecurity/trivy/issues/6953)) ([654217a](https://github.com/aquasecurity/trivy/commit/654217a65485ca0a07771ea61071977894eb4920))
-* **dart:** use first version of constraint for dependencies using SDK version ([#6239](https://github.com/aquasecurity/trivy/issues/6239)) ([042d6b0](https://github.com/aquasecurity/trivy/commit/042d6b08c283105c258a3dda98983b345a5305c3))
-* **image:** Set User-Agent header for Trivy container registry requests ([#6868](https://github.com/aquasecurity/trivy/issues/6868)) ([9b31697](https://github.com/aquasecurity/trivy/commit/9b31697274c8743d6e5a8f7a1a05daf60cd15910))
-* **java:** add support for `maven-metadata.xml` files for remote snapshot repositories. ([#6950](https://github.com/aquasecurity/trivy/issues/6950)) ([1f8fca1](https://github.com/aquasecurity/trivy/commit/1f8fca1fc77b989bb4e3ba820b297464dbdd825f))
-* **java:** add support for sbt projects using sbt-dependency-lock ([#6882](https://github.com/aquasecurity/trivy/issues/6882)) ([f18d035](https://github.com/aquasecurity/trivy/commit/f18d035ae13b281c96aa4ed69ca32e507d336e66))
-* **k8s:** node-collector dynamic commands support ([#6861](https://github.com/aquasecurity/trivy/issues/6861)) ([8d618e4](https://github.com/aquasecurity/trivy/commit/8d618e48a2f1b60c2e4c49cdd9deb8eb45c972b0))
-* **misconf:** add metadata to Cloud schema ([#6831](https://github.com/aquasecurity/trivy/issues/6831)) ([02d5404](https://github.com/aquasecurity/trivy/commit/02d540478d495416b50d7e8b187ff9f5bba41f45))
-* **misconf:** add support for AWS::EC2::SecurityGroupIngress/Egress ([#6755](https://github.com/aquasecurity/trivy/issues/6755)) ([55fa610](https://github.com/aquasecurity/trivy/commit/55fa6109cd0463fd3221aae41ca7b1d8c44ad430))
-* **misconf:** API Gateway V1 support for CloudFormation ([#6874](https://github.com/aquasecurity/trivy/issues/6874)) ([8491469](https://github.com/aquasecurity/trivy/commit/8491469f0b35bd9df706a433669f5b62239d4ef3))
-* **misconf:** support of selectors for all providers for Rego ([#6905](https://github.com/aquasecurity/trivy/issues/6905)) ([bc3741a](https://github.com/aquasecurity/trivy/commit/bc3741ae2c68cdd00fc0aef7e51985568b2eb78a))
-* **php:** add installed.json file support ([#4865](https://github.com/aquasecurity/trivy/issues/4865)) ([edc556b](https://github.com/aquasecurity/trivy/commit/edc556b85e3554c31e19b1ece189effb9ba2be12))
-* **plugin:** add support for nested archives ([#6845](https://github.com/aquasecurity/trivy/issues/6845)) ([622c67b](https://github.com/aquasecurity/trivy/commit/622c67b7647f94d0a0ca3acf711d8f847cdd8d98))
-* **sbom:** migrate to `CycloneDX v1.6` ([#6903](https://github.com/aquasecurity/trivy/issues/6903)) ([09e50ce](https://github.com/aquasecurity/trivy/commit/09e50ce6a82073ba62f1732d5aa0cd2701578693))
-
-
-### Bug Fixes
-
-* **c:** don't skip conan files from `file-patterns` and scan `.conan2` cache dir ([#6949](https://github.com/aquasecurity/trivy/issues/6949)) ([38b35dd](https://github.com/aquasecurity/trivy/commit/38b35dd3c804027e7a6e6a9d3c87b7ac333896c5))
-* **cli:** show info message only when --scanners is available ([#7032](https://github.com/aquasecurity/trivy/issues/7032)) ([e9fc3e3](https://github.com/aquasecurity/trivy/commit/e9fc3e3397564512038ddeca2adce0efcb3f93c5))
-* **cyclonedx:** trim non-URL info for `advisory.url` ([#6952](https://github.com/aquasecurity/trivy/issues/6952)) ([417212e](https://github.com/aquasecurity/trivy/commit/417212e0930aa52a27ebdc1b9370d2943ce0f8fa))
-* **debian:** take installed files from the origin layer ([#6849](https://github.com/aquasecurity/trivy/issues/6849)) ([089b953](https://github.com/aquasecurity/trivy/commit/089b953462260f01c40bdf588b2568ae0ef658bc))
-* **image:** parse `image.inspect.Created` field only for non-empty values ([#6948](https://github.com/aquasecurity/trivy/issues/6948)) ([0af5730](https://github.com/aquasecurity/trivy/commit/0af5730cbe56686417389c2fad643c1bdbb33999))
-* **license:** return license separation using separators  `,`, `or`, etc. ([#6916](https://github.com/aquasecurity/trivy/issues/6916)) ([52f7aa5](https://github.com/aquasecurity/trivy/commit/52f7aa54b520a90a19736703f8ea63cc20fab104))
-* **misconf:** fix caching of modules in subdirectories ([#6814](https://github.com/aquasecurity/trivy/issues/6814)) ([0bcfedb](https://github.com/aquasecurity/trivy/commit/0bcfedbcaa9bbe30ee5ecade5b98e9ce3cc54c9b))
-* **misconf:** fix parsing of engine links and frameworks ([#6937](https://github.com/aquasecurity/trivy/issues/6937)) ([ec68c9a](https://github.com/aquasecurity/trivy/commit/ec68c9ab4580d057720179173d58734402c92af4))
-* **misconf:** handle source prefix to ignore ([#6945](https://github.com/aquasecurity/trivy/issues/6945)) ([c3192f0](https://github.com/aquasecurity/trivy/commit/c3192f061d7e84eaf38df8df7c879dc00b4ca137))
-* **misconf:** parsing numbers without fraction as int ([#6834](https://github.com/aquasecurity/trivy/issues/6834)) ([8141a13](https://github.com/aquasecurity/trivy/commit/8141a137ba50b553a9da877d95c7ccb491d041c6))
-* **nodejs:** fix infinite loop when package link from `package-lock.json` file is broken ([#6858](https://github.com/aquasecurity/trivy/issues/6858)) ([cf5aa33](https://github.com/aquasecurity/trivy/commit/cf5aa336e660e4c98481ebf8d15dd4e54c38581e))
-* **nodejs:** fix infinity loops for `pnpm` with cyclic imports ([#6857](https://github.com/aquasecurity/trivy/issues/6857)) ([7d083bc](https://github.com/aquasecurity/trivy/commit/7d083bc890eccc3bf32765c6d7e922cab2e2ef94))
-* **plugin:** respect `--insecure` ([#7022](https://github.com/aquasecurity/trivy/issues/7022)) ([3d02a31](https://github.com/aquasecurity/trivy/commit/3d02a31b44924f9e2495aae087f7ca9de3314db4))
-* **purl:** add missed os types ([#6955](https://github.com/aquasecurity/trivy/issues/6955)) ([2d85a00](https://github.com/aquasecurity/trivy/commit/2d85a003b22298d1101f84559f7c6b470f2b3909))
-* **python:** compare pkg names from `poetry.lock` and `pyproject.toml` in lowercase ([#6852](https://github.com/aquasecurity/trivy/issues/6852)) ([faa9d92](https://github.com/aquasecurity/trivy/commit/faa9d92cfeb8d924deda2dac583b6c97099c08d9))
-* **sbom:** don't overwrite `srcEpoch` when decoding SBOM files ([#6866](https://github.com/aquasecurity/trivy/issues/6866)) ([04af59c](https://github.com/aquasecurity/trivy/commit/04af59c2906bcfc7f7970b4e8f45a90f04313170))
-* **sbom:** fix panic when scanning SBOM file without root component into SBOM format ([#7051](https://github.com/aquasecurity/trivy/issues/7051)) ([3d4ae8b](https://github.com/aquasecurity/trivy/commit/3d4ae8b5be94cd9b00badeece8d86c2258b2cd90))
-* **sbom:** take pkg name from `purl` for maven pkgs ([#7008](https://github.com/aquasecurity/trivy/issues/7008)) ([a76e328](https://github.com/aquasecurity/trivy/commit/a76e3286c413de3dec55394fb41dd627dfee37ae))
-* **sbom:** use `purl` for `bitnami` pkg names ([#6982](https://github.com/aquasecurity/trivy/issues/6982)) ([7eabb92](https://github.com/aquasecurity/trivy/commit/7eabb92ec2e617300433445718be07ac74956454))
-* **sbom:** use package UIDs for uniqueness ([#7042](https://github.com/aquasecurity/trivy/issues/7042)) ([14d71ba](https://github.com/aquasecurity/trivy/commit/14d71ba63c39e51dd4179ba2d6002b46e1816e90))
-* **secret:** `Asymmetric Private Key` shouldn't start with space ([#6867](https://github.com/aquasecurity/trivy/issues/6867)) ([bb26445](https://github.com/aquasecurity/trivy/commit/bb26445e3df198df77930329f532ac5ab7a67af2))
-* **suse:** Add SLES 15.6 and Leap 15.6 ([#6964](https://github.com/aquasecurity/trivy/issues/6964)) ([5ee4e9d](https://github.com/aquasecurity/trivy/commit/5ee4e9d30ea814f60fd5705361cabf2e83a47a78))
-* use embedded when command path not found ([#7037](https://github.com/aquasecurity/trivy/issues/7037)) ([137c916](https://github.com/aquasecurity/trivy/commit/137c9164238ffd989a0c5ed24f23a55bbf341f6e))
+* **nodejs:** fix infinite loop when package link from `package-lock.json` file is broken [backport: release/v0.52] ([#6888](https://github.com/aquasecurity/trivy/issues/6888)) ([01dbb42](https://github.com/aquasecurity/trivy/commit/01dbb42ae9ecff21d1c71f095a27f47a6ac9adaa))
+* **nodejs:** fix infinity loops for `pnpm` with cyclic imports ([#6857](https://github.com/aquasecurity/trivy/issues/6857)) ([a614b69](https://github.com/aquasecurity/trivy/commit/a614b693d7b948df7d4ed3516e79573cb8424406))
+* **python:** compare pkg names from `poetry.lock` and `pyproject.toml` in lowercase [backport: release/v0.52] ([#6878](https://github.com/aquasecurity/trivy/issues/6878)) ([093c0ae](https://github.com/aquasecurity/trivy/commit/093c0ae020548bf6f3d1896d4d55210eb42c7b0e))
+* **sbom:** don't overwrite `srcEpoch` when decoding SBOM files [backport: release/v0.52] ([#6881](https://github.com/aquasecurity/trivy/issues/6881)) ([f186d22](https://github.com/aquasecurity/trivy/commit/f186d22bf275e872bd664f07131604f6a0216f20))
 
 ## [0.52.0](https://github.com/aquasecurity/trivy/compare/v0.51.1...v0.52.0) (2024-06-03)
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.20.3
+FROM alpine:3.20.0
 RUN apk --no-cache add ca-certificates git
 COPY trivy /usr/local/bin/trivy
 COPY contrib/*.tpl contrib/

contrib/asff.tpl

@@ -108,7 +108,7 @@
                     "Region": "{{ env "AWS_REGION" }}",
                     "Details": {
                         "Other": {
-                            "Message": "{{ escapeString .Message }}",
+                            "Message": "{{ .Message }}",
                             "Filename": "{{ $target }}",
                             "StartLine": "{{ .CauseMetadata.StartLine }}",
                             "EndLine": "{{ .CauseMetadata.EndLine }}"

contrib/junit.tpl

@@ -33,16 +33,5 @@
         </testcase>
     {{- end }}
     </testsuite>
-
-{{- if .Licenses }}
-    {{- $licenses := len .Licenses }}
-    <testsuite tests="{{ $licenses }}" failures="{{ $licenses }}" name="{{ .Target }}" time="0">{{ range .Licenses }}
-        <testcase classname="{{ .PkgName }}" name="[{{ .Severity }}] {{ .Name }}">
-            <failure/>
-        </testcase>
-    {{- end }}
-    </testsuite>
-{{- end }}
-
 {{- end }}
 </testsuites>

docs/community/contribute/pr.md

@@ -1,6 +1,7 @@
 Thank you for taking interest in contributing to Trivy!
 
-1. Every Pull Request should have an associated GitHub issue link in the PR description. Note that issues are created by Trivy maintainers based on feedback provided in a GitHub discussion. Please refer to the [issue](./issue.md) and [discussion](./discussion.md) pages for explanation about this process. If you think your change is trivial enough, you can skip the issue and instead add justification and explanation in the PR description.
+1. Every Pull Request should have an associated bug or feature issue unless you are fixing a trivial documentation issue.
+1. Please add the associated Issue link in the PR description.
 1. Your PR is more likely to be accepted if it focuses on just one change.
 1. There's no need to add or tag reviewers.
 1. If a reviewer commented on your code or asked for changes, please remember to respond with comment. Do not mark discussion as resolved. It's up to reviewer to mark it resolved (in case if suggested fix addresses problem properly). PRs with unresolved issues should not be merged (even if the comment is unclear or requires no action from your side).
@@ -121,7 +122,7 @@ os:
 - redhat
 - alma
 - rocky
-- azure
+- mariner
 - oracle
 - debian
 - ubuntu
@@ -184,20 +185,12 @@ others:
 
 The `<scope>` can be empty (e.g. if the change is a global or difficult to assign to a single component), in which case the parentheses are omitted.
 
-**Breaking changes**
-
-A PR, introducing a breaking API change, needs to append a `!` after the type/scope.
-
 ### Example titles
 
 ```
 feat(alma): add support for AlmaLinux
 ```
 
-```
-feat(vuln)!: delete the existing CLI flag
-```
-
 ```
 fix(oracle): handle advisories with ksplice versions
 ```

docs/community/maintainer/backporting.md

@@ -1,59 +0,0 @@
-# Backporting Process
-
-This document outlines the backporting process for Trivy, including when to create patch releases and how to perform the backporting.
-
-## When to Create Patch Releases
-
-In general, small changes should not be backported and should be included in the next minor release.
-However, patch releases should be made in the following cases:
-
-* Fixes for HIGH or CRITICAL vulnerabilities in Trivy itself or Trivy's dependencies
-* Fixes for bugs that cause panic during Trivy execution or otherwise interfere with normal usage
-
-In these cases, the fixes should be backported using the procedure [described below](#backporting-procedure).
-At the maintainer's discretion, other bug fixes may be included in the patch release containing these hotfixes.
-
-## Versioning
-
-Trivy follows [Semantic Versioning](https://semver.org/), using version numbers in the format MAJOR.MINOR.PATCH.
-When creating a patch release, the PATCH part of the version number is incremented.
-For example, if a fix is being distributed for v0.50.0, the patch release would be v0.50.1.
-
-## Backporting Procedure
-
-1. A release branch (e.g., `release/v0.50`) is automatically created when a new minor version is released.
-1. Create a pull request (PR) against the main branch with the necessary fixes. If the fixes are already merged into the main branch, skip this step.
-1. Once the PR with the fixes is merged, comment `@aqua-bot backport <release-branch>` on the PR (e.g., `@aqua-bot backport release/v0.50`). This will trigger the automated backporting process using GitHub Actions.
-1. The automated process will create a new PR with the backported changes. Ensure that all tests pass for this PR.
-1. Once the tests pass, merge the automatically created PR into the release branch.
-1. Merge [a release PR](release-flow.md) on the release branch and release the patch version.
-
-!!! note
-    Even if a conflict occurs, a PR is created by forceful commit, in which case the conflict should be resolved manually.
-    If you want to re-run a backport of the same PR, close the existing PR, delete the branch and re-run it.
-
-### Example
-To better understand the backporting procedure, let's walk through an example using the releases of v0.50.
-
-```mermaid
-gitGraph:
-  commit id:"Feature 1"
-  commit id:"v0.50.0 release" tag:"v0.50.0"
-
-  branch "release/v0.50"
-  
-  checkout main
-  commit id:"Bugfix 1"
-
-  checkout "release/v0.50"
-  cherry-pick id:"Bugfix 1"
-
-  checkout main
-  commit id:"Feature 2"
-  commit id:"Bugfix 2"
-  commit id:"Feature 3"
-
-  checkout "release/v0.50"
-  cherry-pick id:"Bugfix 2"
-  commit id:"v0.50.1 release" tag:"v0.50.1"
-```

docs/community/maintainer/release-flow.md

@@ -16,10 +16,9 @@ For detailed behavior, please refer to [the GitHub Actions configuration][workfl
 The release flow consists of the following main steps:
 
 1. Creating the release PR (automatically or manually)
-1. Drafting the release notes in GitHub Discussions
+1. Drafting the release notes
 1. Merging the release PR
-1. Updating the release notes in GitHub Discussions
-1. Navigating to the release notes in GitHub Releases page
+1. Updating the release notes
 
 ### Automatic Release PR Creation
 When a releasable commit (a commit with `feat` or `fix` prefix) is merged, a release PR is automatically created.
@@ -58,23 +57,6 @@ When the PR is merged, a tag is automatically created, and [GoReleaser][goreleas
 If the release completes without errors, a page for the release notes is created in GitHub Discussions (e.g., https://github.com/aquasecurity/trivy/discussions/6622).
 Copy the draft release notes, adjust the formatting, and finalize the release notes.
 
-### Navigating to the Release Notes
-To navigate to the release highlights and summary in GitHub Discussions, place a link in the GitHub Releases page as below:
-
-```
-## ⚡Release highlights and summary⚡
-
-👉 https://github.com/aquasecurity/trivy/discussions/6838
-
-## Changelog
-https://github.com/aquasecurity/trivy/blob/main/CHANGELOG.md#0520-2024-06-03
-```
-
-Replace URLs with appropriate ones.
-
-Example: https://github.com/aquasecurity/trivy/releases/tag/v0.52.0
-
-
 The release is now complete.
 
 [conventional-commits]: https://www.conventionalcommits.org/en/v1.0.0/

docs/docs/advanced/air-gap.md

@@ -1,162 +1,142 @@
-# Advanced Network Scenarios
+# Air-Gapped Environment
 
-Trivy needs to connect to the internet occasionally in order to download relevant content. This document explains the network connectivity requirements of Trivy and setting up Trivy in particular scenarios.
+Trivy can be used in air-gapped environments. Note that an allowlist is [here][allowlist].
 
-## Network requirements
+## Air-Gapped Environment for vulnerabilities
 
-Trivy's databases are distributed as OCI images via GitHub Container registry (GHCR):
+### Download the vulnerability database
+At first, you need to download the vulnerability database for use in air-gapped environments.
 
-- <https://ghcr.io/aquasecurity/trivy-db>
-- <https://ghcr.io/aquasecurity/trivy-java-db>
-- <https://ghcr.io/aquasecurity/trivy-checks>
+=== "Trivy"
 
-The following hosts are required in order to fetch them:
+    ```
+    TRIVY_TEMP_DIR=$(mktemp -d)
+    trivy --cache-dir $TRIVY_TEMP_DIR image --download-db-only
+    tar -cf ./db.tar.gz -C $TRIVY_TEMP_DIR/db metadata.json trivy.db
+    rm -rf $TRIVY_TEMP_DIR
+    ```
 
-- `ghcr.io`
-- `pkg-containers.githubusercontent.com`
+=== "oras >= v0.13.0"
+    Please follow [oras installation instruction][oras].
 
-The databases are pulled by Trivy using the [OCI Distribution](https://github.com/opencontainers/distribution-spec) specification, which is a simple HTTPS-based protocol.
+    Download `db.tar.gz`:
 
-[VEX Hub](https://github.com/aquasecurity/vexhub) is distributed from GitHub over HTTPS.
-The following hosts are required in order to fetch it:
+    ```
+    $ oras pull ghcr.io/aquasecurity/trivy-db:2
+    ```
 
-- `api.github.com`
-- `codeload.github.com`
+=== "oras < v0.13.0"
+    Please follow [oras installation instruction][oras].
 
-## Running Trivy in air-gapped environment
+    Download `db.tar.gz`:
 
-An air-gapped environment refers to situations where the network connectivity from the machine Trivy runs on is blocked or restricted.
+    ```
+    $ oras pull -a ghcr.io/aquasecurity/trivy-db:2
+    ```
 
-In an air-gapped environment it is your responsibility to update the Trivy databases on a regular basis. 
+### Download the Java index database[^1]
+Java users also need to download the Java index database for use in air-gapped environments.
 
-## Offline Mode
+!!! note
+    You container image may contain JAR files even though you don't use Java directly.
+    In that case, you also need to download the Java index database.
 
-By default, Trivy will attempt to download latest databases. If it fails, the scan might fail. To avoid this behavior, you can tell Trivy to not attempt to download database files:
+=== "Trivy"
 
-- `--skip-db-update` to skip updating the main vulnerability database.
-- `--skip-java-db-update` to skip updating the Java vulnerability database.
-- `--skip-check-update` to skip updating the misconfiguration database.
+    ```
+    TRIVY_TEMP_DIR=$(mktemp -d)
+    trivy --cache-dir $TRIVY_TEMP_DIR image --download-java-db-only
+    tar -cf ./javadb.tar.gz -C $TRIVY_TEMP_DIR/java-db metadata.json trivy-java.db
+    rm -rf $TRIVY_TEMP_DIR
+    ```
+=== "oras >= v0.13.0"
+    Please follow [oras installation instruction][oras].
 
-```shell
-trivy image --skip-db-update --skip-java-db-update --offline-scan --skip-check-update myimage
+    Download `javadb.tar.gz`:
+
+    ```
+    $ oras pull ghcr.io/aquasecurity/trivy-java-db:1
+    ```
+
+=== "oras < v0.13.0"
+    Please follow [oras installation instruction][oras].
+
+    Download `javadb.tar.gz`:
+
+    ```
+    $ oras pull -a ghcr.io/aquasecurity/trivy-java-db:1
+    ```
+
+
+### Transfer the DB files into the air-gapped environment
+The way of transfer depends on the environment.
+
+=== "Vulnerability db"
+    ```
+    $ rsync -av -e ssh /path/to/db.tar.gz [user]@[host]:dst
+    ```
+
+=== "Java index db[^1]"
+    ```
+    $ rsync -av -e ssh /path/to/javadb.tar.gz [user]@[host]:dst
+    ```
+
+### Put the DB files in Trivy's cache directory
+You have to know where to put the DB files. The following command shows the default cache directory.
+
+```
+$ ssh user@host
+$ trivy -h | grep cache
+   --cache-dir value  cache directory (default: "/home/myuser/.cache/trivy") [$TRIVY_CACHE_DIR]
+```
+=== "Vulnerability db"
+    Put the DB file in the cache directory + `/db`.
+    
+    ```
+    $ mkdir -p /home/myuser/.cache/trivy/db
+    $ cd /home/myuser/.cache/trivy/db
+    $ tar xvf /path/to/db.tar.gz -C /home/myuser/.cache/trivy/db
+    x trivy.db
+    x metadata.json
+    $ rm /path/to/db.tar.gz
+    ```
+
+=== "Java index db[^1]"
+    Put the DB file in the cache directory + `/java-db`.
+
+    ```
+    $ mkdir -p /home/myuser/.cache/trivy/java-db
+    $ cd /home/myuser/.cache/trivy/java-db
+    $ tar xvf /path/to/javadb.tar.gz -C /home/myuser/.cache/trivy/java-db
+    x trivy-java.db
+    x metadata.json
+    $ rm /path/to/javadb.tar.gz
+    ```
+
+
+
+In an air-gapped environment it is your responsibility to update the Trivy databases on a regular basis, so that the scanner can detect recently-identified vulnerabilities. 
+
+### Run Trivy with the specific flags.
+In an air-gapped environment, you have to specify `--skip-db-update` and `--skip-java-db-update`[^1] so that Trivy doesn't attempt to download the latest database files.
+In addition, if you want to scan `pom.xml` dependencies, you need to specify `--offline-scan` since Trivy tries to issue API requests for scanning Java applications by default.
+
+```
+$ trivy image --skip-db-update --skip-java-db-update --offline-scan alpine:3.12
 ```
 
-## Self-Hosting
+## Air-Gapped Environment for misconfigurations
 
-### OCI Databases
+No special measures are required to detect misconfigurations in an air-gapped environment.
 
-You can host the databases on your own local OCI registry. 
+### Run Trivy with `--skip-check-update` option
+In an air-gapped environment, specify `--skip-check-update` so that Trivy doesn't attempt to download the latest misconfiguration checks.
 
-First, make a copy of the databases in a container registry that is accessible to Trivy. The databases are in:
-
-- `ghcr.io/aquasecurity/trivy-db:2`
-- `ghcr.io/aquasecurity/trivy-java-db:1`
-- `ghcr.io/aquasecurity/trivy-checks:0`
-
-Then, tell Trivy to use the local registry:
-
-```shell
-trivy image \
-    --db-repository myregistry.local/trivy-db \
-    --java-db-repository myregistry.local/trivy-java-db \
-    --checks-bundle-repository myregistry.local/trivy-checks \
-    myimage
+```
+$ trivy conf --skip-policy-update /path/to/conf
 ```
 
-#### Authentication
+[allowlist]: ../references/troubleshooting.md
+[oras]: https://oras.land/docs/installation
 
-If the registry requires authentication, you can configure it as described in the [private registry authentication document](../advanced/private-registries/index.md).
-
-### VEX Hub
-
-You can host a copy of VEX Hub on your own internal server.
-
-First, make a copy of VEX Hub in a location that is accessible to Trivy.
-
-1. Download the [VEX Hub](https://github.com/aquasecurity/vexhub) archive from: <https://github.com/aquasecurity/vexhub/archive/refs/heads/main.zip>.
-1. Download the [VEX Hub Repository Manifest](https://github.com/aquasecurity/vex-repo-spec#2-repository-manifest) file from: <https://github.com/aquasecurity/vexhub/blob/main/vex-repository.json>.
-1. Create or identify an internal HTTP server that can serve the VEX Hub repository in your environment (e.g `https://server.local`).
-1. Make the downloaded archive file available for serving from your server (e.g `https://server.local/main.zip`).
-1. Modify the downloaded manifest file's [Location URL](https://github.com/aquasecurity/vex-repo-spec?tab=readme-ov-file#locations-subfields) field to the URL of the archive file on your server (e.g `url: https://server.local/main.zip`).
-1. Make the manifest file available for serving from your server under the `/.well-known` path  (e.g `https://server.local/.well-known/vex-repository.json`).
-
-Then, tell Trivy to use the local VEX Repository:
-
-1. Locate your [Trivy VEX configuration file](../supply-chain/vex/repo/#configuration-file) by running `trivy vex repo init`. Make the following changes to the file.
-1. Disable the default VEX Hub repo (`enabled: false`)
-1. Add your internal VEX Hub repository as a [custom repository](../supply-chain/vex/repo/#custom-repositories) with the URL pointing to your local server (e.g `url: https://server.local`).
-
-#### Authentication
-
-If your server requires authentication, you can configure it as described in the [VEX Repository Authentication document](../supply-chain/vex/repo/#authentication).
-
-## Manual cache population
-
-You can also download the databases files manually and surgically populate the Trivy cache directory with them.
-
-### Downloading the DB files
-
-On a machine with internet access, pull the database container archive from the public registry into your local workspace:
-
-Note that these examples operate in the current working directory.
-
-=== "Using ORAS"
-This example uses [ORAS](https://oras.land), but you can use any other container registry manipulation tool.
-
-```shell
-oras pull ghcr.io/aquasecurity/trivy-db:2
-```
-
-You should now have a file called `db.tar.gz`. Next, extract it to reveal the db files:
-
-```shell
-tar -xzf db.tar.gz
-```
-
-You should now have 2 new files, `metadata.json` and `trivy.db`. These are the Trivy DB files.
-
-=== "Using Trivy"
-This example uses Trivy to pull the database container archive. The `--cache-dir` flag makes Trivy download the database files into our current working directory. The `--download-db-only` flag tells Trivy to only download the database files, not to scan any images.
-
-```shell
-trivy image --cache-dir . --download-db-only
-```
-
-You should now have 2 new files, `metadata.json` and `trivy.db`. These are the Trivy DB files, copy them over to the air-gapped environment.
-
-### Populating the Trivy Cache
-
-In order to populate the cache, you need to identify the location of the cache directory. If it is under the default location, you can run the following command to find it:
-
-```shell
-trivy -h | grep cache
-```
-
-For the example, we will assume the `TRIVY_CACHE_DIR` variable holds the cache location:
-
-```shell
-TRIVY_CACHE_DIR=/home/user/.cache/trivy
-```
-
-Put the Trivy DB files in the Trivy cache directory under a `db` subdirectory:
-
-```shell
-# ensure cache db directory exists
-mkdir -p ${TRIVY_CACHE_DIR}/db
-# copy the db files
-cp /path/to/trivy.db /path/to/metadata.json ${TRIVY_CACHE_DIR}/db/
-```
-
-### Java DB
-
-For Java DB the process is the same, except for the following:
-
-1. Image location is `ghcr.io/aquasecurity/trivy-java-db:1`
-2. Archive file name is `javadb.tar.gz`
-3. DB file name is `trivy-java.db`
-
-## Misconfigurations scanning
-
-Note that the misconfigurations checks bundle is also embedded in the Trivy binary (at build time), and will be used as a fallback if the external database is not available. This means that you can still scan for misconfigurations in an air-gapped environment using the Checks from the time of the Trivy release you are using.
-
-The misconfiguration scanner can be configured to load checks from a local directory, using the `--config-check` flag. In an air-gapped scenario you can copy the checks library from [Trivy checks repository](https://github.com/aquasecurity/trivy-checks) into a local directory, and load it with this flag. See more in the [Misconfiguration scanner documentation](../scanner/misconfiguration/index.md).
+[^1]: This is only required to scan `jar` files. More information about `Java index db` [here](../coverage/language/java.md)

docs/docs/compliance/compliance.md

@@ -35,231 +35,9 @@ to specify a built-in compliance report, select it by ID like `trivy --complianc
 For the list of built-in compliance reports, please see the relevant section:
 
 - [Docker compliance](../target/container_image.md#compliance)
-- [Kubernetes compliance](../target/kubernetes.md#compliance)
+- [Kubernetes compliance](../target/kubernetes.md#compliance) 
 - [AWS compliance](../target/aws.md#compliance)
 
-## Contribute a Built-in Compliance Report
-
-### Define a Compliance spec, based on CIS benchmark or other specs
-
-Here is an example for CIS compliance report:
-
-```yaml
----
-spec:
-  id: k8s-cis-1.23
-  title: CIS Kubernetes Benchmarks v1.23
-  description: CIS Kubernetes Benchmarks
-  platform: k8s
-  type: cis
-  version: '1.23'
-  relatedResources:
-  - https://www.cisecurity.org/benchmark/kubernetes
-  controls:
-  - id: 1.1.1
-    name: Ensure that the API server pod specification file permissions are set to
-      600 or more restrictive
-    description: Ensure that the API server pod specification file has permissions
-      of 600 or more restrictive
-    checks:
-    - id: AVD-KCV-0073
-    commands:
-    - id: CMD-0001
-    severity: HIGH
-
-```
-
-### Compliance ID
-
-ID field is the name used to execute the compliance scan via trivy
-example:
-
-```sh
-trivy k8s --compliance k8s-cis-1.23
-```
-
-ID naming convention: {platform}-{type}-{version}
-
-### Compliance Platform
-
-The platform field specifies the type of platform on which to run this compliance report.
-Supported platforms:
-
-- k8s (native kubernetes cluster)
-- eks (elastic kubernetes service)
-- aks (azure kubernetes service)
-- gke (google kubernetes engine)
-- rke2 (rancher kubernetes engine v2)
-- ocp (OpenShift Container Platform)
-- docker (docker engine)
-- aws (amazon web services)
-
-### Compliance Type
-
-The type field specifies the kind compliance report.
-
-- cis (Center for Internet Security)
-- nsa (National Security Agency)
-- pss (Pod Security Standards)
-
-### Compliance Version
-
-The version field specifies the version of the compliance report.
-
-- 1.23
-
-### Compliance Check ID
-
-Specify the check ID that needs to be evaluated based on the information collected from the command data output to assess the control.
-
-Example of how to define check data under [checks folder](https://github.com/aquasecurity/trivy-checks/tree/main/checks):
-
-```sh
-# METADATA
-# title: "Ensure that the --kubeconfig kubelet.conf file permissions are set to 600 or more restrictive"
-# description: "Ensure that the kubelet.conf file has permissions of 600 or more restrictive."
-# scope: package
-# schemas:
-# - input: schema["kubernetes"]
-# related_resources:
-# - https://www.cisecurity.org/benchmark/kubernetes
-# custom:
-#   id: KCV0073
-#   avd_id: AVD-KCV-0073
-#   severity: HIGH
-#   short_code: ensure-kubelet.conf-file-permissions-600-or-more-restrictive.
-#   recommended_action: "Change the kubelet.conf file permissions to 600 or more restrictive if exist"
-#   input:
-#     selector:
-#     - type: kubernetes
-package builtin.kubernetes.KCV0073
-
-import data.lib.kubernetes
-
-types := ["master", "worker"]
-
-validate_kubelet_file_permission(sp) := {"kubeletConfFilePermissions": violation} {
- sp.kind == "NodeInfo"
- sp.type == types[_]
- violation := {permission | permission = sp.info.kubeletConfFilePermissions.values[_]; permission > 600}
- count(violation) > 0
-}
-
-deny[res] {
- output := validate_kubelet_file_permission(input)
- msg := "Ensure that the --kubeconfig kubelet.conf file permissions are set to 600 or more restrictive"
- res := result.new(msg, output)
-}
-```
-
-### Compliance Command ID
-
-***Note:*** This field is not mandatory, it is relevant to k8s compliance report when node-collector is in use
-
-Specify the command ID (#ref) that needs to be executed to collect the information required to evaluate the control.
-
-Example of how to define command data under [commands folder](https://github.com/aquasecurity/trivy-checks/tree/main/commands)
-
-```yaml
----
-- id: CMD-0001
-  key: kubeletConfFilePermissions
-  title: kubelet.conf file permissions
-  nodeType: worker
-  audit: stat -c %a $kubelet.kubeconfig
-  platfroms:
-    - k8s
-    - aks
-```
-
-#### Command ID
-
-Find the next command ID by running the command on [trivy-checks project](https://github.com/aquasecurity/trivy-checks).
-
-```sh
-make command-id
-```
-
-#### Command Key
-
-- Re-use an existing key or specifiy a new one (make sure key name has no spaces)
-
-Note: The key value should match the key name evaluated by the Rego check.
-
-### Command Title
-
-Represent the purpose of the command
-
-### Command NodeType
-
-Specify the node type on which the command is supposed to run.
-
-- worker
-- master
-
-### Command Audit
-
-Specify here the shell command to be used please make sure to add error supression (2>/dev/null)
-
-### Command Platforms
-
-The list of platforms that support this command. Name should be taken from this list [Platforms](#compliance-platform)
-
-### Command Config Files
-
-The commands use a configuration file that helps obtain the paths to binaries and configuration files based on different platforms (e.g., Rancher, native Kubernetes, etc.).
-
-For example:
-
-```yaml
-kubelet:
-    bins:
-      - kubelet
-      - hyperkube kubelet
-    confs:
-      - /etc/kubernetes/kubelet-config.yaml
-      - /var/lib/kubelet/config.yaml
-```
-
-### Commands Files Location
-
-Currently checks files location are :`https://github.com/aquasecurity/trivy-checks/tree/main/checks`
-
-Command files location: `https://github.com/aquasecurity/trivy-checks/tree/main/commands`
-under command file
-
-Note: command config files will be located under `https://github.com/aquasecurity/trivy-checks/tree/main/commands` as well
-
-### Node-collector output
-
-The node collector will read commands and execute each command, and incorporate the output into the NodeInfo resource.
-
-example:
-
-```json
-{
-  "apiVersion": "v1",
-  "kind": "NodeInfo",
-  "metadata": {
-    "creationTimestamp": "2023-01-04T11:37:11+02:00"
-  },
-  "type": "master",
-  "info": {
-    "adminConfFileOwnership": {
-      "values": [
-        "root:root"
-      ]
-    },
-    "adminConfFilePermissions": {
-      "values": [
-        600
-      ]
-    }
-    ...
-  }
-}
-```
-
 ## Custom compliance
 
 You can create your own custom compliance report. A compliance report is a simple YAML document in the following format:

docs/docs/compliance/contrib-compliance.md

@@ -35,7 +35,7 @@ Additional information is provided below.
 
 #### 1. Referencing a check that is already part of Trivy
 
-Trivy has a comprehensive list of checks as part of its misconfiguration scanning. These can be found in the `trivy-checks/checks` directory ([Link](https://github.com/aquasecurity/trivy-checks/tree/main/checks)). If the check is present, the `AVD_ID` and other information from the check has to be used.
+Trivy has a comprehensive list of checks as part of its misconfiguration scanning. These can be found in the `trivy-policies/checks` directory ([Link](https://github.com/aquasecurity/trivy-checks/tree/main/checks)). If the check is present, the `AVD_ID` and other information from the check has to be used.
 
 Note: Take a look at the more generic compliance specs that are already available in Trivy. If you are adding new compliance spec to Kubernetes e.g. AWS EKS CIS Benchmarks, chances are high that the check you would like to add to the new spec has already been defined in the general `k8s-ci-v.000.yaml` compliance spec. The same applies for creating specific Cloud Provider Compliance Specs and the [generic compliance specs](https://github.com/aquasecurity/trivy-checks/tree/main/specs/compliance) available. 
 

docs/docs/configuration/cache.md

@@ -1,90 +1,60 @@
 # Cache
 The cache directory includes 
 
-- Cache of previous scans (Scan cache).
 - [Vulnerability Database][trivy-db][^1]
 - [Java Index Database][trivy-java-db][^2]
 - [Misconfiguration Checks][misconf-checks][^3]
-- [VEX Repositories](../supply-chain/vex/repo.md)
+- Cache of previous scans.
  
 The cache option is common to all scanners.
 
 ## Clear Caches
-`trivy clean` subcommand removes caches.
+The `--clear-cache` option removes caches.
 
-```bash
-$ trivy clean --scan-cache
+**The scan is not performed.**
+
+```
+$ trivy image --clear-cache
 ```
 
 <details>
 <summary>Result</summary>
 
 ```
-2024-06-21T21:58:21+04:00       INFO    Removing scan cache...
+2019-11-15T15:13:26.209+0200    INFO    Reopening vulnerability DB
+2019-11-15T15:13:26.209+0200    INFO    Removing image caches...
 ```
 
 </details>
 
-If you want to delete cached vulnerability databases, use `--vuln-db`.
-You can also delete all caches with `--all`.
-See `trivy clean --help` for details.
-
 ## Cache Directory
 Specify where the cache is stored with `--cache-dir`.
 
-```bash
+```
 $ trivy --cache-dir /tmp/trivy/ image python:3.4-alpine3.9
 ```
 
-## Scan Cache Backend
+## Cache Backend
 !!! warning "EXPERIMENTAL"
     This feature might change without preserving backwards compatibility.
 
-Trivy utilizes a scan cache to store analysis results, such as package lists.
-It supports three types of backends for this cache: 
+Trivy supports local filesystem and Redis as the cache backend. This option is useful especially for client/server mode.
 
-- Local File System (`fs`)
-    - The cache path can be specified by `--cache-dir`
-- Memory (`memory`)
-- Redis (`redis://`)
+Two options:
+
+- `fs`
+    - the cache path can be specified by `--cache-dir`
+- `redis://`
     - `redis://[HOST]:[PORT]`
     - TTL can be configured via `--cache-ttl`
 
-### Local File System
-The local file system backend is the default choice for container and VM image scans.
-When scanning container images, it stores analysis results on a per-layer basis, using layer IDs as keys.
-This approach enables faster scans of the same container image or different images that share layers.
-
-!!! note
-    Internally, this backend uses [BoltDB][boltdb], which has an important limitation: only one process can access the cache at a time.
-    Subsequent processes attempting to access the cache will be locked.
-    For more details on this limitation, refer to the [troubleshooting guide][parallel-run].
-
-### Memory
-The memory backend stores analysis results in memory, which means the cache is discarded when the process ends.
-This makes it useful in scenarios where caching is not required or desired.
-It serves as the default for repository, filesystem and SBOM scans and can also be employed for container image scans when caching is unnecessary.
-
-To use the memory backend for a container image scan, you can use the following command:
-
-```bash
-$ trivy image debian:11 --cache-backend memory
 ```
-
-### Redis
-
-The Redis backend is particularly useful when you need to share the cache across multiple Trivy instances.
-You can set up Trivy to use a Redis backend with a command like this:
-
-```bash
 $ trivy server --cache-backend redis://localhost:6379
 ```
 
-This approach allows for centralized caching, which can be beneficial in distributed or high-concurrency environments.
-
 If you want to use TLS with Redis, you can enable it by specifying the `--redis-tls` flag.
 
-```bash
+```shell
 $ trivy server --cache-backend redis://localhost:6379 --redis-tls
 ```
 
@@ -101,8 +71,6 @@ $ trivy server --cache-backend redis://localhost:6379 \
 [trivy-db]: ./db.md#vulnerability-database
 [trivy-java-db]: ./db.md#java-index-database
 [misconf-checks]: ../scanner/misconfiguration/check/builtin.md
-[boltdb]: https://github.com/etcd-io/bbolt
-[parallel-run]: https://aquasecurity.github.io/trivy/v0.52/docs/references/troubleshooting/#running-in-parallel-takes-same-time-as-series-run
 
 [^1]: Downloaded when scanning for vulnerabilities
 [^2]: Downloaded when scanning `jar/war/par/ear` files

docs/docs/configuration/db.md

@@ -54,44 +54,11 @@ $ trivy image --download-db-only
 $ trivy image --db-repository registry.gitlab.com/gitlab-org/security-products/dependencies/trivy-db
 ```
 
-The media type of the OCI layer must be `application/vnd.aquasec.trivy.db.layer.v1.tar+gzip`.
-You can reference the OCI manifest of [trivy-db].
-
-<details>
-<summary>Manifest</summary>
-
-```shell
-{
-  "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.v1+json",
-  "config": {
-    "mediaType": "application/vnd.aquasec.trivy.config.v1+json",
-    "digest": "sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a",
-    "size": 2
-  },
-  "layers": [
-    {
-      "mediaType": "application/vnd.aquasec.trivy.db.layer.v1.tar+gzip",
-      "digest": "sha256:29ad6505b8957c7cd4c367e7c705c641a9020d2be256812c5f4cc2fc099f4f02",
-      "size": 55474933,
-      "annotations": {
-        "org.opencontainers.image.title": "db.tar.gz"
-      }
-    }
-  ],
-  "annotations": {
-    "org.opencontainers.image.created": "2024-09-11T06:14:51Z"
-  }
-}
-```
-</details>
-
 !!!note
     Trivy automatically adds the `trivy-db` schema version as a tag if the tag is not used:
 
     `trivy-db-registry:latest` => `trivy-db-registry:latest`, but `trivy-db-registry` => `trivy-db-registry:2`.
 
-
 ## Java Index Database
 The same options are also available for the Java index DB, which is used for scanning Java applications.
 Skipping an update can be done by using the `--skip-java-db-update` option, while `--download-java-db-only` can be used to only download the Java index DB.
@@ -105,22 +72,14 @@ Downloading the Java index DB from an external OCI registry can be done by using
 $ trivy image --java-db-repository registry.gitlab.com/gitlab-org/security-products/dependencies/trivy-java-db --download-java-db-only
 ```
 
-The media type of the OCI layer must be `application/vnd.aquasec.trivy.javadb.layer.v1.tar+gzip`.
-You can reference the OCI manifest of [trivy-java-db].
-
 !!!note
     Trivy automatically adds the `trivy-java-db` schema version as a tag if the tag is not used:
 
     `java-db-registry:latest` => `java-db-registry:latest`, but `java-db-registry` => `java-db-registry:1`.
 
 ## Remove DBs
-"trivy clean" command removes caches and databases.
+The `--reset` flag removes all caches and databases.
 
 ```
-$ trivy clean --vuln-db --java-db
-2024-06-24T11:42:31+06:00       INFO    Removing vulnerability database...
-2024-06-24T11:42:31+06:00       INFO    Removing Java database...
-```
-
-[trivy-db]: https://github.com/aquasecurity/trivy-db/pkgs/container/trivy-db
-[trivy-java-db]: https://github.com/aquasecurity/trivy-java-db/pkgs/container/trivy-java-db
+$ trivy image --reset
+```

docs/docs/configuration/filtering.md

@@ -101,7 +101,7 @@ Total: 1785 (UNKNOWN: 0, LOW: 0, MEDIUM: 0, HIGH: 1680, CRITICAL: 105)
 </details>
 
 ```bash
-trivy config --severity HIGH,CRITICAL examples/misconf/mixed
+trivy conf --severity HIGH,CRITICAL examples/misconf/mixed
 ```
 
 <details>
@@ -238,7 +238,7 @@ You can filter the results by
 To show the suppressed results, use the `--show-suppressed` flag.
 
 !!! note
-    It's exported as `ExperimentalModifiedFindings` in the JSON output.
+    This flag is currently available only in the table format.
 
 ```bash
 $ trivy image --vex debian11.csaf.vex --ignorefile .trivyignore.yaml --show-suppressed debian:11
@@ -493,7 +493,7 @@ You can find more example checks [here](https://github.com/aquasecurity/trivy/tr
 |      Secret      |           |
 |     License      |           |
 
-Please refer to the [VEX documentation](../supply-chain/vex/index.md) for the details.
+Please refer to the [VEX documentation](../supply-chain/vex.md) for the details.
 
 
 [^1]: license name is used as id for `.trivyignore.yaml` files.

docs/docs/configuration/reporting.md

@@ -64,7 +64,6 @@ The following languages are currently supported:
 | PHP      | [composer.lock][composer-lock]             |
 | Java     | [pom.xml][pom-xml]                         |
 |          | [*gradle.lockfile][gradle-lockfile]        |
-|          | [*.sbt.lock][sbt-lockfile]                 |
 | Dart     | [pubspec.lock][pubspec-lock]               |
 
 This tree is the reverse of the dependency graph.
@@ -448,6 +447,5 @@ $ trivy convert --format table --severity CRITICAL result.json
 [composer-lock]: ../coverage/language/php.md#composer
 [pom-xml]: ../coverage/language/java.md#pomxml
 [gradle-lockfile]: ../coverage/language/java.md#gradlelock
-[sbt-lockfile]: ../coverage/language/java.md#sbt
 [pubspec-lock]: ../coverage/language/dart.md#dart
 [cargo-binaries]: ../coverage/language/rust.md#binaries

docs/docs/coverage/iac/cloudformation.md

@@ -21,7 +21,7 @@ It evaluates properties, functions, and other elements within CloudFormation fil
 You can provide `cf-params` with path to [CloudFormation Parameters] file to Trivy to scan your CloudFormation code with parameters.
 
 ```bash
-trivy config --cf-params params.json ./infrastructure/cf
+trivy conf --cf-params params.json ./infrastructure/cf
 ```
 
 You can check a [CloudFormation Parameters Example]

docs/docs/coverage/iac/helm.md

@@ -21,7 +21,7 @@ When override values are passed to the Helm scanner, the values will be used dur
 Overrides can be set inline on the command line
 
 ```bash
-trivy config --helm-set securityContext.runAsUser=0 ./charts/mySql
+trivy conf --helm-set securityContext.runAsUser=0 ./charts/mySql
 ```
 
 #### Setting value file overrides
@@ -35,7 +35,7 @@ securityContext:
 ```
 
 ```bash
-trivy config --helm-values overrides.yaml ./charts/mySql
+trivy conf --helm-values overrides.yaml ./charts/mySql
 ``` 
 
 #### Setting value as explicit string
@@ -49,7 +49,7 @@ trivy config --helm-set-string name=false ./infrastructure/tf
 Specific override values can come from specific files
 
 ```bash
-trivy config --helm-set-file environment=dev.values.yaml ./charts/mySql
+trivy conf --helm-set-file environment=dev.values.yaml ./charts/mySql
 ```
 
 ## Secret

docs/docs/coverage/iac/index.md

@@ -8,18 +8,15 @@ Trivy scans Infrastructure as Code (IaC) files for
 
 ## Supported configurations
 
-| Config type                         | File patterns                    |
-|-------------------------------------|----------------------------------|
-| [Kubernetes](kubernetes.md)         | \*.yml, \*.yaml, \*.json         |
-| [Docker](docker.md)                 | Dockerfile, Containerfile        |
-| [Terraform](terraform.md)           | \*.tf, \*.tf.json, \*.tfvars     |
-| [Terraform Plan](terraform.md)      | tfplan, \*.tfplan, \*.json       |
-| [CloudFormation](cloudformation.md) | \*.yml, \*.yaml, \*.json         |
-| [Azure ARM Template](azure-arm.md)  | \*.json                          |
-| [Helm](helm.md)                     | \*.yaml, \*.tpl, \*.tar.gz, etc. |
-| [YAML][json-and-yaml]               | \*.yaml, \*.yml                  |
-| [JSON][json-and-yaml]               | \*.json                          |
+| Config type                         | File patterns                                 |
+|-------------------------------------|-----------------------------------------------|
+| [Kubernetes](kubernetes.md)         | \*.yml, \*.yaml, \*.json                      |
+| [Docker](docker.md)                 | Dockerfile, Containerfile                     |
+| [Terraform](terraform.md)           | \*.tf, \*.tf.json, \*.tfvars                  |
+| [Terraform Plan](terraform.md)      | tfplan, \*.tfplan, \*.tfplan.json, \*.tf.json |
+| [CloudFormation](cloudformation.md) | \*.yml, \*.yaml, \*.json                      |
+| [Azure ARM Template](azure-arm.md)  | \*.json                                       |
+| [Helm](helm.md)                     | \*.yaml, \*.tpl, \*.tar.gz, etc.              |
 
 [misconf]: ../../scanner/misconfiguration/index.md
 [secret]: ../../scanner/secret.md
-[json-and-yaml]: ../../scanner/misconfiguration/index.md#scan-arbitrary-json-and-yaml-configurations

docs/docs/coverage/iac/terraform.md

@@ -18,13 +18,13 @@ It supports the following formats:
 Trivy can scan Terraform Plan files (snapshots) or their JSON representations. To create a Terraform Plan and scan it, run the following command:
 ```bash
 terraform plan --out tfplan
-trivy config tfplan
+trivy conf tfplan
 ```
 
 To scan a Terraform Plan representation in JSON format, run the following command:
 ```bash
 terraform show -json tfplan > tfplan.json
-trivy config tfplan.json
+trivy conf tfplan.json
 ```
 
 ## Misconfiguration
@@ -35,7 +35,7 @@ It also evaluates variables, imports, and other elements within Terraform files
 You can provide `tf-vars` files to Trivy to override default values specified in the Terraform HCL code.
 
 ```bash
-trivy config --tf-vars dev.terraform.tfvars ./infrastructure/tf
+trivy conf --tf-vars dev.terraform.tfvars ./infrastructure/tf
 ```
 
 ### Exclude Downloaded Terraform Modules
@@ -43,37 +43,8 @@ By default, downloaded modules are also scanned.
 If you don't want to scan them, you can use the `--tf-exclude-downloaded-modules` flag.
 
 ```bash
-trivy config --tf-exclude-downloaded-modules ./configs
+trivy conf --tf-exclude-downloaded-modules ./configs
 ```
 
 ## Secret
-The secret scan is performed on plain text files, with no special treatment for Terraform.
-
-## Limitations
-
-### Terraform Plan JSON
-
-#### For each and count objects in expression
-
-The plan created by Terraform does not provide complete information about references in expressions that use `each` or `count` objects. For this reason, in some situations it is not possible to establish references between resources that are needed for checks when detecting misconfigurations. An example of such a configuration is:
-
-```hcl
-locals {
-  buckets = toset(["test"])
-}
-
-resource "aws_s3_bucket" "this" {
-  for_each = local.buckets
-  bucket = each.key
-}
-
-resource "aws_s3_bucket_acl" "this" {
-  for_each = local.buckets
-  bucket = aws_s3_bucket.this[each.key].id
-  acl    = "private"
-}
-```
-
-With this configuration, the plan will not contain information about which attribute of the `aws_s3_bucket` resource is referenced by the `aws_s3_bucket_acl` resource.
-
-See more [here](https://github.com/hashicorp/terraform/issues/30826).
+The secret scan is performed on plain text files, with no special treatment for Terraform.

docs/docs/coverage/language/c.md

@@ -23,11 +23,10 @@ In order to detect dependencies, Trivy searches for `conan.lock`[^1].
 
 ### Licenses
 The Conan lock file doesn't contain any license information.
-To obtain licenses we parse the `conanfile.py` files from the [conan v1 cache directory][conan-v1-cache-dir] and [conan v2 cache directory][conan-v2-cache-dir].
+To obtain licenses we parse the `conanfile.py` files from the [conan cache directory][conan-cache-dir].
 To correctly detection licenses, ensure that the cache directory contains all dependencies used.
 
-[conan-v1-cache-dir]: https://docs.conan.io/1/mastering/custom_cache.html
-[conan-v2-cache-dir]: https://docs.conan.io/2/reference/environment.html#conan-home
+[conan-cache-dir]: https://docs.conan.io/1/mastering/custom_cache.html
 [dependency-graph]: ../../configuration/reporting.md#show-origins-of-vulnerable-dependencies
 
 [^1]: The local cache should contain the dependencies used. See [licenses](#licenses).

docs/docs/coverage/language/dart.md

@@ -4,16 +4,16 @@ Trivy supports [Dart][dart].
 
 The following scanners are supported.
 
-| Package manager         | SBOM | Vulnerability | License |
-|-------------------------|:----:|:-------------:|:-------:|
-| [Dart][dart-repository] |  ✓   |       ✓       |    -    |
+| Package manager         | SBOM  | Vulnerability | License |
+|-------------------------| :---: | :-----------: |:-------:|
+| [Dart][dart-repository] |   ✓   |       ✓       |    -    |
 
 The following table provides an outline of the features Trivy offers.
 
 
-| Package manager         | File         | Transitive dependencies | Dev dependencies | [Dependency graph][dependency-graph] | Position | [Detection Priority][detection-priority] |
-|-------------------------|--------------|:-----------------------:|:----------------:|:------------------------------------:|:--------:|:----------------------------------------:|
-| [Dart][dart-repository] | pubspec.lock |            ✓            |     Included     |                  ✓                   |    -     |                    ✓                     |
+| Package manager         | File         | Transitive dependencies | Dev dependencies | [Dependency graph][dependency-graph] | Position |
+|-------------------------|--------------|:-----------------------:|:----------------:|:------------------------------------:|:--------:|
+| [Dart][dart-repository] | pubspec.lock |            ✓            |     Included     |                  ✓                   |    -     |
 
 ## Dart
 In order to detect dependencies, Trivy searches for `pubspec.lock`.
@@ -21,28 +21,7 @@ In order to detect dependencies, Trivy searches for `pubspec.lock`.
 Trivy marks indirect dependencies, but `pubspec.lock` file doesn't have options to separate root and dev transitive dependencies.
 So Trivy includes all dependencies in report.
 
-### SDK dependencies
-Dart uses version `0.0.0` for SDK dependencies (e.g. Flutter).
-It is not possible to accurately determine the versions of these dependencies.
-Trivy just treats them as `0.0.0`.
-
-If [--detection-priority comprehensive][detection-priority] is passed, Trivy uses the minimum version of the constraint for the SDK.
-For example, in the following case, the version of `flutter` would be `3.3.0`:
-
-```yaml
-flutter:
-  dependency: "direct main"
-  description: flutter
-  source: sdk
-  version: "0.0.0"
-sdks:
-  dart: ">=2.18.0 <3.0.0"
-  flutter: "^3.3.0"
-```
-
-### Dependency tree
 To build `dependency tree` Trivy parses [cache directory][cache-directory]. Currently supported default directories and `PUB_CACHE` environment (absolute path only).
-
 !!! note
     Make sure the cache directory contains all the dependencies installed in your application. To download missing dependencies, use `dart pub get` command.     
 
@@ -50,4 +29,3 @@ To build `dependency tree` Trivy parses [cache directory][cache-directory]. Curr
 [dart-repository]: https://pub.dev/
 [dependency-graph]: ../../configuration/reporting.md#show-origins-of-vulnerable-dependencies
 [cache-directory]: https://dart.dev/tools/pub/glossary#system-cache
-[detection-priority]: ../../scanner/vulnerability.md#detection-priority

docs/docs/coverage/language/dotnet.md

@@ -21,9 +21,6 @@ The following table provides an outline of the features Trivy offers.
 ## *.deps.json
 Trivy parses `*.deps.json` files. Trivy currently excludes dev dependencies from the report.
 
-!!! note
-    Trivy only includes runtime dependencies in the report.
-
 ## packages.config
 Trivy only finds dependency names and versions from `packages.config` files. To build dependency graph, it is better to use `packages.lock.json` files.
 

docs/docs/coverage/language/golang.md

@@ -1,31 +1,32 @@
 # Go
 
-## Overview
+## Data Sources
+The data sources are listed [here](../../scanner/vulnerability.md#data-sources-1).
+Trivy uses Go Vulnerability Database for standard packages, such as `net/http`, and uses GitHub Advisory Database for third-party packages.
+
+## Features
 Trivy supports two types of Go scanning, Go Modules and binaries built by Go.
 
 The following scanners are supported.
 
-| Artifact | SBOM | Vulnerability |    License    |
-|----------|:----:|:-------------:|:-------------:|
-| Modules  |  ✓   |       ✓       | [✓](#license) |
-| Binaries |  ✓   |       ✓       |       -       |
+| Artifact | SBOM  | Vulnerability | License |
+| -------- | :---: | :-----------: | :-----: |
+| Modules  |   ✓   |       ✓       |  ✓[^2]  |
+| Binaries |   ✓   |       ✓       |    -    |
 
 The table below provides an outline of the features Trivy offers.
 
-| Artifact | Offline[^1] | Dev dependencies | [Dependency graph][dependency-graph] |          Stdlib          | [Detection Priority][detection-priority] |
-|----------|:-----------:|:-----------------|:------------------------------------:|:------------------------:|:----------------------------------------:|
-| Modules  |      ✅      | Include          |        [✅](#dependency-graph)        |  [✅](#standard-library)  |          [✅](#standard-library)          |
-| Binaries |      ✅      | Exclude          |                  -                   | [✅](#standard-library-1) |                Not needed                |
+| Artifact | Offline[^1] | Dev dependencies | [Dependency graph][dependency-graph] | Stdlib |
+|----------|:-----------:|:-----------------|:------------------------------------:|:------:|
+| Modules  |      ✅      | Include          |                ✅[^2]                 |   -    |
+| Binaries |      ✅      | Exclude          |                  -                   | ✅[^4]  |
 
 !!! note
-    When scanning Go projects (go.mod or binaries built with Go), Trivy scans only dependencies of the project, and does not detect vulnerabilities of application itself. 
-    For example, when scanning the Docker project (Docker's source code with go.mod or the Docker binary), Trivy might find vulnerabilities in Go modules that Docker depends on, but won't find vulnerabilities of Docker itself. Moreover, when scanning the Trivy project, which happens to use Docker, Docker's vulnerabilities might be detected as dependencies of Trivy.
+    Trivy scans only dependencies of the Go project.
+    Let's say you scan the Docker binary, Trivy doesn't detect vulnerabilities of Docker itself.
+    Also, when you scan go.mod in Kubernetes, the Kubernetes vulnerabilities will not be found.
 
-## Data Sources
-The data sources are listed [here](../../scanner/vulnerability.md#data-sources-1).
-Trivy uses Go Vulnerability Database for [standard library](https://pkg.go.dev/std) and uses GitHub Advisory Database for other Go modules.
-
-## Go Module
+### Go Modules
 Depending on Go versions, the required files are different.
 
 | Version | Required files | Offline |
@@ -41,7 +42,7 @@ Go 1.17+ holds actually needed indirect dependencies in `go.mod`, and it reduces
 If you want to have better detection, please consider updating the Go version in your project.
 
 !!! note
-    The Go version doesn't mean your Go tool version, but the Go version in your go.mod.
+    The Go version doesn't mean your CLI version, but the Go version in your go.mod.
 
     ```
     module github.com/aquasecurity/trivy
@@ -60,37 +61,15 @@ If you want to have better detection, please consider updating the Go version in
     $ go mod tidy -go=1.18
     ```
 
-### Main Module
-Trivy scans only dependencies of the project, and does not detect vulnerabilities of the main module. 
-For example, when scanning the Docker project (Docker's source code with go.mod), Trivy might find vulnerabilities in Go modules that Docker depends on, but won't find vulnerabilities of Docker itself.
-Moreover, when scanning the Trivy project, which happens to use Docker, Docker's vulnerabilities might be detected as dependencies of Trivy.
-
-### Standard Library
-Detecting the version of Go used in the project can be tricky.
-The go.mod file include hints that allows Trivy to guess the Go version but it eventually depends on the Go tool version in the build environment.
-Since this strategy is not fully deterministic and accurate, it is enabled only in [--detection-priority comprehensive][detection-priority] mode.
-When enabled, Trivy detects stdlib version as the minimum between the `go` and the `toolchain` directives in the `go.mod` file.
-To obtain reproducible scan results Trivy doesn't check the locally installed version of `Go`.
-
-!!! note
-    Trivy detects `stdlib` only for `Go` 1.21 or higher.
-
-    The version from the `go` line (for `Go` 1.20 or early) is not a minimum required version.
-    For details, see [this](https://go.googlesource.com/proposal/+/master/design/57001-gotoolchain.md).
-
-It possibly produces false positives.
-See [the caveat](#stdlib-vulnerabilities) for details.
-
-### License
-To identify licenses, you need to download modules to local cache beforehand, such as `go mod download`, `go mod tidy`, etc.
+To identify licenses and dependency relationships, you need to download modules to local cache beforehand,
+such as `go mod download`, `go mod tidy`, etc.
 Trivy traverses `$GOPATH/pkg/mod` and collects those extra information.
 
-### Dependency Graph
-Same as licenses, you need to download modules to local cache beforehand.
+### Go binaries
+Trivy scans binaries built by Go.
+If there is a Go binary in your container image, Trivy automatically finds and scans it.
 
-## Go Binary
-Trivy scans Go binaries when it encounters them during scans such as container images or file systems. 
-When scanning binaries built by Go, Trivy finds dependencies and Go version information as [embedded in the binary by Go tool at build time](https://tip.golang.org/doc/go1.18#go-version).
+Also, you can scan your local binaries.
 
 ```
 $ trivy rootfs ./your_binary
@@ -99,34 +78,20 @@ $ trivy rootfs ./your_binary
 !!! note
     It doesn't work with UPX-compressed binaries.
 
-### Main Module
-Go binaries installed using the `go install` command contains correct (semver) version for the main module and therefor are detected by Trivy.
-In other cases, Go uses the `(devel)` version[^2].
-In this case, Trivy will attempt to parse any `-ldflags` as it's a common practice to pass versions this way.
-If unsuccessful, the version will be empty[^3].
+#### Empty versions
+There are times when Go uses the `(devel)` version for modules/dependencies.
 
-### Standard Library
-Trivy detects the Go version used to compile the binary and detects its vulnerabilities in the standard libraries.
-It possibly produces false positives.
-See [the caveat](#stdlib-vulnerabilities) for details.
+- Only Go binaries installed using the `go install` command contain correct (semver) version for the main module. 
+  In other cases, Go uses the `(devel)` version[^3].
+- Dependencies replaced with local ones use the `(devel)` versions.
 
-## Caveats
-
-### Stdlib Vulnerabilities
-Trivy does not know if or how you use stdlib functions, therefore it is possible that stdlib vulnerabilities are not applicable to your use case.
-There are a few ways to mitigate this:
-
-1. Analyze vulnerability reachability using a tool such as [govulncheck](https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck). This will ensure that reported vulnerabilities are applicable to your project.
-2. Suppress non-applicable vulnerabilities using either [ignore file](../../configuration/filtering.md) for self-use or [VEX Hub](../../supply-chain/vex/repo.md) for public use.
-
-### Empty Version
-As described in the [Main Module](#main-module-1) section, the main module of Go binaries might have an empty version.
-Also, dependencies replaced with local ones will have an empty version.
+In the first case, Trivy will attempt to parse any `-ldflags` as a secondary source, and will leave the version
+empty if it cannot do so[^5]. For the second case, the version of such packages is empty.
 
 [^1]: It doesn't require the Internet access.
-[^2]: See https://github.com/aquasecurity/trivy/issues/1837#issuecomment-1832523477
-[^3]: See https://github.com/golang/go/issues/63432#issuecomment-1751610604
+[^2]: Need to download modules to local cache beforehand
+[^3]: See https://github.com/aquasecurity/trivy/issues/1837#issuecomment-1832523477
+[^4]: Identify the Go version used to compile the binary and detect its vulnerabilities
+[^5]: See https://github.com/golang/go/issues/63432#issuecomment-1751610604
 
 [dependency-graph]: ../../configuration/reporting.md#show-origins-of-vulnerable-dependencies
-[toolchain]: https://go.dev/doc/toolchain
-[detection-priority]: ../../scanner/vulnerability.md#detection-priority

docs/docs/coverage/language/index.md

@@ -26,8 +26,7 @@ On the other hand, when the target is a post-build artifact, like a container im
 |                      | egg package[^1]                                                                            |     ✅     |     ✅      |       -        |       -        |
 |                      | wheel package[^2]                                                                          |     ✅     |     ✅      |       -        |       -        |
 |                      | conda package[^3]                                                                          |     ✅     |     ✅      |       -        |       -        |
-| [PHP](php.md)        | composer.lock                                                                              |     -     |     -      |       ✅        |       ✅        |
-|                      | installed.json                                                                             |     ✅     |     ✅      |       -        |       -        |
+| [PHP](php.md)        | composer.lock                                                                              |     ✅     |     ✅      |       ✅        |       ✅        |
 | [Node.js](nodejs.md) | package-lock.json                                                                          |     -     |     -      |       ✅        |       ✅        |
 |                      | yarn.lock                                                                                  |     -     |     -      |       ✅        |       ✅        |
 |                      | pnpm-lock.yaml                                                                             |     -     |     -      |       ✅        |       ✅        |
@@ -39,7 +38,6 @@ On the other hand, when the target is a post-build artifact, like a container im
 | [Java](java.md)      | JAR/WAR/PAR/EAR[^4]                                                                        |     ✅     |     ✅      |       -        |       -        |
 |                      | pom.xml                                                                                    |     -     |     -      |       ✅        |       ✅        |
 |                      | *gradle.lockfile                                                                           |     -     |     -      |       ✅        |       ✅        |
-|                      | *.sbt.lock                                                                                 |     -     |     -      |       ✅        |       ✅        |
 | [Go](golang.md)      | Binaries built by Go                                                                       |     ✅     |     ✅      |       -        |       -        |
 |                      | go.mod                                                                                     |     -     |     -      |       ✅        |       ✅        |
 | [Rust](rust.md)      | Cargo.lock                                                                                 |     ✅     |     ✅      |       ✅        |       ✅        |

docs/docs/coverage/language/java.md

@@ -1,5 +1,5 @@
 # Java
-Trivy supports four types of Java scanning: `JAR/WAR/PAR/EAR`, `pom.xml`, `*gradle.lockfile` and `*.sbt.lock` files.
+Trivy supports three types of Java scanning: `JAR/WAR/PAR/EAR`, `pom.xml` and `*gradle.lockfile` files.
 
 Each artifact supports the following scanners:
 
@@ -8,16 +8,14 @@ Each artifact supports the following scanners:
 | JAR/WAR/PAR/EAR  |  ✓   |       ✓       |    -    |
 | pom.xml          |  ✓   |       ✓       |    ✓    |
 | *gradle.lockfile |  ✓   |       ✓       |    ✓    |
-| *.sbt.lock       |  ✓   |       ✓       |    -    |
 
 The following table provides an outline of the features Trivy offers.
 
-| Artifact         |    Internet access    | Dev dependencies | [Dependency graph][dependency-graph] | Position | [Detection Priority][detection-priority] |
-|------------------|:---------------------:|:----------------:|:------------------------------------:|:--------:|:----------------------------------------:|
-| JAR/WAR/PAR/EAR  |     Trivy Java DB     |     Include      |                  -                   |    -     |                Not needed                |
-| pom.xml          | Maven repository [^1] |     Exclude      |                  ✓                   |  ✓[^7]   |                    -                     |
-| *gradle.lockfile |           -           |     Exclude      |                  ✓                   |    ✓     |                Not needed                |
-| *.sbt.lock       |           -           |     Exclude      |                  -                   |    ✓     |                Not needed                |
+| Artifact         |    Internet access    | Dev dependencies | [Dependency graph][dependency-graph] | Position |
+|------------------|:---------------------:|:----------------:|:------------------------------------:|:--------:|
+| JAR/WAR/PAR/EAR  |     Trivy Java DB     |     Include      |                  -                   |    -     |
+| pom.xml          | Maven repository [^1] |     Exclude      |                  ✓                   |  ✓[^7]   |
+| *gradle.lockfile |           -           |     Exclude      |                  ✓                   |    ✓     |
 
 These may be enabled or disabled depending on the target.
 See [here](./index.md) for the detail.
@@ -69,16 +67,6 @@ The vulnerability database will be downloaded anyway.
 !!! Warning
     Trivy may skip some dependencies (that were not found on your local machine) when the `--offline-scan` flag is passed.
 
-### empty dependency version
-There are cases when Trivy cannot determine the version of dependencies:
-
-- Unable to determine the version from the parent because the parent is not reachable;
-- The dependency uses a [hard requirement][version-requirement] with more than one version.
-
-In these cases, Trivy uses an empty version for the dependency.
-
-!!! Warning
-    Trivy doesn't detect child dependencies for dependencies without a version.
 
 ### maven-invoker-plugin
 Typically, the integration tests directory (`**/[src|target]/it/*/pom.xml`) of [maven-invoker-plugin][maven-invoker-plugin] doesn't contain actual `pom.xml` files and should be skipped to avoid noise.
@@ -106,15 +94,6 @@ Trity also can detect licenses for dependencies.
 
 Make sure that you have cache[^8] directory to find licenses from `*.pom` dependency files.
 
-
-## SBT
-
-`build.sbt.lock` files only contain information about used dependencies. This requires a lockfile generated using the
-[sbt-dependency-lock][sbt-dependency-lock] plugin.
-
-!!!note
-    All necessary files are checked locally. SBT file scanning doesn't require internet access.
-
 [^1]: Uses maven repository to get information about dependencies. Internet access required.
 [^2]: It means `*.jar`, `*.war`, `*.par` and `*.ear` file
 [^3]: `ArtifactID`, `GroupID` and `Version`
@@ -127,7 +106,4 @@ Make sure that you have cache[^8] directory to find licenses from `*.pom` depend
 [dependency-graph]: ../../configuration/reporting.md#show-origins-of-vulnerable-dependencies
 [maven-invoker-plugin]: https://maven.apache.org/plugins/maven-invoker-plugin/usage.html
 [maven-central]: https://repo.maven.apache.org/maven2/
-[maven-pom-repos]: https://maven.apache.org/settings.html#repositories
-[sbt-dependency-lock]: https://stringbean.github.io/sbt-dependency-lock
-[detection-priority]: ../../scanner/vulnerability.md#detection-priority
-[version-requirement]: https://maven.apache.org/pom.html#dependency-version-requirement-specification
+[maven-pom-repos]: https://maven.apache.org/settings.html#repositories

docs/docs/coverage/language/nodejs.md

@@ -8,7 +8,7 @@ The following scanners are supported.
 |----------|:----:|:-------------:|:-------:|
 | npm      |  ✓   |       ✓       |    ✓    |
 | Yarn     |  ✓   |       ✓       |    ✓    |
-| pnpm     |  ✓   |       ✓       |    ✓    |
+| pnpm     |  ✓   |       ✓       |    -    |
 | Bun      |  ✓   |       ✓       |    ✓    |
 
 The following table provides an outline of the features Trivy offers.
@@ -54,7 +54,6 @@ By default, Trivy doesn't report development dependencies. Use the `--include-de
 
 ### pnpm
 Trivy parses `pnpm-lock.yaml`, then finds production dependencies and builds a [tree][dependency-graph] of dependencies with vulnerabilities.
-To identify licenses, you need to download dependencies to `node_modules` beforehand. Trivy analyzes `node_modules` for licenses.
 
 #### lock file v9 version
 Trivy supports `Dev` field for `pnpm-lock.yaml` v9 or later. Use the `--include-dev-deps` flag to include the developer's dependencies in the result.

docs/docs/coverage/language/php.md

@@ -4,27 +4,23 @@ Trivy supports [Composer][composer], which is a tool for dependency management i
 
 The following scanners are supported.
 
-| Package manager | SBOM | Vulnerability | License |
-|-----------------|:----:|:-------------:|:-------:|
-| Composer        |  ✓   |       ✓       |    ✓    |
+| Package manager | SBOM  | Vulnerability | License |
+| --------------- | :---: | :-----------: | :-----: |
+| Composer        |   ✓   |       ✓       |    ✓    |
 
 The following table provides an outline of the features Trivy offers.
 
 
-| Package manager | File           | Transitive dependencies | Dev dependencies | [Dependency graph][dependency-graph] | Position |
-|-----------------|----------------|:-----------------------:|:----------------:|:------------------------------------:|:--------:|
-| Composer        | composer.lock  |            ✓            |     Excluded     |                  ✓                   |    ✓     |
-| Composer        | installed.json |            ✓            |     Excluded     |                  -                   |    ✓     |
+| Package manager | File          | Transitive dependencies | Dev dependencies | [Dependency graph][dependency-graph] | Position |
+|-----------------|---------------|:-----------------------:|:----------------:|:------------------------------------:|:--------:|
+| Composer        | composer.lock |            ✓            |     Excluded     |                  ✓                   |    ✓     |
 
-## composer.lock
+## Composer
 In order to detect dependencies, Trivy searches for `composer.lock`.
 
 Trivy also supports dependency trees; however, to display an accurate tree, it needs to know whether each package is a direct dependency of the project.
 Since this information is not included in `composer.lock`, Trivy parses `composer.json`, which should be located next to `composer.lock`.
 If you want to see the dependency tree, please ensure that `composer.json` is present.
 
-## installed.json
-Trivy also supports dependency detection for `installed.json` files. By default, you can find this file at `path_to_app/vendor/composer/installed.json`.
-
 [composer]: https://getcomposer.org/
 [dependency-graph]: ../../configuration/reporting.md#show-origins-of-vulnerable-dependencies

docs/docs/coverage/language/python.md

@@ -21,11 +21,11 @@ The following scanners are supported for Python packages.
 
 The following table provides an outline of the features Trivy offers.
 
-| Package manager | File             | Transitive dependencies | Dev dependencies | [Dependency graph][dependency-graph] | Position | [Detection Priority][detection-priority] |
-|-----------------|------------------|:-----------------------:|:----------------:|:------------------------------------:|:--------:|:----------------------------------------:|
-| pip             | requirements.txt |            -            |     Include      |                  -                   |    ✓     |                    ✓                     |
-| Pipenv          | Pipfile.lock     |            ✓            |     Include      |                  -                   |    ✓     |                Not needed                |
-| Poetry          | poetry.lock      |            ✓            |     Exclude      |                  ✓                   |    -     |                Not needed                |
+| Package manager | File             | Transitive dependencies | Dev dependencies | [Dependency graph][dependency-graph] | Position |
+|-----------------|------------------|:-----------------------:|:----------------:|:------------------------------------:|:--------:|
+| pip             | requirements.txt |            -            |     Include      |                  -                   |    ✓     |
+| Pipenv          | Pipfile.lock     |            ✓            |     Include      |                  -                   |    ✓     |
+| Poetry          | poetry.lock      |            ✓            |     Exclude      |                  ✓                   |    -     |
 
 
 | Packaging | Dependency graph |
@@ -42,17 +42,8 @@ Trivy parses your files generated by package managers in filesystem/repository s
 ### pip
 
 #### Dependency detection
-By default, Trivy only parses [version specifiers](https://packaging.python.org/en/latest/specifications/version-specifiers/#id5) with `==` comparison operator and without `.*`.
-
-Using the [--detection-priority comprehensive](#detection-priority) option ensures that the tool establishes a minimum version, which is particularly useful in scenarios where identifying the exact version is challenging. 
-In such case Trivy parses specifiers `>=`,`~=` and a trailing `.*`.
-
-```
-keyring >= 4.1.1            # Minimum version 4.1.1
-Mopidy-Dirble ~= 1.1        # Minimum version 1.1
-python-gitlab==2.0.*        # Minimum version 2.0.0
-```
-Also, there is a way to convert unsupported version specifiers - use the `pip  freeze` command.
+Trivy only parses [version specifiers](https://packaging.python.org/en/latest/specifications/version-specifiers/#id4) with `==` comparison operator and without `.*`.
+To convert unsupported version specifiers - use the `pip  freeze` command.
 
 ```bash
 $ cat requirements.txt 
@@ -128,7 +119,7 @@ License detection is not supported for `Poetry`.
 
 ## Packaging
 Trivy parses the manifest files of installed packages in container image scanning and so on.
-See [here](https://packaging.python.org/en/latest/discussions/package-formats/) for the detail.
+See [here](https://packaging.python.org/en/latest/discussions/wheel-vs-egg/) for the detail.
 
 ### Egg
 Trivy looks for `*.egg-info`, `*.egg-info/PKG-INFO`, `*.egg` and `EGG-INFO/PKG-INFO` to identify Python packages.
@@ -139,4 +130,3 @@ Trivy looks for `.dist-info/META-DATA` to identify Python packages.
 [^1]: Trivy checks `python`, `python3`, `python2` and `python.exe` file names.
 
 [dependency-graph]: ../../configuration/reporting.md#show-origins-of-vulnerable-dependencies
-[detection-priority]: ../../scanner/vulnerability.md#detection-priority

docs/docs/coverage/os/bitnami.md

@@ -4,8 +4,8 @@
     Scanning results may be inaccurate.
 
 While it is not an OS, this page describes the details of the [container images provided by Bitnami](https://github.com/bitnami/containers).
-Bitnami images are based on [Debian](../os/debian.md).
-Please see [the Debian page](../os/debian.md) for OS packages.
+Bitnami images are based on [Debian](debian.md).
+Please see [the Debian page](debian.md) for OS packages.
 
 Trivy supports the following scanners for Bitnami packages.
 

docs/docs/coverage/os/cbl-mariner.md

@@ -1,7 +1,4 @@
-# Azure Linux (CBL-Mariner)
-
-*CBL-Mariner was rebranded to Azure Linux for version 3.0 onwards.*
-
+# CBL-Mariner
 Trivy supports the following scanners for OS packages.
 
 | Version          | SBOM  | Vulnerability | License |
@@ -10,8 +7,6 @@ Trivy supports the following scanners for OS packages.
 | 1.0 (Distroless) |   ✔   |       ✔       |         |
 | 2.0              |   ✔   |       ✔       |    ✔    |
 | 2.0 (Distroless) |   ✔   |       ✔       |         |
-| 3.0              |   ✔   |       ✔       |    ✔    |
-| 3.0 (Distroless) |   ✔   |       ✔       |         |
 
 
 The following table provides an outline of the targets Trivy supports.
@@ -20,7 +15,6 @@ The following table provides an outline of the targets Trivy supports.
 | ------- | :-------------: | :-------------: | :----------: |
 | 1.0     |        ✔        |        ✔        | amd64, arm64 |
 | 2.0     |        ✔        |        ✔        | amd64, arm64 |
-| 3.0     |        ✔        |        ✔        | amd64, arm64 |
 
 The table below outlines the features offered by Trivy.
 
@@ -30,22 +24,22 @@ The table below outlines the features offered by Trivy.
 | [Dependency graph][dependency-graph] |     ✓     |
 
 ## SBOM
-Trivy detects packages that have been installed through package managers such as `tdnf`, `dnf` and `yum`.
+Trivy detects packages that have been installed through package managers such as `dnf` and `yum`.
 
 ## Vulnerability
-Azure Linux offers its own security advisories, and these are utilized when scanning Azure Linux for vulnerabilities.
+CBL-Mariner offers its own security advisories, and these are utilized when scanning CBL-Mariner for vulnerabilities.
 
 ### Data Source
 See [here](../../scanner/vulnerability.md#data-sources).
 
 ### Fixed Version
-Trivy takes fixed versions from [Azure Linux OVAL][oval].
+Trivy takes fixed versions from [CBL-Mariner OVAL][oval].
 
 ### Severity
-Trivy calculates the severity of an issue based on the severity provided in [Azure Linux OVAL][oval].
+Trivy calculates the severity of an issue based on the severity provided in [CBL-Mariner OVAL][oval].
 
 ### Status
-Trivy supports the following [vulnerability statuses] for Azure Linux.
+Trivy supports the following [vulnerability statuses] for CBL-Mariner.
 
 |       Status        | Supported |
 | :-----------------: | :-------: |
@@ -61,11 +55,12 @@ Trivy supports the following [vulnerability statuses] for Azure Linux.
 Trivy identifies licenses by examining the metadata of RPM packages.
 
 !!! note
-    License detection is not supported for Azure Linux Distroless images.
+    License detection is not supported for CBL-Mariner Distroless.
 
 
 [dependency-graph]: ../../configuration/reporting.md#show-origins-of-vulnerable-dependencies
+[cbl-mariner]: https://github.com/microsoft/CBL-Mariner
 
-[oval]: https://github.com/microsoft/AzureLinuxVulnerabilityData/
+[oval]: https://github.com/microsoft/CBL-MarinerVulnerabilityData/
 
 [vulnerability statuses]: ../../configuration/filtering.md#by-status

docs/docs/coverage/os/conda.md

@@ -0,0 +1,36 @@
+# Conda
+
+Trivy supports the following scanners for Conda packages.
+
+|    Scanner    | Supported |
+|:-------------:|:---------:|
+|     SBOM      |     ✓     |
+| Vulnerability |     -     |
+|    License    |   ✓[^1]   |
+
+
+## SBOM
+Trivy detects packages that have been installed with `Conda`.
+
+
+### `<package>.json`
+Trivy parses `<conda-root>/envs/<env>/conda-meta/<package>.json` files to find the version and license for the dependencies installed in your env.
+
+### `environment.yml`[^2]
+Trivy supports parsing [environment.yml][environment.yml][^2] files to find dependency list.
+
+!!! note
+    License detection is currently not supported.
+
+`environment.yml`[^2] files supports [version range][env-version-range]. We can't be sure about versions for these dependencies.
+Therefore, you need to use `conda env export` command to get dependency list in `Conda` default format before scanning `environment.yml`[^2] file.
+
+!!! note
+    For dependencies in a non-Conda format, Trivy doesn't include a version of them.
+
+
+[^1]: License detection is only supported for `<package>.json` files
+[^2]: Trivy supports both `yaml` and `yml` extensions.
+
+[environment.yml]: https://conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#sharing-an-environment
+[env-version-range]: https://docs.conda.io/projects/conda-build/en/latest/resources/package-spec.html#examples-of-package-specs

docs/docs/coverage/os/index.md

@@ -9,33 +9,31 @@ Trivy supports operating systems for
 
 ## Supported OS
 
-| OS                                    | Supported Versions                  | Package Managers |
-|---------------------------------------|-------------------------------------|------------------|
-| [Alpine Linux](alpine.md)             | 2.2 - 2.7, 3.0 - 3.20, edge         | apk              |
-| [Wolfi Linux](wolfi.md)               | (n/a)                               | apk              |
-| [Chainguard](chainguard.md)           | (n/a)                               | apk              |
-| [Red Hat Enterprise Linux](rhel.md)   | 6, 7, 8                             | dnf/yum/rpm      |
-| [CentOS](centos.md)[^1]               | 6, 7, 8                             | dnf/yum/rpm      |
-| [AlmaLinux](alma.md)                  | 8, 9                                | dnf/yum/rpm      |
-| [Rocky Linux](rocky.md)               | 8, 9                                | dnf/yum/rpm      |
-| [Oracle Linux](oracle.md)             | 5, 6, 7, 8                          | dnf/yum/rpm      |
-| [Azure Linux (CBL-Mariner)](azure.md) | 1.0, 2.0, 3.0                       | tdnf/dnf/yum/rpm |
-| [Amazon Linux](amazon.md)             | 1, 2, 2023                          | dnf/yum/rpm      |
-| [openSUSE Leap](suse.md)              | 42, 15                              | zypper/rpm       |
-| [openSUSE Tumbleweed](suse.md)        | (n/a)                               | zypper/rpm       |
-| [SUSE Linux Enterprise](suse.md)      | 11, 12, 15                          | zypper/rpm       |
-| [SUSE Linux Enterprise Micro](suse.md)| 5, 6                                | zypper/rpm       |
-| [Photon OS](photon.md)                | 1.0, 2.0, 3.0, 4.0                  | tndf/yum/rpm     |
-| [Debian GNU/Linux](debian.md)         | 7, 8, 9, 10, 11, 12                 | apt/dpkg         |
-| [Ubuntu](ubuntu.md)                   | All versions supported by Canonical | apt/dpkg         |
-| [OSs with installed Conda](../others/conda.md)  | -                                   | conda            |
+| OS                                   | Supported Versions                  | Package Managers |
+|--------------------------------------|-------------------------------------|------------------|
+| [Alpine Linux](alpine.md)            | 2.2 - 2.7, 3.0 - 3.20, edge         | apk              |
+| [Wolfi Linux](wolfi.md)              | (n/a)                               | apk              |
+| [Chainguard](chainguard.md)          | (n/a)                               | apk              |
+| [Red Hat Enterprise Linux](rhel.md)  | 6, 7, 8                             | dnf/yum/rpm      |
+| [CentOS](centos.md)[^1]              | 6, 7, 8                             | dnf/yum/rpm      |
+| [AlmaLinux](alma.md)                 | 8, 9                                | dnf/yum/rpm      |
+| [Rocky Linux](rocky.md)              | 8, 9                                | dnf/yum/rpm      |
+| [Oracle Linux](oracle.md)            | 5, 6, 7, 8                          | dnf/yum/rpm      |
+| [CBL-Mariner](cbl-mariner.md)        | 1.0, 2.0                            | dnf/yum/rpm      |
+| [Amazon Linux](amazon.md)            | 1, 2, 2023                          | dnf/yum/rpm      |
+| [openSUSE Leap](suse.md)             | 42, 15                              | zypper/rpm       |
+| [SUSE Enterprise Linux](suse.md)     | 11, 12, 15                          | zypper/rpm       |
+| [Photon OS](photon.md)               | 1.0, 2.0, 3.0, 4.0                  | tndf/yum/rpm     |
+| [Debian GNU/Linux](debian.md)        | 7, 8, 9, 10, 11, 12                 | apt/dpkg         |
+| [Ubuntu](ubuntu.md)                  | All versions supported by Canonical | apt/dpkg         |
+| [OSs with installed Conda](conda.md) | -                                   | conda            |
 
 ## Supported container images
 
 | Container image                               | Supported Versions                  | Package Managers |
 |-----------------------------------------------|-------------------------------------|------------------|
 | [Google Distroless](google-distroless.md)[^2] | Any                                 | apt/dpkg         |
-| [Bitnami](../others/bitnami.md)                         | Any                                 | -                |
+| [Bitnami](bitnami.md)                         | Any                                 | -                |
 
 Each page gives more details.
 

docs/docs/coverage/os/suse.md

@@ -2,9 +2,7 @@
 Trivy supports the following distributions:
 
 - openSUSE Leap
-- openSUSE Tumbleweed
-- SUSE Linux Enterprise (SLE)
-- SUSE Linux Enterprise Micro
+- SUSE Enterprise Linux (SLE)
 
 Please see [here](index.md#supported-os) for supported versions.
 
@@ -37,6 +35,6 @@ Trivy identifies licenses by examining the metadata of RPM packages.
 
 
 [dependency-graph]: ../../configuration/reporting.md#show-origins-of-vulnerable-dependencies
-[cvrf]: https://ftp.suse.com/pub/projects/security/cvrf/
+[cvrf]: http://ftp.suse.com/pub/projects/security/cvrf/
 
-[vulnerability statuses]: ../../configuration/filtering.md#by-status
+[vulnerability statuses]: ../../configuration/filtering.md#by-status

docs/docs/coverage/others/conda.md

@@ -1,48 +0,0 @@
-# Conda
-
-Trivy supports the following scanners for Conda packages.
-
-|    Scanner    | Supported |
-|:-------------:|:---------:|
-|     SBOM      |     ✓     |
-| Vulnerability |     -     |
-|    License    |     ✓     |
-
-| Package manager | File            | Transitive dependencies | Dev dependencies | [Dependency graph][dependency-graph] | Position | [Detection Priority][detection-priority] |
-|-----------------|-----------------|:-----------------------:|:----------------:|:------------------------------------:|:--------:|:----------------------------------------:|
-| Conda           | environment.yml |            -            |     Include      |                  -                   |    ✓     |                    -                     |
-
-
-## `<package>.json`
-### SBOM
-Trivy parses `<conda-root>/envs/<env>/conda-meta/<package>.json` files to find the dependencies installed in your env.
-
-### License
-The `<package>.json` files contain package license information.
-Trivy includes licenses for the packages it finds without having to parse additional files.
-
-## `environment.yml`[^1]
-### SBOM
-Trivy supports parsing [environment.yml][environment.yml][^1] files to find dependency list.
-
-`environment.yml`[^1] files supports [version range][env-version-range]. We can't be sure about versions for these dependencies.
-Therefore, you need to use `conda env export` command to get dependency list in `Conda` default format before scanning `environment.yml`[^1] file.
-
-!!! note
-    For dependencies in a non-Conda format, Trivy doesn't include a version of them.
-
-### License
-Trivy parses `conda-meta/<package>.json` files at the [prefix] path.
-
-To correctly define licenses, make sure your `environment.yml`[^1] contains `prefix` field and `prefix` directory contains `package.json` files.
-
-!!! note 
-    To get correct `environment.yml`[^1] file and fill `prefix` directory - use `conda env export` command.
-
-[^1]: Trivy supports both `yaml` and `yml` extensions.
-
-[environment.yml]: https://conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#sharing-an-environment
-[env-version-range]: https://docs.conda.io/projects/conda-build/en/latest/resources/package-spec.html#examples-of-package-specs
-[prefix]: https://conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#specifying-a-location-for-an-environment
-[dependency-graph]: ../../configuration/reporting.md#show-origins-of-vulnerable-dependencies
-[detection-priority]: ../../scanner/vulnerability.md#detection-priority

docs/docs/coverage/others/rpm.md

@@ -1,42 +0,0 @@
-# RPM Archives
-
-!!! warning "EXPERIMENTAL"
-    This feature might change without preserving backwards compatibility.
-
-Trivy supports the following scanners for RPM archives.
-
-|    Scanner    | Supported |
-|:-------------:|:---------:|
-|     SBOM      |     ✓     |
-| Vulnerability |   ✓[^1]   |
-|    License    |     ✓     |
-
-The table below outlines the features offered by Trivy.
-
-## SBOM
-Trivy analyzes RPM archives matching `*.rpm`.
-This feature is currently disabled by default but can be enabled with an environment variable, `TRIVY_EXPERIMENTAL_RPM_ARCHIVE`.
-
-```shell
-TRIVY_EXPERIMENTAL_RPM_ARCHIVE=true trivy fs ./rpms --format cyclonedx --output rpms.cdx.json
-```
-
-!!! note
-    Currently, it works with `--format cyclonedx`, `--format spdx` or `--format spdx-json`.
-
-
-## Vulnerability
-Since RPM files don't have OS information, you need to generate SBOM, fill in the OS information manually and then scan the SBOM for vulnerabilities.
-
-For example:
-
-```shell
-$ TRIVY_EXPERIMENTAL_RPM_ARCHIVE=true trivy fs ./rpms -f cyclonedx -o rpms.cdx.json
-$ jq '(.components[] | select(.type == "operating-system")) |= (.name = "redhat" | .version = "7.9")' rpms.cdx.json > rpms-res.cdx.json
-$ trivy sbom ./rpms-res.cdx.json
-```
-
-## License
-If licenses are included in the RPM archive, Trivy extracts it.
-
-[^1]: Need to generate SBOM first and add OS information to that SBOM

docs/docs/plugin/user-guide.md

@@ -40,6 +40,8 @@ $ trivy plugin install referrer
 
 This command will download the plugin and install it in the plugin cache.
 
+
+
 Trivy adheres to the XDG specification, so the location depends on whether XDG_DATA_HOME is set.
 Trivy will now search XDG_DATA_HOME for the location of the Trivy plugins cache.
 The preference order is as follows:
@@ -53,10 +55,7 @@ Furthermore, it is possible to download plugins that are not registered in the i
 $ trivy plugin install github.com/aquasecurity/trivy-plugin-kubectl
 ```
 ```bash
-$ trivy plugin install https://github.com/aquasecurity/trivy-plugin-kubectl/archive/refs/heads/main.zip
-```
-```bash
-$ trivy plugin install ./myplugin.tar.gz
+$ trivy plugin install myplugin.tar.gz
 ```
 
 If the plugin's Git repository is [properly tagged](./developer-guide.md#tagging-plugin-repositories), you can specify the version to install like this:

docs/docs/references/configuration/cli/trivy.md

@@ -43,7 +43,7 @@ trivy [global flags] command [flags] target
 
 ### SEE ALSO
 
-* [trivy clean](trivy_clean.md)	 - Remove cached files
+* [trivy aws](trivy_aws.md)	 - [EXPERIMENTAL] Scan AWS account
 * [trivy config](trivy_config.md)	 - Scan config files for misconfigurations
 * [trivy convert](trivy_convert.md)	 - Convert Trivy JSON report into a different format
 * [trivy filesystem](trivy_filesystem.md)	 - Scan local filesystem
@@ -56,6 +56,5 @@ trivy [global flags] command [flags] target
 * [trivy sbom](trivy_sbom.md)	 - Scan SBOM for vulnerabilities and licenses
 * [trivy server](trivy_server.md)	 - Server mode
 * [trivy version](trivy_version.md)	 - Print the version
-* [trivy vex](trivy_vex.md)	 - [EXPERIMENTAL] VEX utilities
 * [trivy vm](trivy_vm.md)	 - [EXPERIMENTAL] Scan a virtual machine image
 

docs/docs/references/configuration/cli/trivy_aws.md

@@ -0,0 +1,127 @@
+## trivy aws
+
+[EXPERIMENTAL] Scan AWS account
+
+### Synopsis
+
+Scan an AWS account for misconfigurations. Trivy uses the same authentication methods as the AWS CLI. See https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html
+
+The following services are supported:
+
+- accessanalyzer
+- api-gateway
+- athena
+- cloudfront
+- cloudtrail
+- cloudwatch
+- codebuild
+- documentdb
+- dynamodb
+- ec2
+- ecr
+- ecs
+- efs
+- eks
+- elasticache
+- elasticsearch
+- elb
+- emr
+- iam
+- kinesis
+- kms
+- lambda
+- mq
+- msk
+- neptune
+- rds
+- redshift
+- s3
+- sns
+- sqs
+- ssm
+- workspaces
+
+
+```
+trivy aws [flags]
+```
+
+### Examples
+
+```
+  # basic scanning
+  $ trivy aws --region us-east-1
+
+  # limit scan to a single service:
+  $ trivy aws --region us-east-1 --service s3
+
+  # limit scan to multiple services:
+  $ trivy aws --region us-east-1 --service s3 --service ec2
+
+  # force refresh of cache for fresh results
+  $ trivy aws --region us-east-1 --update-cache
+
+```
+
+### Options
+
+```
+      --account string                    The AWS account to scan. It's useful to specify this when reviewing cached results for multiple accounts.
+      --arn string                        The AWS ARN to show results for. Useful to filter results once a scan is cached.
+      --cf-params strings                 specify paths to override the CloudFormation parameters files
+      --check-namespaces strings          Rego namespaces
+      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:0")
+      --compliance string                 compliance report to generate (aws-cis-1.2,aws-cis-1.4)
+      --config-check strings              specify the paths to the Rego check files or to the directories containing them, applying config files
+      --config-data strings               specify paths from which data for the Rego checks will be recursively loaded
+      --dependency-tree                   [EXPERIMENTAL] show dependency origin tree of vulnerable packages
+      --endpoint string                   AWS Endpoint override
+      --exit-code int                     specify exit code when any security issues are found
+  -f, --format string                     format (table,json,template,sarif,cyclonedx,spdx,spdx-json,github,cosign-vuln) (default "table")
+      --helm-api-versions strings         Available API versions used for Capabilities.APIVersions. This flag is the same as the api-versions flag of the helm template command. (can specify multiple or separate values with commas: policy/v1/PodDisruptionBudget,apps/v1/Deployment)
+      --helm-kube-version string          Kubernetes version used for Capabilities.KubeVersion. This flag is the same as the kube-version flag of the helm template command.
+      --helm-set strings                  specify Helm values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)
+      --helm-set-file strings             specify Helm values from respective files specified via the command line (can specify multiple or separate values with commas: key1=path1,key2=path2)
+      --helm-set-string strings           specify Helm string values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)
+      --helm-values strings               specify paths to override the Helm values.yaml files
+  -h, --help                              help for aws
+      --ignore-policy string              specify the Rego file path to evaluate each vulnerability
+      --ignorefile string                 specify .trivyignore file (default ".trivyignore")
+      --include-deprecated-checks         include deprecated checks
+      --include-non-failures              include successes and exceptions, available with '--scanners misconfig'
+      --list-all-pkgs                     output all packages in the JSON report regardless of vulnerability
+      --max-cache-age duration            The maximum age of the cloud cache. Cached data will be required from the cloud provider if it is older than this. (default 24h0m0s)
+      --misconfig-scanners strings        comma-separated list of misconfig scanners to use for misconfiguration scanning (default [azure-arm,cloudformation,dockerfile,helm,kubernetes,terraform,terraformplan-json,terraformplan-snapshot])
+  -o, --output string                     output file name
+      --output-plugin-arg string          [EXPERIMENTAL] output plugin arguments
+      --region string                     AWS Region to scan
+      --report string                     specify a report format for the output (all,summary) (default "all")
+      --reset-checks-bundle               remove checks bundle
+      --service strings                   Only scan AWS Service(s) specified with this flag. Can specify multiple services using --service A --service B etc.
+  -s, --severity strings                  severities of security issues to be displayed (UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL) (default [UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL])
+      --skip-check-update                 skip fetching rego check updates
+      --skip-service strings              Skip selected AWS Service(s) specified with this flag. Can specify multiple services using --skip-service A --skip-service B etc.
+  -t, --template string                   output template
+      --tf-exclude-downloaded-modules     exclude misconfigurations for downloaded terraform modules
+      --tf-vars strings                   specify paths to override the Terraform tfvars files
+      --trace                             enable more verbose trace output for custom queries
+      --update-cache                      Update the cache for the applicable cloud provider instead of using cached results.
+```
+
+### Options inherited from parent commands
+
+```
+      --cache-dir string          cache directory (default "/path/to/cache")
+  -c, --config string             config path (default "trivy.yaml")
+  -d, --debug                     debug mode
+      --generate-default-config   write the default config to trivy-default.yaml
+      --insecure                  allow insecure server connections
+  -q, --quiet                     suppress progress bar and log output
+      --timeout duration          timeout (default 5m0s)
+  -v, --version                   show version
+```
+
+### SEE ALSO
+
+* [trivy](trivy.md)	 - Unified security scanner
+

docs/docs/references/configuration/cli/trivy_clean.md

@@ -1,51 +0,0 @@
-## trivy clean
-
-Remove cached files
-
-```
-trivy clean [flags]
-```
-
-### Examples
-
-```
-  # Remove all caches
-  $ trivy clean --all
-
-  # Remove scan cache
-  $ trivy clean --scan-cache
-
-  # Remove vulnerability database
-  $ trivy clean --vuln-db
-
-```
-
-### Options
-
-```
-  -a, --all             remove all caches
-      --checks-bundle   remove checks bundle
-  -h, --help            help for clean
-      --java-db         remove Java database
-      --scan-cache      remove scan cache (container and VM image analysis results)
-      --vex-repo        remove VEX repositories
-      --vuln-db         remove vulnerability database
-```
-
-### Options inherited from parent commands
-
-```
-      --cache-dir string          cache directory (default "/path/to/cache")
-  -c, --config string             config path (default "trivy.yaml")
-  -d, --debug                     debug mode
-      --generate-default-config   write the default config to trivy-default.yaml
-      --insecure                  allow insecure server connections
-  -q, --quiet                     suppress progress bar and log output
-      --timeout duration          timeout (default 5m0s)
-  -v, --version                   show version
-```
-
-### SEE ALSO
-
-* [trivy](trivy.md)	 - Unified security scanner
-

docs/docs/references/configuration/cli/trivy_config.md

@@ -9,15 +9,15 @@ trivy config [flags] DIR
 ### Options
 
 ```
-      --cache-backend string              [EXPERIMENTAL] cache backend (e.g. redis://localhost:6379) (default "memory")
+      --cache-backend string              cache backend (e.g. redis://localhost:6379) (default "fs")
       --cache-ttl duration                cache TTL when using redis as cache backend
       --cf-params strings                 specify paths to override the CloudFormation parameters files
       --check-namespaces strings          Rego namespaces
-      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:1")
+      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:0")
+      --clear-cache                       clear image caches without scanning
       --compliance string                 compliance report to generate
       --config-check strings              specify the paths to the Rego check files or to the directories containing them, applying config files
       --config-data strings               specify paths from which data for the Rego checks will be recursively loaded
-      --config-file-schemas strings       specify paths to JSON configuration file schemas to determine that a file matches some configuration and pass the schema to Rego checks for type checking
       --enable-modules strings            [EXPERIMENTAL] module names to enable
       --exit-code int                     specify exit code when any security issues are found
       --file-patterns strings             specify config file patterns
@@ -45,6 +45,7 @@ trivy config [flags] DIR
       --redis-tls                         enable redis TLS with public certificates, if using redis as cache backend
       --registry-token string             registry token
       --report string                     specify a compliance report format for the output (all,summary) (default "all")
+      --reset-checks-bundle               remove checks bundle
   -s, --severity strings                  severities of security issues to be displayed (UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL) (default [UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL])
       --skip-check-update                 skip fetching rego check updates
       --skip-dirs strings                 specify the directories or glob patterns to skip

docs/docs/references/configuration/cli/trivy_filesystem.md

@@ -19,22 +19,18 @@ trivy filesystem [flags] PATH
 ### Options
 
 ```
-      --cache-backend string              [EXPERIMENTAL] cache backend (e.g. redis://localhost:6379) (default "memory")
+      --cache-backend string              cache backend (e.g. redis://localhost:6379) (default "fs")
       --cache-ttl duration                cache TTL when using redis as cache backend
       --cf-params strings                 specify paths to override the CloudFormation parameters files
       --check-namespaces strings          Rego namespaces
-      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:1")
+      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:0")
+      --clear-cache                       clear image caches without scanning
       --compliance string                 compliance report to generate
       --config-check strings              specify the paths to the Rego check files or to the directories containing them, applying config files
       --config-data strings               specify paths from which data for the Rego checks will be recursively loaded
-      --config-file-schemas strings       specify paths to JSON configuration file schemas to determine that a file matches some configuration and pass the schema to Rego checks for type checking
       --custom-headers strings            custom headers in client mode
-      --db-repository strings             OCI repository(ies) to retrieve trivy-db in order of priority (default [ghcr.io/aquasecurity/trivy-db:2])
+      --db-repository string              OCI repository to retrieve trivy-db from (default "ghcr.io/aquasecurity/trivy-db:2")
       --dependency-tree                   [EXPERIMENTAL] show dependency origin tree of vulnerable packages
-      --detection-priority string         specify the detection priority:
-                                            - "precise": Prioritizes precise by minimizing false positives.
-                                            - "comprehensive": Aims to detect more security findings at the cost of potential false positives.
-                                           (precise,comprehensive) (default "precise")
       --download-db-only                  download/update vulnerability database but don't run a scan
       --download-java-db-only             download/update Java index database but don't run a scan
       --enable-modules strings            [EXPERIMENTAL] module names to enable
@@ -56,7 +52,7 @@ trivy filesystem [flags] PATH
       --include-deprecated-checks         include deprecated checks
       --include-dev-deps                  include development dependencies in the report (supported: npm, yarn)
       --include-non-failures              include successes and exceptions, available with '--scanners misconfig'
-      --java-db-repository strings        OCI repository(ies) to retrieve trivy-java-db in order of priority (default [ghcr.io/aquasecurity/trivy-java-db:1])
+      --java-db-repository string         OCI repository to retrieve trivy-java-db from (default "ghcr.io/aquasecurity/trivy-java-db:1")
       --license-confidence-level float    specify license classifier's confidence level (default 0.9)
       --license-full                      eagerly look for licenses in source code headers and license files
       --list-all-pkgs                     output all packages in the JSON report regardless of vulnerability
@@ -68,8 +64,6 @@ trivy filesystem [flags] PATH
       --output-plugin-arg string          [EXPERIMENTAL] output plugin arguments
       --parallel int                      number of goroutines enabled for parallel scanning, set 0 to auto-detect parallelism (default 5)
       --password strings                  password. Comma-separated passwords allowed. TRIVY_PASSWORD should be used for security reasons.
-      --pkg-relationships strings         list of package relationships (unknown,root,direct,indirect) (default [unknown,root,direct,indirect])
-      --pkg-types strings                 list of package types (os,library) (default [os,library])
       --redis-ca string                   redis ca file location, if using redis as cache backend
       --redis-cert string                 redis certificate file location, if using redis as cache backend
       --redis-key string                  redis key file location, if using redis as cache backend
@@ -77,6 +71,8 @@ trivy filesystem [flags] PATH
       --registry-token string             registry token
       --rekor-url string                  [EXPERIMENTAL] address of rekor STL server (default "https://rekor.sigstore.dev")
       --report string                     specify a compliance report format for the output (all,summary) (default "all")
+      --reset                             remove all caches and database
+      --reset-checks-bundle               remove checks bundle
       --sbom-sources strings              [EXPERIMENTAL] try to retrieve SBOM from the specified sources (oci,rekor)
       --scanners strings                  comma-separated list of what security issues to detect (vuln,misconfig,secret,license) (default [vuln,secret])
       --secret-config string              specify a path to config file for secret scanning (default "trivy-secret.yaml")
@@ -88,7 +84,6 @@ trivy filesystem [flags] PATH
       --skip-dirs strings                 specify the directories or glob patterns to skip
       --skip-files strings                specify the files or glob patterns to skip
       --skip-java-db-update               skip updating Java index database
-      --skip-vex-repo-update              [EXPERIMENTAL] Skip VEX Repository update
   -t, --template string                   output template
       --tf-exclude-downloaded-modules     exclude misconfigurations for downloaded terraform modules
       --tf-vars strings                   specify paths to override the Terraform tfvars files
@@ -96,7 +91,8 @@ trivy filesystem [flags] PATH
       --token-header string               specify a header name for token in client/server mode (default "Trivy-Token")
       --trace                             enable more verbose trace output for custom queries
       --username strings                  username. Comma-separated usernames allowed.
-      --vex strings                       [EXPERIMENTAL] VEX sources ("repo", "oci" or file path)
+      --vex string                        [EXPERIMENTAL] file path to VEX
+      --vuln-type strings                 comma-separated list of vulnerability types (os,library) (default [os,library])
 ```
 
 ### Options inherited from parent commands

docs/docs/references/configuration/cli/trivy_image.md

@@ -34,21 +34,17 @@ trivy image [flags] IMAGE_NAME
 ### Options
 
 ```
-      --cache-backend string              [EXPERIMENTAL] cache backend (e.g. redis://localhost:6379) (default "fs")
+      --cache-backend string              cache backend (e.g. redis://localhost:6379) (default "fs")
       --cache-ttl duration                cache TTL when using redis as cache backend
       --check-namespaces strings          Rego namespaces
-      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:1")
-      --compliance string                 compliance report to generate (docker-cis-1.6.0)
+      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:0")
+      --clear-cache                       clear image caches without scanning
+      --compliance string                 compliance report to generate (docker-cis)
       --config-check strings              specify the paths to the Rego check files or to the directories containing them, applying config files
       --config-data strings               specify paths from which data for the Rego checks will be recursively loaded
-      --config-file-schemas strings       specify paths to JSON configuration file schemas to determine that a file matches some configuration and pass the schema to Rego checks for type checking
       --custom-headers strings            custom headers in client mode
-      --db-repository strings             OCI repository(ies) to retrieve trivy-db in order of priority (default [ghcr.io/aquasecurity/trivy-db:2])
+      --db-repository string              OCI repository to retrieve trivy-db from (default "ghcr.io/aquasecurity/trivy-db:2")
       --dependency-tree                   [EXPERIMENTAL] show dependency origin tree of vulnerable packages
-      --detection-priority string         specify the detection priority:
-                                            - "precise": Prioritizes precise by minimizing false positives.
-                                            - "comprehensive": Aims to detect more security findings at the cost of potential false positives.
-                                           (precise,comprehensive) (default "precise")
       --docker-host string                unix domain socket path to use for docker scanning
       --download-db-only                  download/update vulnerability database but don't run a scan
       --download-java-db-only             download/update Java index database but don't run a scan
@@ -74,7 +70,7 @@ trivy image [flags] IMAGE_NAME
       --include-deprecated-checks         include deprecated checks
       --include-non-failures              include successes and exceptions, available with '--scanners misconfig'
       --input string                      input file path instead of image name
-      --java-db-repository strings        OCI repository(ies) to retrieve trivy-java-db in order of priority (default [ghcr.io/aquasecurity/trivy-java-db:1])
+      --java-db-repository string         OCI repository to retrieve trivy-java-db from (default "ghcr.io/aquasecurity/trivy-java-db:1")
       --license-confidence-level float    specify license classifier's confidence level (default 0.9)
       --license-full                      eagerly look for licenses in source code headers and license files
       --list-all-pkgs                     output all packages in the JSON report regardless of vulnerability
@@ -86,8 +82,6 @@ trivy image [flags] IMAGE_NAME
       --output-plugin-arg string          [EXPERIMENTAL] output plugin arguments
       --parallel int                      number of goroutines enabled for parallel scanning, set 0 to auto-detect parallelism (default 5)
       --password strings                  password. Comma-separated passwords allowed. TRIVY_PASSWORD should be used for security reasons.
-      --pkg-relationships strings         list of package relationships (unknown,root,direct,indirect) (default [unknown,root,direct,indirect])
-      --pkg-types strings                 list of package types (os,library) (default [os,library])
       --platform string                   set platform in the form os/arch if image is multi-platform capable
       --podman-host string                unix podman socket path to use for podman scanning
       --redis-ca string                   redis ca file location, if using redis as cache backend
@@ -98,6 +92,8 @@ trivy image [flags] IMAGE_NAME
       --rekor-url string                  [EXPERIMENTAL] address of rekor STL server (default "https://rekor.sigstore.dev")
       --removed-pkgs                      detect vulnerabilities of removed packages (only for Alpine)
       --report string                     specify a format for the compliance report. (all,summary) (default "summary")
+      --reset                             remove all caches and database
+      --reset-checks-bundle               remove checks bundle
       --sbom-sources strings              [EXPERIMENTAL] try to retrieve SBOM from the specified sources (oci,rekor)
       --scanners strings                  comma-separated list of what security issues to detect (vuln,misconfig,secret,license) (default [vuln,secret])
       --secret-config string              specify a path to config file for secret scanning (default "trivy-secret.yaml")
@@ -109,14 +105,14 @@ trivy image [flags] IMAGE_NAME
       --skip-dirs strings                 specify the directories or glob patterns to skip
       --skip-files strings                specify the files or glob patterns to skip
       --skip-java-db-update               skip updating Java index database
-      --skip-vex-repo-update              [EXPERIMENTAL] Skip VEX Repository update
   -t, --template string                   output template
       --tf-exclude-downloaded-modules     exclude misconfigurations for downloaded terraform modules
       --token string                      for authentication in client/server mode
       --token-header string               specify a header name for token in client/server mode (default "Trivy-Token")
       --trace                             enable more verbose trace output for custom queries
       --username strings                  username. Comma-separated usernames allowed.
-      --vex strings                       [EXPERIMENTAL] VEX sources ("repo", "oci" or file path)
+      --vex string                        [EXPERIMENTAL] file path to VEX
+      --vuln-type strings                 comma-separated list of vulnerability types (os,library) (default [os,library])
 ```
 
 ### Options inherited from parent commands

docs/docs/references/configuration/cli/trivy_kubernetes.md

@@ -30,20 +30,16 @@ trivy kubernetes [flags] [CONTEXT]
 
 ```
       --burst int                         specify the maximum burst for throttle (default 10)
-      --cache-backend string              [EXPERIMENTAL] cache backend (e.g. redis://localhost:6379) (default "fs")
+      --cache-backend string              cache backend (e.g. redis://localhost:6379) (default "fs")
       --cache-ttl duration                cache TTL when using redis as cache backend
       --check-namespaces strings          Rego namespaces
-      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:1")
-      --compliance string                 compliance report to generate (k8s-nsa-1.0,k8s-cis-1.23,eks-cis-1.4,rke2-cis-1.24,k8s-pss-baseline-0.1,k8s-pss-restricted-0.1)
+      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:0")
+      --clear-cache                       clear image caches without scanning
+      --compliance string                 compliance report to generate (k8s-nsa,k8s-cis,k8s-pss-baseline,k8s-pss-restricted)
       --config-check strings              specify the paths to the Rego check files or to the directories containing them, applying config files
       --config-data strings               specify paths from which data for the Rego checks will be recursively loaded
-      --config-file-schemas strings       specify paths to JSON configuration file schemas to determine that a file matches some configuration and pass the schema to Rego checks for type checking
-      --db-repository strings             OCI repository(ies) to retrieve trivy-db in order of priority (default [ghcr.io/aquasecurity/trivy-db:2])
+      --db-repository string              OCI repository to retrieve trivy-db from (default "ghcr.io/aquasecurity/trivy-db:2")
       --dependency-tree                   [EXPERIMENTAL] show dependency origin tree of vulnerable packages
-      --detection-priority string         specify the detection priority:
-                                            - "precise": Prioritizes precise by minimizing false positives.
-                                            - "comprehensive": Aims to detect more security findings at the cost of potential false positives.
-                                           (precise,comprehensive) (default "precise")
       --disable-node-collector            When the flag is activated, the node-collector job will not be executed, thus skipping misconfiguration findings on the node.
       --download-db-only                  download/update vulnerability database but don't run a scan
       --download-java-db-only             download/update Java index database but don't run a scan
@@ -70,21 +66,19 @@ trivy kubernetes [flags] [CONTEXT]
       --include-kinds strings             indicate the kinds included in scanning (example: node)
       --include-namespaces strings        indicate the namespaces included in scanning (example: kube-system)
       --include-non-failures              include successes and exceptions, available with '--scanners misconfig'
-      --java-db-repository strings        OCI repository(ies) to retrieve trivy-java-db in order of priority (default [ghcr.io/aquasecurity/trivy-java-db:1])
+      --java-db-repository string         OCI repository to retrieve trivy-java-db from (default "ghcr.io/aquasecurity/trivy-java-db:1")
       --k8s-version string                specify k8s version to validate outdated api by it (example: 1.21.0)
       --kubeconfig string                 specify the kubeconfig file path to use
       --list-all-pkgs                     output all packages in the JSON report regardless of vulnerability
       --misconfig-scanners strings        comma-separated list of misconfig scanners to use for misconfiguration scanning (default [azure-arm,cloudformation,dockerfile,helm,kubernetes,terraform,terraformplan-json,terraformplan-snapshot])
       --no-progress                       suppress progress bar
-      --node-collector-imageref string    indicate the image reference for the node-collector scan job (default "ghcr.io/aquasecurity/node-collector:0.3.1")
+      --node-collector-imageref string    indicate the image reference for the node-collector scan job (default "ghcr.io/aquasecurity/node-collector:0.2.1")
       --node-collector-namespace string   specify the namespace in which the node-collector job should be deployed (default "trivy-temp")
       --offline-scan                      do not issue API requests to identify dependencies
   -o, --output string                     output file name
       --output-plugin-arg string          [EXPERIMENTAL] output plugin arguments
       --parallel int                      number of goroutines enabled for parallel scanning, set 0 to auto-detect parallelism (default 5)
       --password strings                  password. Comma-separated passwords allowed. TRIVY_PASSWORD should be used for security reasons.
-      --pkg-relationships strings         list of package relationships (unknown,root,direct,indirect) (default [unknown,root,direct,indirect])
-      --pkg-types strings                 list of package types (os,library) (default [os,library])
       --qps float                         specify the maximum QPS to the master from this client (default 5)
       --redis-ca string                   redis ca file location, if using redis as cache backend
       --redis-cert string                 redis certificate file location, if using redis as cache backend
@@ -93,6 +87,8 @@ trivy kubernetes [flags] [CONTEXT]
       --registry-token string             registry token
       --rekor-url string                  [EXPERIMENTAL] address of rekor STL server (default "https://rekor.sigstore.dev")
       --report string                     specify a report format for the output (all,summary) (default "all")
+      --reset                             remove all caches and database
+      --reset-checks-bundle               remove checks bundle
       --sbom-sources strings              [EXPERIMENTAL] try to retrieve SBOM from the specified sources (oci,rekor)
       --scanners strings                  comma-separated list of what security issues to detect (vuln,misconfig,secret,rbac) (default [vuln,misconfig,secret,rbac])
       --secret-config string              specify a path to config file for secret scanning (default "trivy-secret.yaml")
@@ -104,13 +100,13 @@ trivy kubernetes [flags] [CONTEXT]
       --skip-files strings                specify the files or glob patterns to skip
       --skip-images                       skip the downloading and scanning of images (vulnerabilities and secrets) in the cluster resources
       --skip-java-db-update               skip updating Java index database
-      --skip-vex-repo-update              [EXPERIMENTAL] Skip VEX Repository update
   -t, --template string                   output template
       --tf-exclude-downloaded-modules     exclude misconfigurations for downloaded terraform modules
       --tolerations strings               specify node-collector job tolerations (example: key1=value1:NoExecute,key2=value2:NoSchedule)
       --trace                             enable more verbose trace output for custom queries
       --username strings                  username. Comma-separated usernames allowed.
-      --vex strings                       [EXPERIMENTAL] VEX sources ("repo", "oci" or file path)
+      --vex string                        [EXPERIMENTAL] file path to VEX
+      --vuln-type strings                 comma-separated list of vulnerability types (os,library) (default [os,library])
 ```
 
 ### Options inherited from parent commands

docs/docs/references/configuration/cli/trivy_repository.md

@@ -19,22 +19,18 @@ trivy repository [flags] (REPO_PATH | REPO_URL)
 
 ```
       --branch string                     pass the branch name to be scanned
-      --cache-backend string              [EXPERIMENTAL] cache backend (e.g. redis://localhost:6379) (default "memory")
+      --cache-backend string              cache backend (e.g. redis://localhost:6379) (default "fs")
       --cache-ttl duration                cache TTL when using redis as cache backend
       --cf-params strings                 specify paths to override the CloudFormation parameters files
       --check-namespaces strings          Rego namespaces
-      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:1")
+      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:0")
+      --clear-cache                       clear image caches without scanning
       --commit string                     pass the commit hash to be scanned
       --config-check strings              specify the paths to the Rego check files or to the directories containing them, applying config files
       --config-data strings               specify paths from which data for the Rego checks will be recursively loaded
-      --config-file-schemas strings       specify paths to JSON configuration file schemas to determine that a file matches some configuration and pass the schema to Rego checks for type checking
       --custom-headers strings            custom headers in client mode
-      --db-repository strings             OCI repository(ies) to retrieve trivy-db in order of priority (default [ghcr.io/aquasecurity/trivy-db:2])
+      --db-repository string              OCI repository to retrieve trivy-db from (default "ghcr.io/aquasecurity/trivy-db:2")
       --dependency-tree                   [EXPERIMENTAL] show dependency origin tree of vulnerable packages
-      --detection-priority string         specify the detection priority:
-                                            - "precise": Prioritizes precise by minimizing false positives.
-                                            - "comprehensive": Aims to detect more security findings at the cost of potential false positives.
-                                           (precise,comprehensive) (default "precise")
       --download-db-only                  download/update vulnerability database but don't run a scan
       --download-java-db-only             download/update Java index database but don't run a scan
       --enable-modules strings            [EXPERIMENTAL] module names to enable
@@ -56,7 +52,7 @@ trivy repository [flags] (REPO_PATH | REPO_URL)
       --include-deprecated-checks         include deprecated checks
       --include-dev-deps                  include development dependencies in the report (supported: npm, yarn)
       --include-non-failures              include successes and exceptions, available with '--scanners misconfig'
-      --java-db-repository strings        OCI repository(ies) to retrieve trivy-java-db in order of priority (default [ghcr.io/aquasecurity/trivy-java-db:1])
+      --java-db-repository string         OCI repository to retrieve trivy-java-db from (default "ghcr.io/aquasecurity/trivy-java-db:1")
       --license-confidence-level float    specify license classifier's confidence level (default 0.9)
       --license-full                      eagerly look for licenses in source code headers and license files
       --list-all-pkgs                     output all packages in the JSON report regardless of vulnerability
@@ -68,14 +64,14 @@ trivy repository [flags] (REPO_PATH | REPO_URL)
       --output-plugin-arg string          [EXPERIMENTAL] output plugin arguments
       --parallel int                      number of goroutines enabled for parallel scanning, set 0 to auto-detect parallelism (default 5)
       --password strings                  password. Comma-separated passwords allowed. TRIVY_PASSWORD should be used for security reasons.
-      --pkg-relationships strings         list of package relationships (unknown,root,direct,indirect) (default [unknown,root,direct,indirect])
-      --pkg-types strings                 list of package types (os,library) (default [os,library])
       --redis-ca string                   redis ca file location, if using redis as cache backend
       --redis-cert string                 redis certificate file location, if using redis as cache backend
       --redis-key string                  redis key file location, if using redis as cache backend
       --redis-tls                         enable redis TLS with public certificates, if using redis as cache backend
       --registry-token string             registry token
       --rekor-url string                  [EXPERIMENTAL] address of rekor STL server (default "https://rekor.sigstore.dev")
+      --reset                             remove all caches and database
+      --reset-checks-bundle               remove checks bundle
       --sbom-sources strings              [EXPERIMENTAL] try to retrieve SBOM from the specified sources (oci,rekor)
       --scanners strings                  comma-separated list of what security issues to detect (vuln,misconfig,secret,license) (default [vuln,secret])
       --secret-config string              specify a path to config file for secret scanning (default "trivy-secret.yaml")
@@ -87,7 +83,6 @@ trivy repository [flags] (REPO_PATH | REPO_URL)
       --skip-dirs strings                 specify the directories or glob patterns to skip
       --skip-files strings                specify the files or glob patterns to skip
       --skip-java-db-update               skip updating Java index database
-      --skip-vex-repo-update              [EXPERIMENTAL] Skip VEX Repository update
       --tag string                        pass the tag name to be scanned
   -t, --template string                   output template
       --tf-exclude-downloaded-modules     exclude misconfigurations for downloaded terraform modules
@@ -96,7 +91,8 @@ trivy repository [flags] (REPO_PATH | REPO_URL)
       --token-header string               specify a header name for token in client/server mode (default "Trivy-Token")
       --trace                             enable more verbose trace output for custom queries
       --username strings                  username. Comma-separated usernames allowed.
-      --vex strings                       [EXPERIMENTAL] VEX sources ("repo", "oci" or file path)
+      --vex string                        [EXPERIMENTAL] file path to VEX
+      --vuln-type strings                 comma-separated list of vulnerability types (os,library) (default [os,library])
 ```
 
 ### Options inherited from parent commands

docs/docs/references/configuration/cli/trivy_rootfs.md

@@ -22,21 +22,17 @@ trivy rootfs [flags] ROOTDIR
 ### Options
 
 ```
-      --cache-backend string              [EXPERIMENTAL] cache backend (e.g. redis://localhost:6379) (default "memory")
+      --cache-backend string              cache backend (e.g. redis://localhost:6379) (default "fs")
       --cache-ttl duration                cache TTL when using redis as cache backend
       --cf-params strings                 specify paths to override the CloudFormation parameters files
       --check-namespaces strings          Rego namespaces
-      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:1")
+      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:0")
+      --clear-cache                       clear image caches without scanning
       --config-check strings              specify the paths to the Rego check files or to the directories containing them, applying config files
       --config-data strings               specify paths from which data for the Rego checks will be recursively loaded
-      --config-file-schemas strings       specify paths to JSON configuration file schemas to determine that a file matches some configuration and pass the schema to Rego checks for type checking
       --custom-headers strings            custom headers in client mode
-      --db-repository strings             OCI repository(ies) to retrieve trivy-db in order of priority (default [ghcr.io/aquasecurity/trivy-db:2])
+      --db-repository string              OCI repository to retrieve trivy-db from (default "ghcr.io/aquasecurity/trivy-db:2")
       --dependency-tree                   [EXPERIMENTAL] show dependency origin tree of vulnerable packages
-      --detection-priority string         specify the detection priority:
-                                            - "precise": Prioritizes precise by minimizing false positives.
-                                            - "comprehensive": Aims to detect more security findings at the cost of potential false positives.
-                                           (precise,comprehensive) (default "precise")
       --download-db-only                  download/update vulnerability database but don't run a scan
       --download-java-db-only             download/update Java index database but don't run a scan
       --enable-modules strings            [EXPERIMENTAL] module names to enable
@@ -58,7 +54,7 @@ trivy rootfs [flags] ROOTDIR
       --ignorefile string                 specify .trivyignore file (default ".trivyignore")
       --include-deprecated-checks         include deprecated checks
       --include-non-failures              include successes and exceptions, available with '--scanners misconfig'
-      --java-db-repository strings        OCI repository(ies) to retrieve trivy-java-db in order of priority (default [ghcr.io/aquasecurity/trivy-java-db:1])
+      --java-db-repository string         OCI repository to retrieve trivy-java-db from (default "ghcr.io/aquasecurity/trivy-java-db:1")
       --license-confidence-level float    specify license classifier's confidence level (default 0.9)
       --license-full                      eagerly look for licenses in source code headers and license files
       --list-all-pkgs                     output all packages in the JSON report regardless of vulnerability
@@ -70,14 +66,14 @@ trivy rootfs [flags] ROOTDIR
       --output-plugin-arg string          [EXPERIMENTAL] output plugin arguments
       --parallel int                      number of goroutines enabled for parallel scanning, set 0 to auto-detect parallelism (default 5)
       --password strings                  password. Comma-separated passwords allowed. TRIVY_PASSWORD should be used for security reasons.
-      --pkg-relationships strings         list of package relationships (unknown,root,direct,indirect) (default [unknown,root,direct,indirect])
-      --pkg-types strings                 list of package types (os,library) (default [os,library])
       --redis-ca string                   redis ca file location, if using redis as cache backend
       --redis-cert string                 redis certificate file location, if using redis as cache backend
       --redis-key string                  redis key file location, if using redis as cache backend
       --redis-tls                         enable redis TLS with public certificates, if using redis as cache backend
       --registry-token string             registry token
       --rekor-url string                  [EXPERIMENTAL] address of rekor STL server (default "https://rekor.sigstore.dev")
+      --reset                             remove all caches and database
+      --reset-checks-bundle               remove checks bundle
       --sbom-sources strings              [EXPERIMENTAL] try to retrieve SBOM from the specified sources (oci,rekor)
       --scanners strings                  comma-separated list of what security issues to detect (vuln,misconfig,secret,license) (default [vuln,secret])
       --secret-config string              specify a path to config file for secret scanning (default "trivy-secret.yaml")
@@ -89,7 +85,6 @@ trivy rootfs [flags] ROOTDIR
       --skip-dirs strings                 specify the directories or glob patterns to skip
       --skip-files strings                specify the files or glob patterns to skip
       --skip-java-db-update               skip updating Java index database
-      --skip-vex-repo-update              [EXPERIMENTAL] Skip VEX Repository update
   -t, --template string                   output template
       --tf-exclude-downloaded-modules     exclude misconfigurations for downloaded terraform modules
       --tf-vars strings                   specify paths to override the Terraform tfvars files
@@ -97,7 +92,8 @@ trivy rootfs [flags] ROOTDIR
       --token-header string               specify a header name for token in client/server mode (default "Trivy-Token")
       --trace                             enable more verbose trace output for custom queries
       --username strings                  username. Comma-separated usernames allowed.
-      --vex strings                       [EXPERIMENTAL] VEX sources ("repo", "oci" or file path)
+      --vex string                        [EXPERIMENTAL] file path to VEX
+      --vuln-type strings                 comma-separated list of vulnerability types (os,library) (default [os,library])
 ```
 
 ### Options inherited from parent commands

docs/docs/references/configuration/cli/trivy_sbom.md

@@ -20,54 +20,50 @@ trivy sbom [flags] SBOM_PATH
 ### Options
 
 ```
-      --cache-backend string         [EXPERIMENTAL] cache backend (e.g. redis://localhost:6379) (default "memory")
-      --cache-ttl duration           cache TTL when using redis as cache backend
-      --compliance string            compliance report to generate
-      --custom-headers strings       custom headers in client mode
-      --db-repository strings        OCI repository(ies) to retrieve trivy-db in order of priority (default [ghcr.io/aquasecurity/trivy-db:2])
-      --detection-priority string    specify the detection priority:
-                                       - "precise": Prioritizes precise by minimizing false positives.
-                                       - "comprehensive": Aims to detect more security findings at the cost of potential false positives.
-                                      (precise,comprehensive) (default "precise")
-      --download-db-only             download/update vulnerability database but don't run a scan
-      --download-java-db-only        download/update Java index database but don't run a scan
-      --exit-code int                specify exit code when any security issues are found
-      --exit-on-eol int              exit with the specified code when the OS reaches end of service/life
-      --file-patterns strings        specify config file patterns
-  -f, --format string                format (table,json,template,sarif,cyclonedx,spdx,spdx-json,github,cosign-vuln) (default "table")
-  -h, --help                         help for sbom
-      --ignore-policy string         specify the Rego file path to evaluate each vulnerability
-      --ignore-status strings        comma-separated list of vulnerability status to ignore (unknown,not_affected,affected,fixed,under_investigation,will_not_fix,fix_deferred,end_of_life)
-      --ignore-unfixed               display only fixed vulnerabilities
-      --ignored-licenses strings     specify a list of license to ignore
-      --ignorefile string            specify .trivyignore file (default ".trivyignore")
-      --java-db-repository strings   OCI repository(ies) to retrieve trivy-java-db in order of priority (default [ghcr.io/aquasecurity/trivy-java-db:1])
-      --list-all-pkgs                output all packages in the JSON report regardless of vulnerability
-      --no-progress                  suppress progress bar
-      --offline-scan                 do not issue API requests to identify dependencies
-  -o, --output string                output file name
-      --output-plugin-arg string     [EXPERIMENTAL] output plugin arguments
-      --pkg-relationships strings    list of package relationships (unknown,root,direct,indirect) (default [unknown,root,direct,indirect])
-      --pkg-types strings            list of package types (os,library) (default [os,library])
-      --redis-ca string              redis ca file location, if using redis as cache backend
-      --redis-cert string            redis certificate file location, if using redis as cache backend
-      --redis-key string             redis key file location, if using redis as cache backend
-      --redis-tls                    enable redis TLS with public certificates, if using redis as cache backend
-      --rekor-url string             [EXPERIMENTAL] address of rekor STL server (default "https://rekor.sigstore.dev")
-      --sbom-sources strings         [EXPERIMENTAL] try to retrieve SBOM from the specified sources (oci,rekor)
-      --scanners strings             comma-separated list of what security issues to detect (vuln,license) (default [vuln])
-      --server string                server address in client mode
-  -s, --severity strings             severities of security issues to be displayed (UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL) (default [UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL])
-      --show-suppressed              [EXPERIMENTAL] show suppressed vulnerabilities
-      --skip-db-update               skip updating vulnerability database
-      --skip-dirs strings            specify the directories or glob patterns to skip
-      --skip-files strings           specify the files or glob patterns to skip
-      --skip-java-db-update          skip updating Java index database
-      --skip-vex-repo-update         [EXPERIMENTAL] Skip VEX Repository update
-  -t, --template string              output template
-      --token string                 for authentication in client/server mode
-      --token-header string          specify a header name for token in client/server mode (default "Trivy-Token")
-      --vex strings                  [EXPERIMENTAL] VEX sources ("repo", "oci" or file path)
+      --cache-backend string        cache backend (e.g. redis://localhost:6379) (default "fs")
+      --cache-ttl duration          cache TTL when using redis as cache backend
+      --clear-cache                 clear image caches without scanning
+      --compliance string           compliance report to generate
+      --custom-headers strings      custom headers in client mode
+      --db-repository string        OCI repository to retrieve trivy-db from (default "ghcr.io/aquasecurity/trivy-db:2")
+      --download-db-only            download/update vulnerability database but don't run a scan
+      --download-java-db-only       download/update Java index database but don't run a scan
+      --exit-code int               specify exit code when any security issues are found
+      --exit-on-eol int             exit with the specified code when the OS reaches end of service/life
+      --file-patterns strings       specify config file patterns
+  -f, --format string               format (table,json,template,sarif,cyclonedx,spdx,spdx-json,github,cosign-vuln) (default "table")
+  -h, --help                        help for sbom
+      --ignore-policy string        specify the Rego file path to evaluate each vulnerability
+      --ignore-status strings       comma-separated list of vulnerability status to ignore (unknown,not_affected,affected,fixed,under_investigation,will_not_fix,fix_deferred,end_of_life)
+      --ignore-unfixed              display only fixed vulnerabilities
+      --ignored-licenses strings    specify a list of license to ignore
+      --ignorefile string           specify .trivyignore file (default ".trivyignore")
+      --java-db-repository string   OCI repository to retrieve trivy-java-db from (default "ghcr.io/aquasecurity/trivy-java-db:1")
+      --list-all-pkgs               output all packages in the JSON report regardless of vulnerability
+      --no-progress                 suppress progress bar
+      --offline-scan                do not issue API requests to identify dependencies
+  -o, --output string               output file name
+      --output-plugin-arg string    [EXPERIMENTAL] output plugin arguments
+      --redis-ca string             redis ca file location, if using redis as cache backend
+      --redis-cert string           redis certificate file location, if using redis as cache backend
+      --redis-key string            redis key file location, if using redis as cache backend
+      --redis-tls                   enable redis TLS with public certificates, if using redis as cache backend
+      --rekor-url string            [EXPERIMENTAL] address of rekor STL server (default "https://rekor.sigstore.dev")
+      --reset                       remove all caches and database
+      --sbom-sources strings        [EXPERIMENTAL] try to retrieve SBOM from the specified sources (oci,rekor)
+      --scanners strings            comma-separated list of what security issues to detect (vuln,license) (default [vuln])
+      --server string               server address in client mode
+  -s, --severity strings            severities of security issues to be displayed (UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL) (default [UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL])
+      --show-suppressed             [EXPERIMENTAL] show suppressed vulnerabilities
+      --skip-db-update              skip updating vulnerability database
+      --skip-dirs strings           specify the directories or glob patterns to skip
+      --skip-files strings          specify the files or glob patterns to skip
+      --skip-java-db-update         skip updating Java index database
+  -t, --template string             output template
+      --token string                for authentication in client/server mode
+      --token-header string         specify a header name for token in client/server mode (default "Trivy-Token")
+      --vex string                  [EXPERIMENTAL] file path to VEX
+      --vuln-type strings           comma-separated list of vulnerability types (os,library) (default [os,library])
 ```
 
 ### Options inherited from parent commands

docs/docs/references/configuration/cli/trivy_server.md

@@ -20,9 +20,10 @@ trivy server [flags]
 ### Options
 
 ```
-      --cache-backend string     [EXPERIMENTAL] cache backend (e.g. redis://localhost:6379) (default "fs")
+      --cache-backend string     cache backend (e.g. redis://localhost:6379) (default "fs")
       --cache-ttl duration       cache TTL when using redis as cache backend
-      --db-repository strings    OCI repository(ies) to retrieve trivy-db in order of priority (default [ghcr.io/aquasecurity/trivy-db:2])
+      --clear-cache              clear image caches without scanning
+      --db-repository string     OCI repository to retrieve trivy-db from (default "ghcr.io/aquasecurity/trivy-db:2")
       --download-db-only         download/update vulnerability database but don't run a scan
       --enable-modules strings   [EXPERIMENTAL] module names to enable
   -h, --help                     help for server
@@ -35,6 +36,7 @@ trivy server [flags]
       --redis-key string         redis key file location, if using redis as cache backend
       --redis-tls                enable redis TLS with public certificates, if using redis as cache backend
       --registry-token string    registry token
+      --reset                    remove all caches and database
       --skip-db-update           skip updating vulnerability database
       --token string             for authentication in client/server mode
       --token-header string      specify a header name for token in client/server mode (default "Trivy-Token")

docs/docs/references/configuration/cli/trivy_vex.md

@@ -1,28 +0,0 @@
-## trivy vex
-
-[EXPERIMENTAL] VEX utilities
-
-### Options
-
-```
-  -h, --help   help for vex
-```
-
-### Options inherited from parent commands
-
-```
-      --cache-dir string          cache directory (default "/path/to/cache")
-  -c, --config string             config path (default "trivy.yaml")
-  -d, --debug                     debug mode
-      --generate-default-config   write the default config to trivy-default.yaml
-      --insecure                  allow insecure server connections
-  -q, --quiet                     suppress progress bar and log output
-      --timeout duration          timeout (default 5m0s)
-  -v, --version                   show version
-```
-
-### SEE ALSO
-
-* [trivy](trivy.md)	 - Unified security scanner
-* [trivy vex repo](trivy_vex_repo.md)	 - Manage VEX repositories
-

docs/docs/references/configuration/cli/trivy_vex_repo.md

@@ -1,44 +0,0 @@
-## trivy vex repo
-
-Manage VEX repositories
-
-### Examples
-
-```
-  # Initialize the configuration file
-  $ trivy vex repo init
-
-  # List VEX repositories
-  $ trivy vex repo list
-
-  # Download the VEX repositories
-  $ trivy vex repo download
-
-```
-
-### Options
-
-```
-  -h, --help   help for repo
-```
-
-### Options inherited from parent commands
-
-```
-      --cache-dir string          cache directory (default "/path/to/cache")
-  -c, --config string             config path (default "trivy.yaml")
-  -d, --debug                     debug mode
-      --generate-default-config   write the default config to trivy-default.yaml
-      --insecure                  allow insecure server connections
-  -q, --quiet                     suppress progress bar and log output
-      --timeout duration          timeout (default 5m0s)
-  -v, --version                   show version
-```
-
-### SEE ALSO
-
-* [trivy vex](trivy_vex.md)	 - [EXPERIMENTAL] VEX utilities
-* [trivy vex repo download](trivy_vex_repo_download.md)	 - Download the VEX repositories
-* [trivy vex repo init](trivy_vex_repo_init.md)	 - Initialize a configuration file
-* [trivy vex repo list](trivy_vex_repo_list.md)	 - List VEX repositories
-

docs/docs/references/configuration/cli/trivy_vex_repo_download.md

@@ -1,35 +0,0 @@
-## trivy vex repo download
-
-Download the VEX repositories
-
-### Synopsis
-
-Downloads enabled VEX repositories. If specific repository names are provided as arguments, only those repositories will be downloaded. Otherwise, all enabled repositories are downloaded.
-
-```
-trivy vex repo download [REPO_NAMES] [flags]
-```
-
-### Options
-
-```
-  -h, --help   help for download
-```
-
-### Options inherited from parent commands
-
-```
-      --cache-dir string          cache directory (default "/path/to/cache")
-  -c, --config string             config path (default "trivy.yaml")
-  -d, --debug                     debug mode
-      --generate-default-config   write the default config to trivy-default.yaml
-      --insecure                  allow insecure server connections
-  -q, --quiet                     suppress progress bar and log output
-      --timeout duration          timeout (default 5m0s)
-  -v, --version                   show version
-```
-
-### SEE ALSO
-
-* [trivy vex repo](trivy_vex_repo.md)	 - Manage VEX repositories
-

docs/docs/references/configuration/cli/trivy_vex_repo_init.md

@@ -1,31 +0,0 @@
-## trivy vex repo init
-
-Initialize a configuration file
-
-```
-trivy vex repo init [flags]
-```
-
-### Options
-
-```
-  -h, --help   help for init
-```
-
-### Options inherited from parent commands
-
-```
-      --cache-dir string          cache directory (default "/path/to/cache")
-  -c, --config string             config path (default "trivy.yaml")
-  -d, --debug                     debug mode
-      --generate-default-config   write the default config to trivy-default.yaml
-      --insecure                  allow insecure server connections
-  -q, --quiet                     suppress progress bar and log output
-      --timeout duration          timeout (default 5m0s)
-  -v, --version                   show version
-```
-
-### SEE ALSO
-
-* [trivy vex repo](trivy_vex_repo.md)	 - Manage VEX repositories
-

docs/docs/references/configuration/cli/trivy_vex_repo_list.md

@@ -1,31 +0,0 @@
-## trivy vex repo list
-
-List VEX repositories
-
-```
-trivy vex repo list [flags]
-```
-
-### Options
-
-```
-  -h, --help   help for list
-```
-
-### Options inherited from parent commands
-
-```
-      --cache-dir string          cache directory (default "/path/to/cache")
-  -c, --config string             config path (default "trivy.yaml")
-  -d, --debug                     debug mode
-      --generate-default-config   write the default config to trivy-default.yaml
-      --insecure                  allow insecure server connections
-  -q, --quiet                     suppress progress bar and log output
-      --timeout duration          timeout (default 5m0s)
-  -v, --version                   show version
-```
-
-### SEE ALSO
-
-* [trivy vex repo](trivy_vex_repo.md)	 - Manage VEX repositories
-

docs/docs/references/configuration/cli/trivy_vm.md

@@ -21,18 +21,14 @@ trivy vm [flags] VM_IMAGE
 
 ```
       --aws-region string                 AWS region to scan
-      --cache-backend string              [EXPERIMENTAL] cache backend (e.g. redis://localhost:6379) (default "fs")
+      --cache-backend string              cache backend (e.g. redis://localhost:6379) (default "fs")
       --cache-ttl duration                cache TTL when using redis as cache backend
-      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:1")
+      --checks-bundle-repository string   OCI registry URL to retrieve checks bundle from (default "ghcr.io/aquasecurity/trivy-checks:0")
+      --clear-cache                       clear image caches without scanning
       --compliance string                 compliance report to generate
-      --config-file-schemas strings       specify paths to JSON configuration file schemas to determine that a file matches some configuration and pass the schema to Rego checks for type checking
       --custom-headers strings            custom headers in client mode
-      --db-repository strings             OCI repository(ies) to retrieve trivy-db in order of priority (default [ghcr.io/aquasecurity/trivy-db:2])
+      --db-repository string              OCI repository to retrieve trivy-db from (default "ghcr.io/aquasecurity/trivy-db:2")
       --dependency-tree                   [EXPERIMENTAL] show dependency origin tree of vulnerable packages
-      --detection-priority string         specify the detection priority:
-                                            - "precise": Prioritizes precise by minimizing false positives.
-                                            - "comprehensive": Aims to detect more security findings at the cost of potential false positives.
-                                           (precise,comprehensive) (default "precise")
       --download-db-only                  download/update vulnerability database but don't run a scan
       --download-java-db-only             download/update Java index database but don't run a scan
       --enable-modules strings            [EXPERIMENTAL] module names to enable
@@ -52,7 +48,7 @@ trivy vm [flags] VM_IMAGE
       --ignore-unfixed                    display only fixed vulnerabilities
       --ignorefile string                 specify .trivyignore file (default ".trivyignore")
       --include-non-failures              include successes and exceptions, available with '--scanners misconfig'
-      --java-db-repository strings        OCI repository(ies) to retrieve trivy-java-db in order of priority (default [ghcr.io/aquasecurity/trivy-java-db:1])
+      --java-db-repository string         OCI repository to retrieve trivy-java-db from (default "ghcr.io/aquasecurity/trivy-java-db:1")
       --list-all-pkgs                     output all packages in the JSON report regardless of vulnerability
       --misconfig-scanners strings        comma-separated list of misconfig scanners to use for misconfiguration scanning (default [azure-arm,cloudformation,dockerfile,helm,kubernetes,terraform,terraformplan-json,terraformplan-snapshot])
       --module-dir string                 specify directory to the wasm modules that will be loaded (default "$HOME/.trivy/modules")
@@ -61,13 +57,13 @@ trivy vm [flags] VM_IMAGE
   -o, --output string                     output file name
       --output-plugin-arg string          [EXPERIMENTAL] output plugin arguments
       --parallel int                      number of goroutines enabled for parallel scanning, set 0 to auto-detect parallelism (default 5)
-      --pkg-relationships strings         list of package relationships (unknown,root,direct,indirect) (default [unknown,root,direct,indirect])
-      --pkg-types strings                 list of package types (os,library) (default [os,library])
       --redis-ca string                   redis ca file location, if using redis as cache backend
       --redis-cert string                 redis certificate file location, if using redis as cache backend
       --redis-key string                  redis key file location, if using redis as cache backend
       --redis-tls                         enable redis TLS with public certificates, if using redis as cache backend
       --rekor-url string                  [EXPERIMENTAL] address of rekor STL server (default "https://rekor.sigstore.dev")
+      --reset                             remove all caches and database
+      --reset-checks-bundle               remove checks bundle
       --sbom-sources strings              [EXPERIMENTAL] try to retrieve SBOM from the specified sources (oci,rekor)
       --scanners strings                  comma-separated list of what security issues to detect (vuln,misconfig,secret,license) (default [vuln,secret])
       --secret-config string              specify a path to config file for secret scanning (default "trivy-secret.yaml")
@@ -78,12 +74,12 @@ trivy vm [flags] VM_IMAGE
       --skip-dirs strings                 specify the directories or glob patterns to skip
       --skip-files strings                specify the files or glob patterns to skip
       --skip-java-db-update               skip updating Java index database
-      --skip-vex-repo-update              [EXPERIMENTAL] Skip VEX Repository update
   -t, --template string                   output template
       --tf-exclude-downloaded-modules     exclude misconfigurations for downloaded terraform modules
       --token string                      for authentication in client/server mode
       --token-header string               specify a header name for token in client/server mode (default "Trivy-Token")
-      --vex strings                       [EXPERIMENTAL] VEX sources ("repo", "oci" or file path)
+      --vex string                        [EXPERIMENTAL] file path to VEX
+      --vuln-type strings                 comma-separated list of vulnerability types (os,library) (default [os,library])
 ```
 
 ### Options inherited from parent commands

docs/docs/references/modes/client-server.md

@@ -2,22 +2,9 @@
 
 Trivy has client/server mode. Trivy server has vulnerability database and Trivy client doesn't have to download vulnerability database. It is useful if you want to scan images or files at multiple locations and do not want to download the database at every location.
 
-| Client/Server Mode | Image | Rootfs | Filesystem | Repository | Config | K8s |
-|:------------------:|:-----:|:------:|:----------:|:----------:|:------:|:---:|
-|     Supported      |   ✅   |   ✅    |     ✅      |     ✅      |   -    |  -  |
-
-Some scanners run on the client side, even in client/server mode.
-
-|     Scanner      | Run on Client or Server |
-|:----------------:|:-----------------------:|
-|  Vulnerability   |         Server          |
-| Misconfiguration |       Client[^1]        |
-|      Secret      |       Client[^2]        |
-|     License      |         Server          |
-
-!!! note
-    Scanning of misconfigurations and licenses is performed on the client side (as in standalone mode).
-    Otherwise, the client would need to send files to the server that may contain sensitive information.
+|   Client/Server Mode  | Image | Rootfs | Filesystem | Repository | Config | AWS | K8s |
+|:---------------------:|:-----:|:------:|:----------:|:----------:|:------:|:---:|:---:|
+|       Supported       |   ✅  |   ✅     |     ✅     |     ✅     |  ✅    | X   |  X  |
 
 ## Server
 At first, you need to launch Trivy server. It downloads vulnerability database automatically and continue to fetch the latest DB in the background.
@@ -351,5 +338,3 @@ Returns the `200 OK` status if the request was successful.
 
 ![architecture](../../../imgs/client-server.png)
 
-[^1]: The checks bundle is also downloaded on the client side.
-[^2]: The scan result with masked secrets is sent to the server

docs/docs/references/troubleshooting.md

@@ -203,7 +203,10 @@ Trivy v0.23.0 or later requires Trivy DB v2. Please update your local database o
 !!! error
     FATAL failed to download vulnerability DB
 
-If Trivy is running behind corporate firewall, refer to the necessary connectivity requirements as described [here][network].
+If trivy is running behind corporate firewall, you have to add the following urls to your allowlist.
+
+- ghcr.io
+- pkg-containers.githubusercontent.com
 
 ### Denied
 
@@ -261,12 +264,11 @@ $ brew install aquasecurity/trivy/trivy
 ## Others
 ### Unknown error
 
-Try again after running `trivy clean --all`:
+Try again with `--reset` option:
 
 ```
-$ trivy clean --all
+$ trivy image --reset
 ```
 
 [air-gapped]: ../advanced/air-gap.md
-[network]: ../advanced/air-gap.md#network-requirements
 [redis-cache]: ../../vulnerability/examples/cache/#cache-backend

docs/docs/scanner/misconfiguration/check/builtin.md

@@ -1,20 +1,21 @@
 # Built-in Checks 
 
-## Checks Sources
-Trivy has an extensive library of misconfiguration checks that is maintained at <https://github.com/aquasecurity/trivy-checks>.  
-Trivy checks are mainly written in [Rego][rego], while some checks are written in Go.  
+## Check Sources
+Built-in checks are mainly written in [Rego][rego] and Go.
+Those checks are managed under [trivy-checks repository][trivy-checks].
 See [here](../../../coverage/iac/index.md) for the list of supported config types.
 
-## Checks Bundle
-When performing a misconfiguration scan, Trivy will automatically download the relevant Checks bundle. The bundle is cached locally and Trivy will reuse it for subsequent scans on the same machine. Trivy takes care of updating the cache automatically, so normally users can be oblivious to it.
+For suggestions or issues regarding policy content, please open an issue under the [trivy-checks][trivy-checks] repository.
 
-## Checks Distribution
-Trivy checks are distributed as an [OPA bundle](opa-bundle) hosted in the following GitHub Container Registry: <https://ghcr.io/aquasecurity/trivy-checks>.  
+## Check Distribution
+Trivy checks are distributed as an OPA bundle on [GitHub Container Registry][ghcr] (GHCR).
+When misconfiguration detection is enabled, Trivy pulls the OPA bundle from GHCR as an OCI artifact and stores it in the cache.
+Those checks are then loaded into Trivy OPA engine and used for detecting misconfigurations.
+If Trivy is unable to pull down newer checks, it will use the embedded set of checks as a fallback. This is also the case in air-gap environments where `--skip-policy-update` might be passed.
+
+## Update Interval
 Trivy checks for updates to OPA bundle on GHCR every 24 hours and pulls it if there are any updates.
 
-### External connectivity
-Trivy needs to connect to the internet to download the bundle. If you are running Trivy in an air-gapped environment, or an tightly controlled network, please refer to the [Advanced Network Scenarios document](../../../advanced/air-gap.md).  
-The Checks bundle is also embedded in the Trivy binary (at build time), and will be used as a fallback if Trivy is unable to download the bundle. This means that you can still scan for misconfigurations in an air-gapped environment using the Checks from the time of the Trivy release you are using.
-
 [rego]: https://www.openpolicyagent.org/docs/latest/policy-language/
-[opa-bundle]: https://www.openpolicyagent.org/docs/latest/management-bundles/
+[trivy-checks]: https://github.com/aquasecurity/trivy-checks
+[ghcr]: https://github.com/aquasecurity/trivy-checks/pkgs/container/trivy-checks

docs/docs/scanner/misconfiguration/custom/data.md

@@ -1,14 +1,15 @@
 # Custom Data
 
-Custom checks may require additional data in order to make a resolution. You can pass arbitrary data files to Trivy to be used when evaluating rego checks using the `--data` flag. 
-Trivy recursively searches the specified data paths for JSON (`*.json`) and YAML (`*.yaml`) files.
+Custom checks may require additional data in order to determine an answer.
 
-For example, consider an allowed list of resources that can be created. 
-Instead of hardcoding this information inside your policy, you can maintain the list in a separate file.
+For example, an allowed list of resources that can be created. 
+Instead of hardcoding this information inside your policy, Trivy allows passing paths to data files with the `--data` flag.
 
-Example data file:
+Given the following yaml file:
 
-```yaml
+```bash
+$ cd examples/misconf/custom-data
+$ cat data/ports.yaml                                                                                                                                                                      [~/src/github.com/aquasecurity/trivy/examples/misconf/custom-data]
 services:
   ports:
     - "20"
@@ -18,7 +19,7 @@ services:
     - "23/tcp"
 ```
 
-Example usage in a Rego check:
+This can be imported into your policy:
 
 ```rego
 import data.services
@@ -26,8 +27,9 @@ import data.services
 ports := services.ports
 ```
 
-Example loading the data file:
+Then, you need to pass data paths through `--data` option.
+Trivy recursively searches the specified paths for JSON (`*.json`) and YAML (`*.yaml`) files.
 
 ```bash
-trivy config --config-check ./checks --data ./data --namespaces user ./configs
-```
+$ trivy conf --policy ./policy --data data --namespaces user ./configs
+```

docs/docs/scanner/misconfiguration/custom/debug.md

@@ -7,7 +7,7 @@ This will output a large trace from Open Policy Agent like the following:
     Only failed checks show traces. If you want to debug a passed check, you need to make it fail on purpose.
 
 ```shell
-$ trivy config --trace configs/
+$ trivy conf --trace configs/
 2022-05-16T13:47:58.853+0100	INFO	Detected config files: 1
 
 Dockerfile (dockerfile)

docs/docs/scanner/misconfiguration/custom/index.md

@@ -2,10 +2,10 @@
 
 ## Overview
 You can write custom checks in [Rego][rego].
-Once you finish writing custom checks, you can pass the check files or the directory where those checks are stored with --config-check` option.
+Once you finish writing custom checks, you can pass the policy files or the directory where those policies are stored with `--policy` option.
 
 ``` bash
-trivy config --config-check /path/to/policy.rego --config-check /path/to/custom_checks --namespaces user /path/to/config_dir
+trivy conf --policy /path/to/policy.rego --policy /path/to/custom_policies --namespaces user /path/to/config_dir
 ```
 
 As for `--namespaces` option, the detail is described as below.
@@ -93,7 +93,7 @@ By default, only `builtin.*` packages will be evaluated.
 If you define custom packages, you have to specify the package prefix via `--namespaces` option. By default, Trivy only runs in its own namespace, unless specified by the user. Note that the custom namespace does not have to be `user` as in this example. It could be anything user-defined.
 
 ``` bash
-trivy config --config-check /path/to/custom_checks --namespaces user /path/to/config_dir
+trivy conf --policy /path/to/custom_policies --namespaces user /path/to/config_dir
 ```
 
 In this case, `user.*` will be evaluated.
@@ -135,7 +135,7 @@ correct and do not reference incorrect properties/values.
 
 #### custom.avd_id and custom.id
 
-The AVD_ID can be used to link the check to the Aqua Vulnerability Database (AVD) entry. For example, the `avd_id` `AVD-AWS-0176` is the ID of the check in the [AWS Vulnerability Database](https://avd.aquasec.com/). If you are [contributing your check to trivy-checks](../../../../community/contribute/checks/overview.md), you need to generate an ID using `make id` in the [trivy-checks](https://github.com/aquasecurity/trivy-checks) repository. The output of the command will provide you the next free IDs for the different providers in Trivy.
+The AVD_ID can be used to link the check to the Aqua Vulnerability Database (AVD) entry. For example, the `avd_id` `AVD-AWS-0176` is the ID of the check in the [AWS Vulnerability Database](https://avd.aquasec.com/). If you are [contributing your check to trivy-policies](../../../../community/contribute/checks/overview.md), you need to generate an ID using `make id` in the [trivy-checks](https://github.com/aquasecurity/trivy-checks) repository. The output of the command will provide you the next free IDs for the different providers in Trivy.
 
 The ID is based on the AVD_ID. For instance if the `avd_id` is `AVD-AWS-0176`, the ID is `ID0176`.
 

docs/docs/scanner/misconfiguration/custom/schema.md

@@ -1,7 +1,7 @@
 # Input Schema
 
 ## Overview
-Checks can be defined with custom schemas that allow inputs to be verified against them. Adding a policy schema
+Policies can be defined with custom schemas that allow inputs to be verified against them. Adding a policy schema
 enables Trivy to show more detailed error messages when an invalid input is encountered.
 
 In Trivy we have been able to define a schema for a [Dockerfile](https://github.com/aquasecurity/trivy/tree/main/pkg/iac/rego/schemas)

docs/docs/scanner/misconfiguration/index.md

@@ -101,13 +101,13 @@ For example, the following example holds IaC files for Terraform, CloudFormation
 ``` bash
 $ ls iac/
 Dockerfile  deployment.yaml  main.tf mysql-8.8.26.tar
-$ trivy config --severity HIGH,CRITICAL ./iac
+$ trivy conf --severity HIGH,CRITICAL ./iac
 ```
 
 <details>
 <summary>Result</summary>
 
-```bash
+```
 2022-06-06T11:01:21.142+0100	INFO	Detected config files: 8
 
 Dockerfile (dockerfile)
@@ -315,9 +315,6 @@ Failures: 2 (MEDIUM: 2, HIGH: 0, CRITICAL: 0)
 This section describes misconfiguration-specific configuration.
 Other common options are documented [here](../../configuration/index.md).
 
-### External connectivity
-Trivy needs to connect to the internet to download the checks bundle. If you are running Trivy in an air-gapped environment, or an tightly controlled network, please refer to the [Advanced Network Scenarios document](../../advanced/air-gap.md).
-
 ### Enabling a subset of misconfiguration scanners
 It's possible to only enable certain misconfiguration scanners if you prefer.
 You can do so by passing the `--misconfig-scanners` option.
@@ -329,86 +326,19 @@ trivy config --misconfig-scanners=terraform,dockerfile .
 
 Will only scan for misconfigurations that pertain to Terraform and Dockerfiles.
 
-### Loading custom checks
-You can load check files or directories including your custom checks using the `--config-check` flag.
+### Passing custom checks
+You can pass policy files or directories including your custom checks through `--policy` option.
 This can be repeated for specifying multiple files or directories.
 
 ```bash
-trivy config --config-check custom-policy/policy --config-check combine/policy --config-check policy.rego --namespaces user myapp
+cd examplex/misconf/
+trivy conf --policy custom-policy/policy --policy combine/policy --policy policy.rego --namespaces user misconf/mixed
 ```
 
-You can load checks bundle as OCI Image from a Container Registry using the `--checks-bundle-repository` flag.
-
-```bash
-trivy config --checks-bundle-repository myregistry.local/mychecks --namespaces user myapp
-```
-
-
-### Scan arbitrary JSON and YAML configurations
-By default, scanning JSON and YAML configurations is disabled, since Trivy does not contain built-in checks for these configurations. To enable it, pass the `json` or `yaml` to `--misconfig-scanners`. See [Enabling a subset of misconfiguration scanners](#enabling-a-subset-of-misconfiguration-scanners) for more information. Trivy will pass each file as is to the checks input.
-
-
-!!! example
-```bash
-$ cat iac/serverless.yaml
-service: serverless-rest-api-with-pynamodb
-
-frameworkVersion: ">=2.24.0"
-
-plugins:
-  - serverless-python-requirements
-...
-
-$ cat serverless.rego
-# METADATA
-# title: Serverless Framework service name not starting with "aws-"
-# description: Ensure that Serverless Framework service names start with "aws-"
-# schemas:
-#   - input: schema["serverless-schema"]
-# custom:
-#   id: SF001
-#   severity: LOW
-package user.serverless001
-
-deny[res] {
-    not startswith(input.service, "aws-")
-    res := result.new(
-        sprintf("Service name %q is not allowed", [input.service]),
-        input.service
-    )
-}
-
-$ trivy config --misconfig-scanners=json,yaml --config-check ./serverless.rego --check-namespaces user ./iac
-serverless.yaml (yaml)
-
-Tests: 4 (SUCCESSES: 3, FAILURES: 1, EXCEPTIONS: 0)
-Failures: 1 (UNKNOWN: 0, LOW: 1, MEDIUM: 0, HIGH: 0, CRITICAL: 0)
-
-LOW: Service name "serverless-rest-api-with-pynamodb" is not allowed
-═════════════════════════════════════════════════════════════════════════════════════════════════════════
-Ensure that Serverless Framework service names start with "aws-"
-```
-
-!!! note
-    In the case above, the custom check specified has a metadata annotation for the input schema `input: schema["serverless-schema"]`. This allows Trivy to type check the input IaC files provided.
-
-Optionally, you can also pass schemas using the `config-file-schemas` flag. Trivy will use these schemas for file filtering and type checking in Rego checks.
-
-!!! example
-```bash
-$ trivy config --misconfig-scanners=json,yaml --config-check ./serverless.rego --check-namespaces user --config-file-schemas ./serverless-schema.json ./iac
-```
-
-If the `--config-file-schemas` flag is specified Trivy ensures that each input IaC config file being scanned is type-checked against the schema. If the input file does not match any of the passed schemas, it will be ignored. 
-
-If the schema is specified in the check metadata and is in the directory specified in the `--config-check` argument, it will be automatically loaded as specified [here](./custom/schema.md#custom-checks-with-custom-schemas), and will only be used for type checking in Rego.
-
-!!! note
-    If a user specifies the `--config-file-schemas` flag, all input IaC config files are ensured that they pass type-checking. It is not required to pass an input schema in case type checking is not required. This is helpful for scenarios where you simply want to write a Rego check and pass in IaC input for it. Such a use case could include scanning for a new service which Trivy might not support just yet.
+For more details, see [Custom Checks](./custom/index.md).
 
 !!! tip
-    It is also possible to specify multiple input schemas with `--config-file-schema` flag as it can accept a comma seperated list of file paths or a directory as input. In the case of multiple schemas being specified, all of them will be evaluated against all the input files.
-
+You also need to specify `--namespaces` option.
 
 ### Passing custom data
 You can pass directories including your custom data through `--data` option.
@@ -416,7 +346,7 @@ This can be repeated for specifying multiple directories.
 
 ```bash
 cd examples/misconf/custom-data
-trivy config --config-check ./my-check --data ./data --namespaces user ./configs
+trivy conf --policy ./policy --data ./data --namespaces user ./configs
 ```
 
 For more details, see [Custom Data](./custom/data.md).
@@ -427,15 +357,15 @@ If you want to evaluate custom checks in other packages, you have to specify pac
 This can be repeated for specifying multiple packages.
 
 ``` bash
-trivy config --config-check ./my-check --namespaces main --namespaces user ./configs
+trivy conf --policy ./policy --namespaces main --namespaces user ./configs
 ```
 
-### Private Terraform registries
-Trivy can download Terraform code from private registries.
+### Private terraform registries
+Trivy can download terraform code from private registries.
 To pass credentials you must use the `TF_TOKEN_` environment variables.
 You cannot use a `.terraformrc` or `terraform.rc` file, these are not supported by trivy yet.
 
-From the Terraform [docs](https://developer.hashicorp.com/terraform/cli/config/config-file#environment-variable-credentials):
+From the terraform [docs](https://developer.hashicorp.com/terraform/cli/config/config-file#environment-variable-credentials):
 
 > Environment variable names should have the prefix TF_TOKEN_ added to the domain name, with periods encoded as underscores.
 > For example, the value of a variable named `TF_TOKEN_app_terraform_io` will be used as a bearer authorization token when the CLI makes service requests to the hostname `app.terraform.io`.
@@ -546,7 +476,7 @@ If you want to ignore multiple resources on different attributes, you can specif
 #trivy:ignore:aws-ec2-no-public-ingress-sgr[from_port=5432]
 ```
 
-You can also ignore a resource on multiple attributes in the same rule:
+You can also ignore a resource on multiple attributes:
 ```tf
 locals {
   rules = {
@@ -575,7 +505,10 @@ resource "aws_security_group_rule" "example" {
 }
 ```
 
-Checks can also be ignored by nested attributes:
+Checks can also be ignored by nested attributes, but certain restrictions apply:
+
+- You cannot access an individual block using indexes, for example when working with dynamic blocks.
+- Special variables like [each](https://developer.hashicorp.com/terraform/language/meta-arguments/for_each#the-each-object) and [count](https://developer.hashicorp.com/terraform/language/meta-arguments/count#the-count-object) cannot be accessed.
 
 ```tf
 #trivy:ignore:*[logging_config.prefix=myprefix]

docs/docs/scanner/secret.md

@@ -3,9 +3,7 @@
 Trivy scans any container image, filesystem and git repository to detect exposed secrets like passwords, api keys, and tokens.
 Secret scanning is enabled by default.
 
-Trivy will scan every plaintext file, according to builtin rules or configuration. Also, Trivy can detect secrets in compiled Python files (`.pyc`).
-
-There are plenty of builtin rules:
+Trivy will scan every plaintext file, according to builtin rules or configuration. There are plenty of builtin rules:
 
 - AWS access key
 - GCP service account

docs/docs/scanner/vulnerability.md

@@ -1,12 +1,13 @@
 # Vulnerability Scanning
-Trivy detects known vulnerabilities in software components that it finds in the scan target.
+Trivy detects known vulnerabilities according to the versions of installed packages.
 
-The following are supported:
+The following packages are supported.
 
 - [OS packages](#os-packages)
 - [Language-specific packages](#language-specific-packages)
-- [Non-packaged software](#non-packaged-software)
-- [Kubernetes components](#kubernetes)
+- [Kubernetes components (control plane, node and addons)](#kubernetes)
+
+Trivy also detects known vulnerabilities in Kubernetes components using KBOM (Kubernetes bill of Material) scanning. To learn more, see the [documentation for Kubernetes scanning](../target/kubernetes.md#KBOM).
 
 ## OS Packages
 Trivy is capable of automatically detecting installed OS packages when scanning container images, VM images and running hosts.
@@ -19,22 +20,22 @@ See [here](../coverage/os/index.md#supported-os) for the supported OSes.
 
 ### Data Sources
 
-| OS                        | Source                                                       |
-|---------------------------|--------------------------------------------------------------|
-| Arch Linux                | [Vulnerable Issues][arch]                                    |
-| Alpine Linux              | [secdb][alpine]                                              |
-| Wolfi Linux               | [secdb][wolfi]                                               |
-| Chainguard                | [secdb][chainguard]                                          |
-| Amazon Linux              | [Amazon Linux Security Center][amazon]                       |
-| Debian                    | [Security Bug Tracker][debian-tracker] / [OVAL][debian-oval] |
-| Ubuntu                    | [Ubuntu CVE Tracker][ubuntu]                                 |
-| RHEL/CentOS               | [OVAL][rhel-oval] / [Security Data][rhel-api]                |
-| AlmaLinux                 | [AlmaLinux Product Errata][alma]                             |
-| Rocky Linux               | [Rocky Linux UpdateInfo][rocky]                              |
-| Oracle Linux              | [OVAL][oracle]                                               |
-| Azure Linux (CBL-Mariner) | [OVAL][azure]                                                |
-| OpenSUSE/SLES             | [CVRF][suse]                                                 |
-| Photon OS                 | [Photon Security Advisory][photon]                           |
+| OS            | Source                                                       |
+| ------------- | ------------------------------------------------------------ |
+| Arch Linux    | [Vulnerable Issues][arch]                                    |
+| Alpine Linux  | [secdb][alpine]                                              |
+| Wolfi Linux   | [secdb][wolfi]                                               |
+| Chainguard    | [secdb][chainguard]                                          |
+| Amazon Linux  | [Amazon Linux Security Center][amazon]                       |
+| Debian        | [Security Bug Tracker][debian-tracker] / [OVAL][debian-oval] |
+| Ubuntu        | [Ubuntu CVE Tracker][ubuntu]                                 |
+| RHEL/CentOS   | [OVAL][rhel-oval] / [Security Data][rhel-api]                |
+| AlmaLinux     | [AlmaLinux Product Errata][alma]                             |
+| Rocky Linux   | [Rocky Linux UpdateInfo][rocky]                              |
+| Oracle Linux  | [OVAL][oracle]                                               |
+| CBL-Mariner   | [OVAL][mariner]                                              |
+| OpenSUSE/SLES | [CVRF][suse]                                                 |
+| Photon OS     | [Photon Security Advisory][photon]                           |
 
 #### Data Source Selection
 Trivy **only** consumes security advisories from the sources listed in the above table.
@@ -65,44 +66,7 @@ If the data source does not provide a severity, the severity is determined based
 | 7.0-8.9          | High     |
 | 9.0-10.0         | Critical |
 
-If the CVSS score is also not provided, it falls back to [NVD][nvd].
-
-NVD and some vendors may delay severity analysis, while other vendors, such as Red Hat, are able to quickly evaluate and announce the severity of vulnerabilities.
-To avoid marking too many vulnerabilities as "UNKNOWN" severity, Trivy uses severity ratings from other vendors when the NVD information is not yet available.
-The order of preference for vendor severity data can be found [here](https://github.com/aquasecurity/trivy-db/blob/79d0fbd1e246f3c77eef4b9826fe4bf65940b221/pkg/vulnsrc/vulnerability/vulnerability.go#L17-L19).
-
-You can reference `SeveritySource` in the [JSON reporting format](../configuration/reporting.md#json) to see from where the severity is taken for a given vulnerability.
-
-```shell
-"SeveritySource": "debian",
-```
-
-
-In addition, you can see all the vendor severity ratings.
-
-```json
-"VendorSeverity": {
-  "amazon": 2,
-  "cbl-mariner": 4,
-  "ghsa": 4,
-  "nvd": 4,
-  "photon": 4,
-  "redhat": 2,
-  "ubuntu": 2
-}
-```
-
-Here is the severity mapping in Trivy:
-
-| Number | Severity |
-|:------:|----------|
-|   0    | Unknown  |
-|   1    | Low      |
-|   2    | Medium   |
-|   3    | High     |
-|   4    | Critical |
-
-If no vendor has a severity, the `UNKNOWN` severity will be used.
+If the CVSS score is also not provided, it falls back to [NVD][nvd], and if NVD does not have severity, it will be UNKNOWN.
 
 ### Unfixed Vulnerabilities
 The unfixed/unfixable vulnerabilities mean that the patch has not yet been provided on their distribution.
@@ -137,18 +101,9 @@ See [here](../coverage/language/index.md#supported-languages) for the supported
 
 [^1]: Intentional delay between vulnerability disclosure and registration in the DB
 
-## Non-packaged software
-
-If you have software that is not managed by a package manager, Trivy can still detect vulnerabilities in it in some cases:
-
-- [Using SBOM from Sigstore Rekor](../supply-chain/attestation/rekor/#non-packaged-binaries)
-- [Go Binaries with embedded module information](../coverage/language/golang/#go-binaries)
-- [Rust Binaries with embedded information](../coverage/language/rust/#binaries)
-- [SBOM embedded in container images](../supply-chain/container-image/#sbom-embedded-in-container-images)
-
 ## Kubernetes
 
-Trivy can detect vulnerabilities in Kubernetes clusters and components by scanning a Kubernetes Cluster, or a KBOM (Kubernetes bill of Material). To learn more, see the [documentation for Kubernetes scanning](../target/kubernetes.md).
+Trivy can detect vulnerabilities in Kubernetes clusters and components.
 
 ### Data Sources
 
@@ -158,79 +113,53 @@ Trivy can detect vulnerabilities in Kubernetes clusters and components by scanni
 
 [^1]: Some manual triage and correction has been made.
 
-## Databases
-Trivy utilizes several databases containing information relevant for vulnerability scanning.  
-When performing a vulnerability scan, Trivy will automatically downloads the relevant databases. The databases are cached locally and Trivy will reuse them for subsequent scans on the same machine. Trivy takes care of updating the databases cache automatically, so normally users can be oblivious to it.
+## Database
+Trivy downloads [the vulnerability database](https://github.com/aquasecurity/trivy-db) every 6 hours.
+Trivy uses two types of databases for vulnerability detection:
+
+- Vulnerability Database
+- Java Index Database
+
+This page provides detailed information about these databases.
+
+### Vulnerability Database
+Trivy utilizes a database containing vulnerability information.
+This database is built every six hours on [GitHub](https://github.com/aquasecurity/trivy-db) and is distributed via [GitHub Container registry (GHCR)](https://ghcr.io/aquasecurity/trivy-db).
+The database is cached and updated as needed.
+As Trivy updates the database automatically during execution, users don't need to be concerned about it.
 
 For CLI flags related to the database, please refer to [this page](../configuration/db.md).
 
-### Vulnerability Database
-This is Trivy's main database which contains vulnerability information, as collected from the datasources mentioned above.  
-It is built every six hours on [GitHub](https://github.com/aquasecurity/trivy-db).  
+#### Private Hosting
+If you host the database on your own OCI registry, you can specify a different repository with the `--db-repository` flag.
+The default is `ghcr.io/aquasecurity/trivy-db`.
+
+```shell
+$ trivy image --db-repository YOUR_REPO YOUR_IMAGE
+```
+
+If authentication is required, it can be configured in the same way as for private images.
+Please refer to [the documentation](../advanced/private-registries/index.md) for more details.
 
 ### Java Index Database
-When scanning JAR files, Trivy relies on a dedicated database for identifying the groupId, artifactId, and version of the scanned JAR files. This database is only used when scanning JAR files, however your scanned artifacts might contain JAR files that you're not aware of.  
-This database is built once a day on [GitHub](https://github.com/aquasecurity/trivy-java-db).  
+This database is only downloaded when scanning JAR files so that Trivy can identify the groupId, artifactId, and version of JAR files.
+It is built once a day on [GitHub](https://github.com/aquasecurity/trivy-java-db) and distributed via [GitHub Container registry (GHCR)](https://ghcr.io/aquasecurity/trivy-java-db).
+Like the vulnerability database, it is automatically downloaded and updated when needed, so users don't need to worry about it.
 
-### External connectivity
-Trivy needs to connect to the internet to download the databases. If you are running Trivy in an air-gapped environment, or an tightly controlled network, please refer to the [Advanced Network Scenarios document](../advanced/air-gap.md).
+#### Private Hosting
+If you host the database on your own OCI registry, you can specify a different repository with the `--java-db-repository` flag.
+The default is `ghcr.io/aquasecurity/trivy-java-db`.
 
-## Detection Behavior
-Trivy prioritizes precision in vulnerability detection, aiming to minimize false positives while potentially accepting some false negatives.
-This approach is particularly relevant in two key areas:
-
-- Handling Software Installed via OS Packages
-- Handling Packages with Unspecified Versions
-
-### Handling Software Installed via OS Packages
-For files installed by OS package managers, such as `apt`, Trivy exclusively uses advisories from the OS vendor.
-This means that even if a JAR file is present in a container image, if it was installed via an OS package manager (e.g., `apt`), Trivy will not analyze the JAR file itself and use upstream security advisories.
-
-For example, consider the Python `requests` package in Red Hat Universal Base Image 8:
-
-```bash
-[root@987ee49dc93d /]# head -n 3 /usr/lib/python3.6/site-packages/requests-2.20.0-py3.6.egg-info/PKG-INFO
-Metadata-Version: 2.1
-Name: requests
-Version: 2.20.0
-```
-
-Version 2.20.0 is installed, and this package is installed by `dnf`.
-
-```bash
-[root@987ee49dc93d /]# rpm -ql python3-requests | grep PKG-INFO
-/usr/lib/python3.6/site-packages/requests-2.20.0-py3.6.egg-info/PKG-INFO
-```
-
-At first glance, this might seem vulnerable to [CVE-2023-32681], which affects versions of requests prior to v2.31.0.
-However, Red Hat backported the fix to v2.20.0-3 in [RHSA-2023:4520], and the package is not vulnerable.
-
-- Upstream (PyPI [requests]): Fixed in v2.31.0
-- Red Hat (`python-requests`): Backported fix applied in v2.20.0-3 (RHSA-2023:4520)
-
-If Trivy were to detect CVE-2023-32681 in this case, it would be a false positive.
-This illustrates why using the correct security advisory is crucial to avoid false detections.
-To minimize false positives, Trivy trusts the OS vendor's advisory for software installed via OS package managers and does not use upstream advisories for these packages.
-
-However, this approach may lead to false negatives if the OS vendor's advisories are delayed or missing.
-In such cases, using [--detection-priority comprehensive](#detection-priority) allows Trivy to consider upstream advisories (e.g., [GitHub Advisory Database][ghsa]), potentially increasing false positives but reducing false negatives.
-
-### Handling Packages with Unspecified Versions
-When a package version cannot be uniquely determined (e.g., `package-a: ">=3.0"`), Trivy typically skips vulnerability detection for that package to avoid false positives.
-If a lock file is present with fixed versions, Trivy will use those for detection.
-
-To detect potential vulnerabilities even with unspecified versions, use [--detection-priority comprehensive](#detection-priority).
-This option makes Trivy use the minimum version in the specified range for vulnerability detection.
-While this may increase false positives if the actual version used is not the minimum, it helps reduce false negatives.
+If authentication is required, you need to run `docker login YOUR_REGISTRY`.
+Currently, specifying a username and password is not supported.
 
 ## Configuration
 This section describes vulnerability-specific configuration.
 Other common options are documented [here](../configuration/index.md).
 
-### Enabling a Subset of Package Types
-
+### Enabling a subset of package types
 It's possible to only enable certain package types if you prefer.
-You can do so by passing the `--pkg-types` option.
+You can do so by passing the `--vuln-type` option.
 This flag takes a comma-separated list of package types.
 
 Available values:
@@ -241,7 +170,7 @@ Available values:
     - Scan language-specific packages (e.g. packages installed by `pip`, `npm`, or `gem`).
 
 ```bash
-$ trivy image --pkg-types os ruby:2.4.0
+$ trivy image --vuln-type os ruby:2.4.0
 ```
 
 
@@ -294,64 +223,6 @@ Total: 7 (UNKNOWN: 0, LOW: 1, MEDIUM: 1, HIGH: 3, CRITICAL: 2)
 
 </details>
 
-!!! info
-    This flag filters the packages themselves, so it also affects the `--list-all-pkgs` option and SBOM generation.
-
-### Filtering by Package Relationships
-
-
-Trivy supports filtering vulnerabilities based on the relationship of packages within a project.
-This is achieved through the `--pkg-relationships` flag.
-This feature allows you to focus on vulnerabilities in specific types of dependencies, such as only those in direct dependencies.
-
-In Trivy, there are four types of package relationships:
-
-1. `root`: The root package being scanned
-2. `direct`: Direct dependencies of the root package
-3. `indirect`: Transitive dependencies
-4. `unknown`: Packages whose relationship cannot be determined
-
-The available relationships may vary depending on the ecosystem.
-To see which relationships are supported for a particular project, you can use the JSON output format and check the `Relationship` field:
-
-```
-$ trivy repo -f json --list-all-pkgs /path/to/project
-```
-
-To scan only the root package and its direct dependencies, you can use the flag as follows:
-
-```
-$ trivy repo --pkg-relationships root,direct /path/to/project
-```
-
-By default, all relationships are included in the scan.
-
-!!! info
-    This flag filters the packages themselves, so it also affects the `--list-all-pkgs` option and SBOM generation.
-
-!!! warning
-    As it may not provide a complete package list, `--pkg-relationships` cannot be used with `--dependency-tree`, `--vex` or SBOM generation.
-
-### Detection Priority
-
-Trivy provides a `--detection-priority` flag to control the balance between false positives and false negatives in vulnerability detection.
-This concept is similar to the relationship between [precision and recall][precision-recall] in machine learning evaluation.
-
-```bash
-$ trivy image --detection-priority {precise|comprehensive} alpine:3.15
-```
-
-- `precise`: This mode prioritizes reducing false positives. It results in less noisy vulnerability reports but may miss some potential vulnerabilities.
-- `comprehensive`: This mode aims to detect more vulnerabilities, potentially including some that might be false positives.
-  It provides broader coverage but may increase the noise in the results.
-
-The default value is `precise`. Also refer to the [detection behavior](#detection-behavior) section for more information.
-
-Regardless of the chosen mode, user review of detected vulnerabilities is crucial:
-
-- `precise`: Review thoroughly, considering potential missed vulnerabilities.
-- `comprehensive`: Carefully investigate each reported vulnerability due to increased false positive possibility.
-
 [^1]: https://github.com/GoogleContainerTools/distroless
 
 [nvd-CVE-2023-0464]: https://nvd.nist.gov/vuln/detail/CVE-2023-0464
@@ -372,7 +243,7 @@ Regardless of the chosen mode, user review of detected vulnerabilities is crucia
 [oracle]: https://linux.oracle.com/security/oval/
 [suse]: http://ftp.suse.com/pub/projects/security/cvrf/
 [photon]: https://packages.vmware.com/photon/photon_cve_metadata/
-[azure]: https://github.com/microsoft/AzureLinuxVulnerabilityData/
+[mariner]: https://github.com/microsoft/CBL-MarinerVulnerabilityData/
 
 [php-ghsa]: https://github.com/advisories?query=ecosystem%3Acomposer
 [python-ghsa]: https://github.com/advisories?query=ecosystem%3Apip
@@ -397,9 +268,3 @@ Regardless of the chosen mode, user review of detected vulnerabilities is crucia
 [nvd]: https://nvd.nist.gov/vuln
 
 [k8s-cve]: https://kubernetes.io/docs/reference/issues-security/official-cve-feed/
-
-[CVE-2023-32681]: https://nvd.nist.gov/vuln/detail/CVE-2023-32681
-[RHSA-2023:4520]: https://access.redhat.com/errata/RHSA-2023:4520 
-[ghsa]: https://github.com/advisories
-[requests]: https://pypi.org/project/requests/
-[precision-recall]: https://developers.google.com/machine-learning/crash-course/classification/precision-and-recall

docs/docs/supply-chain/sbom.md

@@ -731,20 +731,17 @@ $ cat result.spdx.json | jq .
 </details>
 
 ## Scanning
-
-### SBOM as Target
-Trivy can take SBOM documents as input for scanning, e.g `trivy sbom ./sbom.spdx`.
+Trivy can take SBOM documents as input for scanning.
 See [here](../target/sbom.md) for more details.
 
-### SBOM Detection inside Targets
-Trivy searches for SBOM files in container images with the following extensions:
-- `.spdx`
-- `.spdx.json`
-- `.cdx`
-- `.cdx.json`
+Also, Trivy searches for SBOM files in container images.
 
-In addition, Trivy automatically detects SBOM files in [Bitnami images](https://github.com/bitnami/containers), [see here](../coverage/others/bitnami.md) for more details.
+```bash
+$ trivy image bitnami/elasticsearch:8.7.1
+```
 
+For example, [Bitnami images](https://github.com/bitnami/containers) contain SBOM files in `/opt/bitnami` directory.
+Trivy automatically detects the SBOM files and uses them for scanning.
 It is enabled in the following targets.
 
 |     Target      | Enabled |
@@ -758,9 +755,6 @@ It is enabled in the following targets.
 |       AWS       |         |
 |      SBOM       |         |
 
-### SBOM Discovery for Container Images
-
-When scanning container images, Trivy can discover SBOM for those images. [See here](../target/container_image.md) for more details.
 
 [spdx]: https://spdx.dev/wp-content/uploads/sites/41/2020/08/SPDX-specification-2-2.pdf
 

docs/docs/supply-chain/vex.md

@@ -1,11 +1,11 @@
-# Local VEX Files
+# Vulnerability Exploitability Exchange (VEX)
 
 !!! warning "EXPERIMENTAL"
     This feature might change without preserving backwards compatibility.
 
-In addition to [VEX repositories](./repo.md), Trivy also supports the use of local VEX files for vulnerability filtering.
-This method is useful when you have specific VEX documents that you want to apply to your scans.
-Currently, Trivy supports the following formats:
+Trivy supports filtering detected vulnerabilities using [the Vulnerability Exploitability Exchange (VEX)](https://www.ntia.gov/files/ntia/publications/vex_one-page_summary.pdf), a standardized format for sharing and exchanging information about vulnerabilities.
+By providing VEX during scanning, it is possible to filter vulnerabilities based on their status.
+Currently, Trivy supports the following three formats:
 
 - [CycloneDX](https://cyclonedx.org/capabilities/vex/)
 - [OpenVEX](https://github.com/openvex/spec)

docs/docs/supply-chain/vex/index.md

@@ -1,35 +0,0 @@
-# Vulnerability Exploitability Exchange (VEX)
-
-!!! warning "EXPERIMENTAL"
-    This feature might change without preserving backwards compatibility.
-
-Trivy supports filtering detected vulnerabilities using the [Vulnerability Exploitability eXchange (VEX)](https://www.ntia.gov/files/ntia/publications/vex_one-page_summary.pdf), a standardized format for sharing and exchanging information about vulnerabilities.
-By providing VEX during scanning, it is possible to filter vulnerabilities based on their status.
-
-## VEX Usage Methods
-
-Trivy currently supports two methods for utilizing VEX:
-
-1. [VEX Repository](./repo.md)
-2. [Local VEX Files](./file.md)
-3. [VEX Attestation](./oci.md)
-
-### Enabling VEX
-To enable VEX, use the `--vex` option.
-You can specify the method to use:
-
-- To enable the VEX Repository: `--vex repo`
-- To use a local VEX file: `--vex /path/to/vex-document.json`
-- To enable VEX attestation discovery in OCI registry: `--vex oci`
-
-```bash
-$ trivy image ghcr.io/aquasecurity/trivy:0.52.0 --vex repo
-```
-
-You can enable these methods simultaneously.
-The order of specification determines the priority:
-
-- `--vex repo --vex /path/to/vex-document.json`: VEX Repository has priority
-- `--vex /path/to/vex-document.json --vex repo`: Local file has priority
-
-For detailed information on each method, please refer to each page.

docs/docs/supply-chain/vex/oci.md

@@ -1,121 +0,0 @@
-# Discover VEX Attestation in OCI Registry
-
-!!! warning "EXPERIMENTAL"
-    This feature might change without preserving backwards compatibility.
-
-Trivy can discover VEX attestations for container images.
-This feature allows you to automatically use VEX during container image scanning.
-
-## How It Works
-
-Trivy can automatically discover and utilize VEX attestations for container images during scanning by using the `--vex oci` flag.
-This process enhances vulnerability detection results by incorporating the information from the VEX attestation.
-
-To use this feature, follow these three steps:
-
-1. Create a VEX document
-2. Generate and upload a VEX attestation to an OCI registry
-3. Use the VEX attestation with Trivy
-
-Steps 1 and 2 are not necessary if you are trying to scan a third-party container image and already have VEX attestation attached.
-
-Let's go through each step in detail.
-
-!!! note
-    In the following examples, the `cosign` command will write an attestation to a target OCI registry, so you must have permission to write.
-    If you want to avoid writing an OCI registry and only want to see an attestation, add the `--no-upload` option to the cosign command.
-
-### Step 1: Create a VEX Document
-
-Currently, Trivy does not have a built-in feature to create VEX documents, so you need to create them manually.
-You can refer to the [OpenVEX section](./file.md#openvex) for guidance on creating VEX files.
-
-For container image vulnerabilities, the product ID should be the OCI type in the [PURL][purl] format.
-For example:
-
-```
-pkg:oci/trivy?repository_url=ghcr.io/aquasecurity/trivy
-```
-
-This product ID applies the VEX statement to all tags of the `ghcr.io/aquasecurity/trivy` container image.
-If you want to declare a statement for a specific digest only, you can use:
-
-```
-pkg:oci/trivy@sha256:5bd5ab35814f86783561603ebb35d5d5d99006dcdcd5c3f828ea1afb4c12d159?repository_url=ghcr.io/aquasecurity/trivy
-```
-
-!!! note
-    Using an image tag, like `pkg:oci/trivy?repository_url=ghcr.io/aquasecurity/trivy&tag=0.50.0`, is not supported in the product ID at the moment.
-
-Next, specify vulnerable packages as subcomponents, such as `pkg:apk/alpine/busybox`.
-You can also include the package version and other [qualifiers][qualifiers] (e.g., `arch`) to limit statements, like `pkg:apk/alpine/busybox@1.36.1-r29?arch=x86`.
-
-Lastly, include the vulnerability IDs.
-
-Here's an example VEX document:
-
-```json
-{
-  "@context": "https://openvex.dev/ns/v0.2.0",
-  "@id": "https://openvex.dev/docs/public/vex-2e67563e128250cbcb3e98930df948dd053e43271d70dc50cfa22d57e03fe96f",
-  "author": "Aqua Security",
-  "timestamp": "2024-07-30T19:07:16.853479631-06:00",
-  "version": 1,
-  "statements": [
-    {
-      "vulnerability": {
-        "name": "CVE-2023-42363"
-      },
-      "products": [
-        {
-          "@id": "pkg:oci/trivy?repository_url=ghcr.io/aquasecurity/trivy",
-          "subcomponents": [
-            {"@id": "pkg:apk/alpine/busybox"},
-            {"@id": "pkg:apk/alpine/busybox-binsh"}
-          ]
-        }
-      ],
-      "status": "not_affected",
-      "justification": "vulnerable_code_cannot_be_controlled_by_adversary",
-      "impact_statement": "awk is not used"
-    }
-  ]
-}
-```
-
-You can also refer to [Trivy's example](https://github.com/aquasecurity/trivy/blob/4e54a7e84c33c1be80c52c6db78c634bc3911715/.vex/oci.openvex.json) for more inspiration.
-
-### Step 2: Generate and Upload a VEX Attestation to an OCI Registry
-
-You can use the [Cosign command](https://docs.sigstore.dev/verifying/attestation/) to generate and upload the VEX attestation.
-Cosign offers methods both with and without keys.
-For detailed instructions, please refer to the Cosign documentation.
-
-To generate and attach a VEX attestation to your image, use the following command:
-
-```
-$ cosign attest --predicate oci.openvex.json --type openvex <IMAGE>
-```
-
-Note that this command attaches the attestation only to the specified image tag.
-If needed, repeat the process for other tags and digests.
-
-### Step 3: Use VEX Attestation with Trivy
-
-Once you've attached the VEX attestation to the container image, Trivy can automatically discover and use it during scanning.
-Simply add the `--vex oci` flag when scanning a container image:
-
-```
-$ trivy image --vex oci <IMAGE>
-```
-
-To see which vulnerabilities were filtered by the VEX attestation, use the `--show-suppressed` flag:
-
-```
-$ trivy image --vex oci --show-suppressed <IMAGE>
-```
-
-The `<IMAGE>` specified in these commands must be the same as the one to which you attached the VEX attestation.
-
-[purl]: https://github.com/package-url/purl-spec
-[qualifiers]: https://github.com/package-url/purl-spec/blob/master/PURL-TYPES.rst

docs/docs/supply-chain/vex/repo.md

@@ -1,210 +0,0 @@
-# VEX Repository
-
-!!! warning "EXPERIMENTAL"
-    This feature might change without preserving backwards compatibility.
-
-## Using VEX Repository
-
-Trivy can download and utilize VEX documents from repositories that comply with [the VEX Repository Specification][vex-repo].
-While it's planned to be enabled by default in the future, currently it can be activated by explicitly specifying `--vex repo`.
-
-```
-$ trivy image ghcr.io/aquasecurity/trivy:0.52.0 --vex repo
-2024-07-20T11:22:58+04:00       INFO    [vex] The default repository config has been created    
-file_path="/Users/teppei/.trivy/vex/repository.yaml"
-2024-07-20T11:23:23+04:00       INFO    [vex] Updating repository...    repo="default" url="https://github.com/aquasecurity/vexhub"
-```
-
-During scanning, Trivy generates PURLs for discovered packages and searches for matching PURLs in the VEX Repository.
-If a match is found, the corresponding VEX is utilized.
-
-### Configuration File
-
-#### Default Configuration
-
-When `--vex repo` is specified for the first time, a default configuration file is created at `$HOME/.trivy/vex/repository.yaml`.
-The home directory can be configured through environment variable `$XDG_DATA_HOME`.
-
-You can also create the configuration file in advance using the `trivy vex repo init` command and edit it.
-
-The default configuration file looks like this:
-
-```yaml
-repositories:
-  - name: default
-    url: https://github.com/aquasecurity/vexhub
-    enabled: true
-    username: ""
-    password: ""
-    token: ""
-```
-
-By default, [VEX Hub][vexhub] managed by Aqua Security is used.
-VEX Hub primarily trusts VEX documents published by the package maintainers.
-
-#### Show Configuration
-You can see the config file path and the configured repositories with `trivy vex repo list`:
-
-```bash
-$ trivy vex repo list
-VEX Repositories (config: /home/username/.trivy/vex/repository.yaml)
-
-- Name: default
-  URL: https://github.com/aquasecurity/vexhub
-  Status: Enabled
-```
-
-#### Custom Repositories
-
-If you want to trust VEX documents published by other organizations or use your own VEX repository, you can specify a custom repository that complies with [the VEX Repository Specification][vex-repo].
-You can add a custom repository as below:
-
-```yaml
-- name: custom
-  url: https://example.com/custom-repo
-  enabled: true
-```
-
-
-#### Authentication
-
-For private repositories:
-
-- `username`/`password` can be used for Basic authentication
-- `token` can be used for Bearer authentication
-
-```yaml
-- name: custom
-  url: https://example.com/custom-repo
-  enabled: true
-  token: "my-token"
-```
-
-#### Repository Priority
-
-The priority of VEX repositories is determined by their order in the configuration file.
-You can add repositories with higher priority than the default or even remove the default VEX Hub.
-
-```yaml
-- name: repo1
-  url: https://example.com/repo1
-- name: repo2
-  url: https://example.com/repo2
-```
-
-In this configuration, when Trivy detects a vulnerability in a package, it generates a PURL for that package and searches for matching VEX documents in the configured repositories.
-The search process follows this order:
-
-1. Trivy first looks for a VEX document matching the package's PURL in `repo1`.
-2. If no matching VEX document is found in `repo1`, Trivy then searches in `repo2`.
-3. This process continues through all configured repositories until a match is found.
- 
-If a matching VEX document is found in any repository (e.g., `repo1`), the search stops, and Trivy uses that VEX document.
-Subsequent repositories (e.g., `repo2`) are not checked for that specific vulnerability and package combination.
-
-It's important to note that the first matching VEX document found determines the final status of the vulnerability.
-For example, if `repo1` states that a package is "Affected" by a vulnerability, this status will be used even if `repo2` states that the same package is "Not Affected" for the same vulnerability.
-The "Affected" status from the higher-priority repository (`repo1`) takes precedence, and Trivy will consider the package as affected by the vulnerability.
-
-### Repository Updates
-
-VEX repositories are automatically updated during scanning.
-Updates are performed based on the update frequency specified by the repository.
-
-To disable auto-update, pass `--skip-vex-repo-update`.
-
-```shell
-$ trivy image ghcr.io/aquasecurity/trivy:0.50.0 --vex repo --skip-vex-repo-update
-```
-
-To download VEX repositories in advance without scanning, use `trivy vex repo download`.
-
-The cache can be cleared with `trivy clean --vex-repo`.
-
-### Displaying Filtered Vulnerabilities
-
-To see which vulnerabilities were filtered and why, use the `--show-suppressed` option:
-
-```shell
-$ trivy image ghcr.io/aquasecurity/trivy:0.50.0 --vex repo --show-suppressed
-...
-
-Suppressed Vulnerabilities (Total: 4)
-=====================================
-┌───────────────┬────────────────┬──────────┬──────────────┬───────────────────────────────────────────────────┬──────────────────────────────────────────┐
-│    Library    │ Vulnerability  │ Severity │    Status    │                     Statement                     │                  Source                  │
-├───────────────┼────────────────┼──────────┼──────────────┼───────────────────────────────────────────────────┼──────────────────────────────────────────┤
-│ busybox       │ CVE-2023-42364 │ MEDIUM   │ not_affected │ vulnerable_code_cannot_be_controlled_by_adversary │ VEX Repository: default                  │
-│               │                │          │              │                                                   │ (https://github.com/aquasecurity/vexhub) │
-│               ├────────────────┤          │              │                                                   │                                          │
-│               │ CVE-2023-42365 │          │              │                                                   │                                          │
-│               │                │          │              │                                                   │                                          │
-├───────────────┼────────────────┤          │              │                                                   │                                          │
-│ busybox-binsh │ CVE-2023-42364 │          │              │                                                   │                                          │
-│               │                │          │              │                                                   │                                          │
-│               ├────────────────┤          │              │                                                   │                                          │
-│               │ CVE-2023-42365 │          │              │                                                   │                                          │
-│               │                │          │              │                                                   │                                          │
-└───────────────┴────────────────┴──────────┴──────────────┴───────────────────────────────────────────────────┴──────────────────────────────────────────┘
-
-```
-
-## Publishing VEX Documents
-
-### For OSS Projects
-
-As an OSS developer or maintainer, you may encounter vulnerabilities in the packages your project depends on.
-These vulnerabilities might be discovered through your own scans or reported by third parties using your OSS project.
-
-While Trivy strives to minimize false positives, it doesn't perform code graph analysis, which means it can't evaluate exploitability at the code level.
-Consequently, Trivy may report vulnerabilities even in cases where:
-
-1. The vulnerable function in a dependency is never called in your project.
-2. The vulnerable code cannot be controlled by an attacker in the context of your project.
-
-If you're confident that a reported vulnerability in a dependency doesn't affect your OSS project or container image, you can publish a VEX document to reduce noise in Trivy scans.
-To assess exploitability, you have several options:
-
-1. Manual assessment: As a maintainer, you can read the source code and determine if the vulnerability is exploitable in your project's context.
-2. Automated assessment: You can use SAST (Static Application Security Testing) tools or similar tools to analyze the code and determine exploitability.
-
-By publishing VEX documents in the source repository, Trivy can automatically utilize them through VEX Hub.
-The main steps are:
-
-1. Generate a VEX document
-2. Commit the VEX document to the `.vex/` directory in the source repository (e.g., [Trivy's VEX][trivy-vex])
-3. Register your project's [PURL][purl] in VEX Hub
-
-Step 3 is only necessary once.
-After that, updating the VEX file in your repository will automatically be fetched by VEX Hub and utilized by Trivy.
-See the [VEX Hub repository][vexhub] for more information.
-
-If you want to issue a VEX for an OSS project that you don't maintain, consider first proposing the VEX publication to the original repository.
-Many OSS maintainers are open to contributions that improve the security posture of their projects.
-However, if your proposal is not accepted, or if you want to issue a VEX with statements that differ from the maintainer's judgment, you may want to consider creating a [custom repository](#hosting-custom-repositories).
-
-### For Private Projects
-
-If you're working on private software or personal projects, you have several options:
-
-1. [Local VEX files](./file.md): You can create local VEX files and have Trivy read them during scans. This is suitable for individual use or small teams.
-2. [.trivyignore](../../configuration/filtering.md#trivyignore): For simpler cases, using a .trivyignore file might be sufficient to suppress specific vulnerabilities.
-3. [Custom repositories](#hosting-custom-repositories): For large organizations wanting to share VEX information for internally used software across different departments, setting up a custom VEX repository might be the best approach.
-
-## Hosting Custom Repositories
-
-While the principle is to store VEX documents for OSS packages in the source repository, it's possible to create a custom repository if that's difficult.
-
-There are various use cases for providing custom repositories:
-
-- A Pull Request to add a VEX document upstream was not merged
-- Consolidating VEX documents output by SAST tools
-- Publishing vendor-specific VEX documents that differ from OSS maintainer statements
-- Creating a private VEX repository to publish common VEX for your company
-
-In these cases, you can create a repository that complies with [the VEX Repository Specification][vex-repo] to make it available for use with Trivy.
-
-[vex-repo]: https://github.com/aquasecurity/vex-repo-spec
-[vexhub]: https://github.com/aquasecurity/vexhub
-[trivy-vex]: https://github.com/aquasecurity/trivy/blob/b76a7250912cfc028cfef743f0f98cd81b39f8aa/.vex/trivy.openvex.json
-[purl]: https://github.com/package-url/purl-spec

docs/docs/target/container_image.md

@@ -436,14 +436,14 @@ The following reports are available out of the box:
 
 | Compliance                             | Version | Name for command | More info                                                                                   |
 |----------------------------------------|---------|------------------|---------------------------------------------------------------------------------------------|
-| CIS Docker Community Edition Benchmark | 1.1.0   | `docker-cis-1.6.0`     | [Link](https://www.aquasec.com/cloud-native-academy/docker-container/docker-cis-benchmark/) |
+| CIS Docker Community Edition Benchmark | 1.1.0   | `docker-cis`     | [Link](https://www.aquasec.com/cloud-native-academy/docker-container/docker-cis-benchmark/) |
 
 ### Examples
 
 Scan a container image configuration and generate a compliance summary report:
 
 ```
-trivy image --compliance docker-cis-1.6.0 [YOUR_IMAGE_NAME]
+$ trivy image --compliance docker-cis [YOUR_IMAGE_NAME]
 ```
 
 !!! note

docs/docs/target/kubernetes.md

@@ -355,14 +355,12 @@ For an overview of Trivy's Compliance feature, including working with custom com
 
 The following reports are available out of the box:
 
-| Compliance                                   | Name for command         | More info                                                                                                           |
-|----------------------------------------------|--------------------------|---------------------------------------------------------------------------------------------------------------------|
-| NSA, CISA Kubernetes Hardening Guidance v1.0 | `k8s-nsa-1.0`            | [Link](https://media.defense.gov/2022/Aug/29/2003066362/-1/-1/0/CTR_KUBERNETES_HARDENING_GUIDANCE_1.2_20220829.PDF) |
-| CIS Benchmark for Kubernetes v1.23           | `k8s-cis-1.23`           | [Link](https://www.cisecurity.org/benchmark/kubernetes)                                                             |
-| CIS Benchmark for RKE2 v1.24                 | `rke2-cis-1.24`          | [Link](https://www.cisecurity.org/benchmark/kubernetes)                                                             |
-| CIS Benchmark for EKS v1.4                   | `eks-cis-1.4`            | [Link](https://www.cisecurity.org/benchmark/kubernetes)                                                             |
-| Pod Security Standards, Baseline             | `k8s-pss-baseline-0.1`   | [Link](https://kubernetes.io/docs/concepts/security/pod-security-standards/#baseline)                               |
-| Pod  Security Standards, Restricted          | `k8s-pss-restricted-0.1` | [Link](https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted)                             |
+| Compliance                                   | Name for command     | More info                                                                                                           |
+|----------------------------------------------|----------------------|---------------------------------------------------------------------------------------------------------------------|
+| NSA, CISA Kubernetes Hardening Guidance v1.2 | `k8s-nsa`            | [Link](https://media.defense.gov/2022/Aug/29/2003066362/-1/-1/0/CTR_KUBERNETES_HARDENING_GUIDANCE_1.2_20220829.PDF) |
+| CIS Benchmark for Kubernetes v1.23           | `k8s-cis`            | [Link](https://www.cisecurity.org/benchmark/kubernetes)                                                             |
+| Pod Security Standards, Baseline             | `k8s-pss-baseline`   | [Link](https://kubernetes.io/docs/concepts/security/pod-security-standards/#baseline)                               |
+| Pod  Security Standards, Restricted          | `k8s-pss-restricted` | [Link](https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted)                             |
 
 Examples:
 
@@ -378,7 +376,7 @@ Get the detailed report for checks:
 
 ```
 
-trivy k8s --compliance=k8s-cis-1.23 --report all
+trivy k8s --compliance=k8s-cis --report all
 
 ```
 
@@ -386,7 +384,7 @@ Get summary report in JSON format:
 
 ```
 
-trivy k8s --compliance=k8s-cis-1.23 --report summary --format json
+trivy k8s --compliance=k8s-cis --report summary --format json
 
 ```
 
@@ -394,7 +392,7 @@ Get detailed report in JSON format:
 
 ```
 
-trivy k8s --compliance=k8s-cis-1.23 --report all --format json
+trivy k8s --compliance=k8s-cis --report all --format json
 
 ```
 

docs/docs/target/vm.md

@@ -230,7 +230,7 @@ Reference: [VMware Virtual Disk Format 1.1.pdf][vmdk]
 |-------------------|:-------:|
 | XFS               |    ✔    |
 | EXT4              |    ✔    |
-| EXT2/3            |    ✔    |
+| EXT2/3            |         |
 | ZFS               |         |
 
 

docs/ecosystem/prod.md

@@ -29,11 +29,3 @@ You can use Kyverno to ensure and enforce that deployed workloads' images are sc
 Trivy is integrated into Zora as a vulnerability scanner plugin.
 
 👉 Get it at: <https://zora-docs.undistro.io/latest/plugins/trivy/>
-
-## Helmper (Community)
-
-[Helmper](https://christoffernissen.github.io/helmper/) is a go program that reads Helm Charts from remote OCI registries and pushes the Helm Charts and the Helm Charts container images to your OCI registries with optional OS level vulnerability patching
-
-Trivy is integrated into Helmper as a vulnerability scanner in combination with Copacetic to fix detected vulnerabilities.
-
-👉 Get it at: <https://github.com/ChristofferNissen/helmper>

docs/ecosystem/reporting.md

@@ -30,9 +30,3 @@ Trivy-Streamlit is a Streamlit application that allows you to quickly parse the
 This project is a web application that allows to load a Trivy report in json format and displays the vulnerabilities of a single target in an interactive data table.
 
 👉 Get it at: <https://github.com/dbsystel/trivy-vulnerability-explorer>
-
-## plopsec.com (Community)
-
-This project is a web application designed to help you visualize Trivy image scan reports. It enriches the data with additional exploitability metrics from EPSS, Metasploit, and Exploit-DB, updated daily.
-
-👉 Get it at: <https://plopsec.com> | <https://github.com/pl0psec/plopsec.com>