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

Filter out the reactorprojects in the dependencies for the MSHARED-998 workaround attempting to resolve a dependency with a classifier #3736

Merged
merged 11 commits into from
Oct 23, 2021

Conversation

aikebah
Copy link
Collaborator

@aikebah aikebah commented Oct 13, 2021

Fixes Issue #3730

Description of Change

Remove the reactorProjects from the dependencies offered to the ArtifactResolver when trying to resolve dependencies with classifiers in the work-around for MSHARED-998

Have test cases been added to cover the new functionality?

yes, a test-case similar to the project in the issue has been added to the integration-tests to avoid a regression in the future

@boring-cyborg boring-cyborg bot added maven changes to the maven plugin tests test cases labels Oct 13, 2021
@aikebah aikebah requested a review from jeremylong October 13, 2021 17:55
…he actual exception location; restore initializing from ex, but only add exceptions from ex when an exCol was already non-null
@aikebah
Copy link
Collaborator Author

aikebah commented Oct 14, 2021

As indicated in the issue this does not resolve all failure cases yet... converting to draft PR for further working

@aikebah aikebah removed the request for review from jeremylong October 14, 2021 17:39
@aikebah aikebah marked this pull request as draft October 14, 2021 17:40
@jeremylong
Copy link
Owner

@aikebah let me know when this is ready and we'll push another release.

@aikebah aikebah added this to the 6.4.2 milestone Oct 17, 2021
private Mshared998Util() {
}

/**
Copy link
Contributor

Choose a reason for hiding this comment

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

Reporter: Checkstyle
Rule: com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck
Severity: ERROR
File: maven/src/main/java/org/owasp/dependencycheck/maven/Mshared998Util.java L37

First sentence should end with a period.

@aikebah
Copy link
Collaborator Author

aikebah commented Oct 17, 2021

@jeremylong if this branch also passes the project setup of @viktor-thell-seal I would consider it final

@aikebah aikebah marked this pull request as ready for review October 18, 2021 16:51
@aikebah
Copy link
Collaborator Author

aikebah commented Oct 18, 2021

@jeremylong it's ready for review/merge

@jeremylong jeremylong merged commit 26bdf20 into main Oct 23, 2021
@jeremylong
Copy link
Owner

Thanks for all the work on this!

@aikebah aikebah deleted the issue-3730 branch October 23, 2021 11:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maven changes to the maven plugin tests test cases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants