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

NCL-7185: Ignore overrideTransitive if dependencySource=NONE #386

Merged
merged 1 commit into from
Jul 14, 2022

Conversation

dwalluck
Copy link
Contributor

If GME detects the shadow plugin, it currently requires the user to explicitly set overrideTransitive. However, if dependencySource=NONE, then dependencies won't get aligned anyway, so I don't think the build should fail in that case.

@codecov-commenter
Copy link

codecov-commenter commented Jul 14, 2022

Codecov Report

Merging #386 (9e956b0) into main (370b345) will increase coverage by 0.06%.
The diff coverage is 50.00%.

@@             Coverage Diff              @@
##               main     #386      +/-   ##
============================================
+ Coverage     66.01%   66.07%   +0.06%     
  Complexity      405      405              
============================================
  Files            41       41              
  Lines          2083     2084       +1     
  Branches        291      292       +1     
============================================
+ Hits           1375     1377       +2     
+ Misses          604      602       -2     
- Partials        104      105       +1     
Impacted Files Coverage Δ
...org/jboss/gm/analyzer/alignment/AlignmentTask.java 92.72% <50.00%> (-0.22%) ⬇️
.../gm/manipulation/actions/ManifestUpdateAction.java 51.92% <0.00%> (+3.84%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 370b345...9e956b0. Read the comment docs.

@dwalluck dwalluck requested a review from rnc July 14, 2022 02:05
@rnc rnc merged commit 8b93d16 into project-ncl:main Jul 14, 2022
@@ -592,11 +593,13 @@ private Map<RelaxedProjectVersionRef, ProjectVersionRef> getDependencies(Project
}
Set<ResolvedDependency> target;
if (internalConfig.overrideTransitive() == null || !internalConfig.overrideTransitive()) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the original code, but it looks like this outer if was never necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry, disregard.

@dwalluck dwalluck deleted the NCL-7185 branch July 21, 2022 16:10
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.

3 participants