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

Automated Updates: support parents and dependency imports #890

Merged
merged 10 commits into from
May 2, 2024

Conversation

cuixq
Copy link
Contributor

@cuixq cuixq commented Mar 27, 2024

This PR adds support for parents and dependency imports:

  • fetching and parsing upstream pom.xml files
  • then merging the data into Maven project
  • add RequirementsFromOtherPOMs to system-specific data to store requirements that we don't have access

Some of the Maven code should be provided by deps.dev/util/maven and deps.dev/util/resolve soon...

@cuixq cuixq requested a review from michaelkedar March 27, 2024 00:12
@codecov-commenter
Copy link

codecov-commenter commented Mar 27, 2024

Codecov Report

Attention: Patch coverage is 75.00000% with 25 lines in your changes are missing coverage. Please review.

Project coverage is 63.65%. Comparing base (559d0c9) to head (eef642b).

Files Patch % Lines
internal/resolution/manifest/maven.go 73.68% 17 Missing and 8 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #890      +/-   ##
==========================================
+ Coverage   63.58%   63.65%   +0.07%     
==========================================
  Files         146      146              
  Lines       11922    11940      +18     
==========================================
+ Hits         7581     7601      +20     
+ Misses       3875     3873       -2     
  Partials      466      466              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@cuixq cuixq marked this pull request as draft March 27, 2024 00:55
Copy link
Member

@michaelkedar michaelkedar left a comment

Choose a reason for hiding this comment

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

LGTM, but Maven makes my head hurt

@cuixq cuixq marked this pull request as ready for review March 27, 2024 06:33
Copy link
Collaborator

@another-rex another-rex left a comment

Choose a reason for hiding this comment

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

LGTM, added some minor comments.

internal/resolution/manifest/maven.go Show resolved Hide resolved
internal/resolution/manifest/maven.go Show resolved Hide resolved
@cuixq cuixq merged commit 6a43a91 into google:main May 2, 2024
13 checks passed
@cuixq cuixq deleted the parent branch May 2, 2024 06:28
josieang pushed a commit to josieang/osv-scanner that referenced this pull request Jun 6, 2024
This PR adds support for parents and dependency imports:
 - fetching and parsing upstream pom.xml files
 - then merging the data into Maven project
- add `RequirementsFromOtherPOMs` to system-specific data to store
requirements that we don't have access

Some of the Maven code should be provided by `deps.dev/util/maven` and
`deps.dev/util/resolve` soon...
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.

5 participants