Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(license): always trim leading and trailing spaces for licenses #8095

Merged
merged 1 commit into from
Dec 13, 2024

Conversation

DmitriyLewen
Copy link
Contributor

@DmitriyLewen DmitriyLewen commented Dec 13, 2024

Description

See #8094

example:
test pom.xml file:

    <licenses>
        <license>
            <name>
                Dual license consisting of the CDDL v1.1 and GPL v2
            </name>
            <url>https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html</url>
            <distribution>repo</distribution>
        </license>
    </licenses>

Before:

➜ trivy -q fs --scanners license /Users/dmitriy/work/tmp/8086/pom.xml -f json | grep '"Name"'
          "Name": "\n                Dual license consisting of the CDDL v1.1 and GPL v2\n            ",
          "Name": "CDDL-1.0",

After:

➜ ./trivy -q fs --scanners license /Users/dmitriy/work/tmp/8086/pom.xml -f json | grep '"Name"'
          "Name": "Dual license consisting of the CDDL v1.1 and GPL v2",
          "Name": "CDDL-1.0",

Related issues

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

@DmitriyLewen DmitriyLewen self-assigned this Dec 13, 2024
@DmitriyLewen DmitriyLewen marked this pull request as ready for review December 13, 2024 07:20
@knqyf263 knqyf263 added this pull request to the merge queue Dec 13, 2024
Merged via the queue into aquasecurity:main with commit f5e4291 Dec 13, 2024
14 checks passed
@DmitriyLewen DmitriyLewen deleted the fix/license-trim-spaces branch December 19, 2024 09:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug(license): trim leading and trailing spaces for licenses
2 participants