Skip to content

[MNG-8545] More repo ID stuff #2065

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

Closed
cstamas wants to merge 2 commits into from
Closed

[MNG-8545] More repo ID stuff #2065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2673ec
[MNG-8545] More repo ID stuff
cstamas Jan 28, 2025
0a5aa8b
More fixes
cstamas Jan 28, 2025
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
8 changes: 7 additions & 1 deletion impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import org.apache.maven.api.services.xml.XmlReaderException;
import org.apache.maven.api.services.xml.XmlReaderRequest;
import org.apache.maven.api.settings.Activation;
import org.apache.maven.api.settings.IdentifiableBase;
import org.apache.maven.api.settings.Profile;
import org.apache.maven.api.settings.Repository;
import org.apache.maven.api.settings.RepositoryPolicy;
Expand All @@ -68,7 +69,12 @@ public class DefaultSettingsBuilder implements SettingsBuilder {

private final DefaultSettingsValidator settingsValidator = new DefaultSettingsValidator();

private final SettingsMerger settingsMerger = new SettingsMerger();
private final SettingsMerger settingsMerger = new SettingsMerger() {
@Override
protected KeyComputer<Repository> getRepositoryKey() {
return IdentifiableBase::getId;
}
};

private final SettingsXmlFactory settingsXmlFactory;

Expand Down
7 changes: 7 additions & 0 deletions impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultProfileInjector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
import org.apache.maven.api.model.ReportPlugin;
import org.apache.maven.api.model.ReportSet;
import org.apache.maven.api.model.Reporting;
import org.apache.maven.api.model.Repository;
import org.apache.maven.api.model.RepositoryBase;
import org.apache.maven.api.services.ModelBuilderRequest;
import org.apache.maven.api.services.ModelProblemCollector;
import org.apache.maven.api.services.model.ProfileInjector;
Expand Down Expand Up @@ -238,5 +240,10 @@ protected void mergeReportPlugin_ReportSets(
builder.reportSets(merged.values());
}
}

@Override
protected KeyComputer<Repository> getRepositoryKey() {
return RepositoryBase::getId;
}
}
}
Loading