feat(java): Adding the ability to find properties in maven profiles (activeByDefa… #7298
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
coheigea
force-pushed
the
coheigea/maven-profile-properties
branch
from
3405bd6
to
7ef4f0e
Compare
|
@DmitriyLewen reminder on this please |
There was a problem hiding this comment.
@coheigea Thanks for your help with java!
Sorry for delay.
It looks good to me.
I left couple comments about priority.
Comment on lines
46
to
48
| props := p.content.Properties | ||
| props = utils.MergeMaps(props, p.profileProperties()) | ||
| return utils.MergeMaps(props, p.projectProperties()) |
There was a problem hiding this comment.
maven documentation is not always accurate.
we need to check what priority mvn has for properties
Comment on lines
+81
to
+88
| profiles := p.content.Profiles | ||
| logger := log.WithPrefix("pom") | ||
|
|
||
| projectProperties := make(map[string]string) | ||
| for _, profile := range profiles.Profile { | ||
| activation := profile.Activation | ||
| if activation.ActiveByDefault == enabled { | ||
| logger.Debug("Adding properties from profile", log.String("id", profile.ID)) |
There was a problem hiding this comment.
nit:
We may not create a new variable every time
Suggested change
| profiles := p.content.Profiles | |
| logger := log.WithPrefix("pom") | |
| projectProperties := make(map[string]string) | |
| for _, profile := range profiles.Profile { | |
| activation := profile.Activation | |
| if activation.ActiveByDefault == enabled { | |
| logger.Debug("Adding properties from profile", log.String("id", profile.ID)) | |
| projectProperties := make(map[string]string) | |
| for _, profile := range p.content.Profiles.Profile { | |
| if profile.Activation.ActiveByDefault == enabled { | |
| log.WithPrefix("pom").Debug("Adding properties from profile", log.String("id", profile.ID)) |
Comment on lines
+90
to
+92
| for k, v := range profile.Properties { | ||
| projectProperties[k] = v | ||
| } |
There was a problem hiding this comment.
If 2 profiles contains same variable:
- does
mvnoverwrite value? - does
mvnuse 1 found value?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…ult only)
Currently Trivy is not capable of parsing properties in Maven profiles. It is a pretty common scenario to have different versions of the same dependency in multiple maven profiles, e.g. maybe to support different framework versions with a product.
This PR adds the ability to find properties in a maven profile, but only if it's "activeByDefault". It's impossible to determine otherwise activation properties of maven.
@DmitriyLewen PTAL and let me know if you approve the general approach and I'll add tests.