Skip to content

Fix profile resolve duplicate controls - #362

Merged
iMichaela merged 4 commits into
developfrom
360-profile-resolver-duplicate-controls
Sep 3, 2026
Merged

Fix profile resolve duplicate controls#362
iMichaela merged 4 commits into
developfrom
360-profile-resolver-duplicate-controls

Conversation

@selenaxiao-nist

@selenaxiao-nist selenaxiao-nist commented Aug 13, 2026

Copy link
Copy Markdown
Collaborator

Committer Notes

Fixes #360

All Submissions:

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you squashed any non-relevant commits and commit messages? [instructions]
  • Do all automated CI/CD checks pass?

Changes to Core Features:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your core changes, as applicable?
  • Have you included examples of how to use your new feature(s)?
  • Have you updated all website and readme documentation affected by the changes you made?

@selenaxiao-nist selenaxiao-nist linked an issue Aug 13, 2026 that may be closed by this pull request
@selenaxiao-nist
selenaxiao-nist force-pushed the 360-profile-resolver-duplicate-controls branch 3 times, most recently from 5b3c667 to 4508c00 Compare August 17, 2026 18:41
@selenaxiao-nist
selenaxiao-nist marked this pull request as ready for review August 18, 2026 15:42
@selenaxiao-nist selenaxiao-nist changed the title [DRAFT] Fix profile resolve duplicate controls Fix profile resolve duplicate controls Aug 18, 2026
@selenaxiao-nist

Copy link
Copy Markdown
Collaborator Author

@newxorouz
From my testing, building liboscal-java from this branch and then rebuilding oscal-cli should resolve the issue you opened usnistgov/oscal-cli#315. Could you verify on your end?

@selenaxiao-nist
selenaxiao-nist force-pushed the 360-profile-resolver-duplicate-controls branch from b5d13b2 to 3fdc08d Compare September 1, 2026 20:04
@newxorouz

Copy link
Copy Markdown

@newxorouz From my testing, building liboscal-java from this branch and then rebuilding oscal-cli should resolve the issue you opened usnistgov/oscal-cli#315. Could you verify on your end?

Yes, when I run with these changes it does indeed resolve the profile as expected

@selenaxiao-nist

Copy link
Copy Markdown
Collaborator Author

Thanks @newxorouz

@iMichaela could you please review as well and approve for merging? Thank you.

@iMichaela iMichaela left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Builds locally with no issues as long as local Java version is not higher than 21 because the pom file sets maven.compiler.release=11 and binds maven-toolchains-plugin to jdk 11 / Temurin, and the jar produced on Temurin 21 is the same Java 11 bytecode compiled by the same Temurin 11 compiler. Any higher Java version will cause SpotBugs 4.7.3.4 to fail because it ships an ASM that only understands up to Java 21 (as tested).

@iMichaela
iMichaela merged commit 0100edf into develop Sep 3, 2026
1 of 2 checks passed
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.

Duplicate controls when importing from resolved profile Duplicate controls when importing from resolved profile

3 participants