-
-
Notifications
You must be signed in to change notification settings - Fork 393
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
Use bomDeps when importing Maven projects #4067
base: main
Are you sure you want to change the base?
Use bomDeps when importing Maven projects #4067
Conversation
CI error looks like a flake |
Lemme kick the CI and see if it turns green |
@alexarchambault seems the test is failing reliably on CI, does it pass on your machine? |
My bad, I misread the CI output. It fails on my machine too, yes. |
So adding the parent POM to This needs a missing part of BOM support, something like |
The failing example is this one. It runs into the parent POM issue above if we add |
@alexarchambault perhaps |
I had to update the test data of `mill.main.maven.BuildGenTests` for #4067. The output of those tests didn't really help. This PR changes the helper method checking if generated files match test data in resources, so that it prints more helpful output (removed / added files, diff of modified files), and allows to update the test data on disk by setting `BuildGenTests.updateSnapshots` to true.
Conflicts: main/init/maven/test/resources/expected/maven-samples/multi-module/server/package.mill main/init/maven/test/resources/expected/maven-samples/multi-module/webapp/package.mill main/maven/src/mill/main/maven/BuildGen.scala main/maven/test/resources/expected/config/all/build.mill main/maven/test/resources/expected/config/base-module/server/package.mill main/maven/test/resources/expected/config/base-module/webapp/package.mill main/maven/test/resources/expected/config/deps-object/server/package.mill main/maven/test/resources/expected/config/deps-object/webapp/package.mill main/maven/test/resources/expected/config/merge/build.mill
About this PR: it tries to set But if any one ran into issues with empty versions or faulty class paths, when importing Maven projects, this might help. |
This tries to take into account "import" dependencies when importing Maven projects (which correspond to
bomModulesDeps
andbomIvyDeps
in Mill), and adds parent modules there too (parent modules are basically BOMs).Checking if this breaks the current tests. Extra tests might need to be added, to test these changes.