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.

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

Jump to bottom

[MNG-8106] Fix metadata merge #1481

Merged
merged 2 commits into from
Apr 25, 2024
Merged

[MNG-8106] Fix metadata merge #1481

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
934ac21
[MNG-8106] Fix metadata merge
cstamas Apr 24, 2024
a652a42
Proper merge
cstamas Apr 24, 2024
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
5 changes: 5 additions & 0 deletions ...api-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ protected void merge(Metadata recessive) {

metadata = metadata.withVersioning(metadata.getVersioning().withSnapshotVersions(versions.values()));

// just carry-on as-is
if (recessive.getPlugins() != null && !recessive.getPlugins().isEmpty()) {
metadata = metadata.withPlugins(new ArrayList<>(recessive.getPlugins()));
slawekjaranowski marked this conversation as resolved.
Show resolved Hide resolved
}

artifacts.clear();
}

Expand Down
6 changes: 5 additions & 1 deletion maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,16 @@ private static Metadata createRepositoryMetadata(PluginInfo pluginInfo) {
protected void merge(Metadata recessive) {
List<Plugin> recessivePlugins = recessive.getPlugins();
List<Plugin> plugins = metadata.getPlugins();
if (!plugins.isEmpty()) {
if (!recessivePlugins.isEmpty() || !plugins.isEmpty()) {
LinkedHashMap<String, Plugin> mergedPlugins = new LinkedHashMap<>();
recessivePlugins.forEach(p -> mergedPlugins.put(p.getPrefix(), p));
plugins.forEach(p -> mergedPlugins.put(p.getPrefix(), p));
metadata = metadata.withPlugins(mergedPlugins.values());
}
// just carry-on as-is
if (recessive.getVersioning() != null) {
metadata = metadata.withVersioning(recessive.getVersioning());
}
}

@Deprecated
Expand Down
6 changes: 6 additions & 0 deletions ...pi-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.nio.file.Path;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.LinkedHashMap;
Expand Down Expand Up @@ -130,6 +131,11 @@ protected void merge(Metadata recessive) {
}

metadata = metadata.withVersioning(metadata.getVersioning().withSnapshotVersions(versions.values()));

// just carry-on as-is
if (recessive.getPlugins() != null && !recessive.getPlugins().isEmpty()) {
metadata = metadata.withPlugins(new ArrayList<>(recessive.getPlugins()));
}
}

private static int getBuildNumber(Metadata metadata) {
Expand Down
5 changes: 5 additions & 0 deletions maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ protected void merge(Metadata recessive) {
}

metadata = metadata.withVersioning(versioning.build());

// just carry-on as-is
if (recessive.getPlugins() != null && !recessive.getPlugins().isEmpty()) {
metadata = metadata.withPlugins(new ArrayList<>(recessive.getPlugins()));
}
}

public Object getKey() {
Expand Down
5 changes: 5 additions & 0 deletions ...er-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ protected void merge(Metadata recessive) {

metadata.getVersioning().setSnapshotVersions(new ArrayList<>(versions.values()));

// just carry-on as-is
if (!recessive.getPlugins().isEmpty()) {
metadata.setPlugins(new ArrayList<>(recessive.getPlugins()));
}

artifacts.clear();
}

Expand Down
7 changes: 6 additions & 1 deletion ...resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,17 @@ private static Metadata createRepositoryMetadata(PluginInfo pluginInfo) {
protected void merge(Metadata recessive) {
List<Plugin> recessivePlugins = recessive.getPlugins();
List<Plugin> plugins = metadata.getPlugins();
if (!plugins.isEmpty()) {
if (!recessivePlugins.isEmpty() || !plugins.isEmpty()) {
LinkedHashMap<String, Plugin> mergedPlugins = new LinkedHashMap<>();
recessivePlugins.forEach(p -> mergedPlugins.put(p.getPrefix(), p));
plugins.forEach(p -> mergedPlugins.put(p.getPrefix(), p));
metadata.setPlugins(new ArrayList<>(mergedPlugins.values()));
}

// just carry-on as-is
if (recessive.getVersioning() != null) {
metadata.setVersioning(recessive.getVersioning());
}
}

@Deprecated
Expand Down
5 changes: 5 additions & 0 deletions ...r-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,11 @@ protected void merge(Metadata recessive) {
}

metadata.getVersioning().setSnapshotVersions(new ArrayList<>(versions.values()));

// just carry-on as-is
if (!recessive.getPlugins().isEmpty()) {
metadata.setPlugins(new ArrayList<>(recessive.getPlugins()));
}
}

private static int getBuildNumber(Metadata metadata) {
Expand Down
5 changes: 5 additions & 0 deletions ...esolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ protected void merge(Metadata recessive) {
versions.addAll(versioning.getVersions());
versioning.setVersions(new ArrayList<>(versions));
}

// just carry-on as-is
if (!recessive.getPlugins().isEmpty()) {
metadata.setPlugins(new ArrayList<>(recessive.getPlugins()));
}
}

public Object getKey() {
Expand Down