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

Update Maven to 4.0.0-alpha-3 and Maven Resolver to 1.9.2 #742

Merged
merged 13 commits into from
Dec 15, 2022
Merged

Update Maven to 4.0.0-alpha-3 and Maven Resolver to 1.9.2 #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7d25f0a
[MNG-7586] Update Maven Resolver to 1.9.2
cstamas Nov 23, 2022
591ab4f
Remove CliMavenPluginManager which has the changed needed in alpha-3
gnodet Nov 23, 2022
7bb7172
Align slf4j api with maven
gnodet Nov 23, 2022
f77e697
Make sure the invoker being called from IT reuses the settings from t…
gnodet Nov 23, 2022
e49707a
Revert "Remove CliMavenPluginManager which has the changed needed in …
gnodet Nov 24, 2022
0d24ad7
Upgrade to released version
gnodet Nov 29, 2022
8622ffb
Fix IT when mrm is disabled
gnodet Dec 1, 2022
dc4b5c7
Remove CliMavenPluginManager which has the changed needed in alpha-3
gnodet Nov 23, 2022
738df34
Merge branch 'master' into MNG-7586-resolver-192
gnodet Dec 9, 2022
1a16168
Fix IT
gnodet Dec 9, 2022
a1854f5
Fix InvalidingPluginRealmCache
gnodet Dec 12, 2022
658cf81
Switch to released 4.0.0-alpha-3 (currently under vote)
gnodet Dec 12, 2022
55deaf6
Remove staging repo
gnodet Dec 15, 2022
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
3 changes: 0 additions & 3 deletions daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.model.building.ModelProcessor;
import org.apache.maven.plugin.ExtensionRealmCache;
import org.apache.maven.plugin.MavenPluginManager;
import org.apache.maven.plugin.PluginArtifactsCache;
import org.apache.maven.plugin.PluginRealmCache;
import org.apache.maven.plugin.version.PluginVersionResolver;
Expand Down Expand Up @@ -105,7 +104,6 @@
import org.mvndaemon.mvnd.logging.smart.LoggingExecutionListener;
import org.mvndaemon.mvnd.logging.smart.LoggingOutputStream;
import org.mvndaemon.mvnd.plugin.CachingPluginVersionResolver;
import org.mvndaemon.mvnd.plugin.CliMavenPluginManager;
import org.mvndaemon.mvnd.transfer.DaemonMavenTransferListener;
import org.slf4j.ILoggerFactory;
import org.slf4j.Logger;
Expand Down Expand Up @@ -527,7 +525,6 @@ protected void configure() {
bind(PluginArtifactsCache.class).to(InvalidatingPluginArtifactsCache.class);
bind(PluginRealmCache.class).to(InvalidatingPluginRealmCache.class);
bind(ProjectArtifactsCache.class).to(InvalidatingProjectArtifactsCache.class);
bind(MavenPluginManager.class).to(CliMavenPluginManager.class);
bind(PluginVersionResolver.class).to(CachingPluginVersionResolver.class);
}
});
Expand Down
6 changes: 1 addition & 5 deletions daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@
@Priority(10)
public class InvalidatingPluginRealmCache extends DefaultPluginRealmCache {

@FunctionalInterface
public interface PluginRealmSupplier {
CacheRecord load() throws PluginResolutionException, PluginContainerException;
}

protected static class Record implements org.mvndaemon.mvnd.cache.CacheRecord {

final CacheRecord record;
Expand Down Expand Up @@ -83,6 +78,7 @@ public CacheRecord get(Key key) {
return r != null ? r.record : null;
}

@Override
public CacheRecord get(Key key, PluginRealmSupplier supplier)
throws PluginResolutionException, PluginContainerException {
try {
Expand Down
Loading