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

fix(managers/maven): change order of extracted registryUrls #26828

Merged
merged 25 commits into from Feb 9, 2024

Conversation

lpriyasivakumar
Copy link
Contributor

Changes

Adds the repository urls for maven in the correct order parsed from

  • settings.xml
  • pom.xml
  • maven central (defined in the Super POM)

Maven settings files were restricted to ones with schema 1.0.0
Added a check that the settings file is of a supported namespace version as listed here.
Added a test fixture for the settings file following maven example here

Context

Maven central was the first repository in the list of repositories. This was causing dependencies to download from maven central before looking up the repositories specified in the settings.xml or pom.xml.
Settings files that were of a namespace version 1.1.0 or 1.2.0 were skipped over for parsing.

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

@lpriyasivakumar lpriyasivakumar changed the title Ps/maven fixes fix:maven-repository-resolution Jan 23, 2024
Copy link
Collaborator

@secustor secustor left a comment

Choose a reason for hiding this comment

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

Thanks for contributing.

Here my thoughts regarding the implementation.

lib/modules/manager/maven/index.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/maven/extract.ts Outdated Show resolved Hide resolved
lib/modules/manager/maven/extract.ts Outdated Show resolved Hide resolved
@secustor secustor changed the title fix:maven-repository-resolution fix(managers/maven): change order of extracted registryUrls Jan 23, 2024
lpriyasivakumar and others added 2 commits January 24, 2024 08:56
Co-authored-by: Sebastian Poxhofer <secustor@users.noreply.github.com>
lib/modules/manager/maven/extract.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/maven/extract.ts Outdated Show resolved Hide resolved
lib/modules/manager/maven/extract.ts Outdated Show resolved Hide resolved
lib/modules/manager/maven/index.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/maven/index.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/maven/extract.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/maven/extract.ts Outdated Show resolved Hide resolved
secustor
secustor previously approved these changes Feb 3, 2024
@rarkins rarkins requested a review from Churro February 3, 2024 09:39
Copy link
Collaborator

@Churro Churro left a comment

Choose a reason for hiding this comment

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

Otherwise LGTM

lib/modules/manager/maven/extract.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/maven/extract.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/maven/extract.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/maven/extract.spec.ts Outdated Show resolved Hide resolved
Co-authored-by: Johannes Feichtner <343448+Churro@users.noreply.github.com>
lpriyasivakumar and others added 2 commits February 5, 2024 13:10
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
viceice
viceice previously approved these changes Feb 5, 2024
lib/modules/manager/maven/extract.ts Outdated Show resolved Hide resolved
Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

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

should tested on real repo again

@lpriyasivakumar
Copy link
Contributor Author

@viceice @Churro @secustor Any thoughts on when this may get merged? Thanks!

@rarkins rarkins added this pull request to the merge queue Feb 9, 2024
Merged via the queue into renovatebot:main with commit 82e621f Feb 9, 2024
36 checks passed
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 37.181.3 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lpriyasivakumar lpriyasivakumar deleted the ps/maven-fixes branch February 9, 2024 20:54
not7cd pushed a commit to uni-intelligence/renovate that referenced this pull request Feb 13, 2024
…bot#26828)

Co-authored-by: Sebastian Poxhofer <secustor@users.noreply.github.com>
Co-authored-by: Johannes Feichtner <343448+Churro@users.noreply.github.com>
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants