Skip to content

Fix BOM version resolution for sibling modules in dependencyManagement #12416

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.

Sign up for GitHub

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

Open
Hiteshsai007 wants to merge 1 commit into
base: master
Choose a base branch
from
+57 −17
Open

Fix BOM version resolution for sibling modules in dependencyManagement #12416

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 57 additions & 17 deletions impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,28 +611,68 @@ public void mergeRepositories(Model model, boolean replace) {
// Infer inner reactor dependencies version
//
Model transformFileToRaw(Model model) {
if (model.getDependencies().isEmpty()) {
return model;
}
List<Dependency> newDeps = new ArrayList<>(model.getDependencies().size());
boolean changed = false;
for (Dependency dep : model.getDependencies()) {
Dependency newDep = null;
if (dep.getVersion() == null) {
newDep = inferDependencyVersion(model, dep);
if (newDep != null) {
changed = true;

List<Dependency> newDeps = null;
if (!model.getDependencies().isEmpty()) {
newDeps = new ArrayList<>(model.getDependencies().size());
for (Dependency dep : model.getDependencies()) {
Dependency newDep = null;
if (dep.getVersion() == null) {
newDep = inferDependencyVersion(model, dep);
if (newDep != null) {
changed = true;
}
} else if (dep.getGroupId() == null) {
// Handle missing groupId when version is present
newDep = inferDependencyGroupId(model, dep);
if (newDep != null) {
changed = true;
}
}
} else if (dep.getGroupId() == null) {
// Handle missing groupId when version is present
newDep = inferDependencyGroupId(model, dep);
if (newDep != null) {
changed = true;
newDeps.add(newDep == null ? dep : newDep);
}
}

DependencyManagement newMgmt = null;
if (model.getDependencyManagement() != null
&& !model.getDependencyManagement().getDependencies().isEmpty()) {
List<Dependency> newMgmtDeps = new ArrayList<>(
model.getDependencyManagement().getDependencies().size());
boolean mgmtChanged = false;
for (Dependency dep : model.getDependencyManagement().getDependencies()) {
Dependency newDep = null;
if (dep.getVersion() == null) {
newDep = inferDependencyVersion(model, dep);
if (newDep != null) {
mgmtChanged = true;
}
} else if (dep.getGroupId() == null) {
// Handle missing groupId when version is present
newDep = inferDependencyGroupId(model, dep);
if (newDep != null) {
mgmtChanged = true;
}
}
newMgmtDeps.add(newDep == null ? dep : newDep);
}
if (mgmtChanged) {
newMgmt = model.getDependencyManagement().withDependencies(newMgmtDeps);
changed = true;
}
}

if (changed) {
Model.Builder builder = Model.newBuilder(model);
if (newDeps != null) {
builder.dependencies(newDeps);
}
newDeps.add(newDep == null ? dep : newDep);
if (newMgmt != null) {
builder.dependencyManagement(newMgmt);
}
return builder.build();
}
return changed ? model.withDependencies(newDeps) : model;
return model;
}

private Dependency inferDependencyVersion(Model model, Dependency dep) {
Expand Down