diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingExtensionRealmCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingExtensionRealmCache.java index 28ecb10f..815abaa1 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingExtensionRealmCache.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingExtensionRealmCache.java @@ -27,11 +27,13 @@ import org.apache.maven.project.ExtensionDescriptor; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.classworlds.realm.ClassRealm; import org.codehaus.plexus.classworlds.realm.NoSuchRealmException; +import org.eclipse.sisu.Priority; import org.mvndaemon.mvnd.cache.Cache; import org.mvndaemon.mvnd.cache.CacheFactory; @Singleton @Named +@Priority(10) public class InvalidatingExtensionRealmCache extends DefaultExtensionRealmCache { protected static class Record implements org.mvndaemon.mvnd.cache.CacheRecord { diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginArtifactsCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginArtifactsCache.java index 8e40ccfe..110e83c5 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginArtifactsCache.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginArtifactsCache.java @@ -18,16 +18,19 @@ package org.mvndaemon.mvnd.cache.invalidating; import java.nio.file.Path; import java.util.List; import java.util.stream.Stream; +import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.DefaultPluginArtifactsCache; import org.apache.maven.plugin.PluginResolutionException; +import org.eclipse.sisu.Priority; import org.mvndaemon.mvnd.cache.Cache; import org.mvndaemon.mvnd.cache.CacheFactory; @Singleton @Named +@Priority(10) public class InvalidatingPluginArtifactsCache extends DefaultPluginArtifactsCache { protected static class Record implements org.mvndaemon.mvnd.cache.CacheRecord { @@ -50,6 +53,7 @@ public class InvalidatingPluginArtifactsCache extends DefaultPluginArtifactsCach final Cache cache; + @Inject public InvalidatingPluginArtifactsCache(CacheFactory cacheFactory) { this.cache = cacheFactory.newCache(); } diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java index 2fd7e84f..8641de11 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java @@ -33,12 +33,14 @@ import org.codehaus.plexus.classworlds.realm.ClassRealm; import org.codehaus.plexus.classworlds.realm.NoSuchRealmException; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.repository.RemoteRepository; +import org.eclipse.sisu.Priority; import org.mvndaemon.mvnd.cache.Cache; import org.mvndaemon.mvnd.cache.CacheFactory; import org.mvndaemon.mvnd.cache.CacheRecord; @Singleton @Named +@Priority(10) public class InvalidatingPluginDescriptorCache extends DefaultPluginDescriptorCache { @FunctionalInterface diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java index 802bd854..f6f22f10 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java @@ -24,20 +24,17 @@ import javax.inject.Singleton; import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.DefaultPluginRealmCache; import org.apache.maven.plugin.PluginContainerException; -import org.apache.maven.plugin.PluginRealmCache; import org.apache.maven.plugin.PluginResolutionException; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.classworlds.realm.ClassRealm; import org.codehaus.plexus.classworlds.realm.NoSuchRealmException; import org.eclipse.sisu.Priority; -import org.eclipse.sisu.Typed; import org.mvndaemon.mvnd.cache.Cache; import org.mvndaemon.mvnd.cache.CacheFactory; @Singleton @Named @Priority(10) -@Typed(PluginRealmCache.class) public class InvalidatingPluginRealmCache extends DefaultPluginRealmCache { @FunctionalInterface diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingProjectArtifactsCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingProjectArtifactsCache.java index 7087f88c..945b1be3 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingProjectArtifactsCache.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingProjectArtifactsCache.java @@ -27,11 +27,13 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.lifecycle.LifecycleExecutionException; import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.DefaultProjectArtifactsCache; +import org.eclipse.sisu.Priority; import org.mvndaemon.mvnd.cache.Cache; import org.mvndaemon.mvnd.cache.CacheFactory; @Singleton @Named +@Priority(10) public class InvalidatingProjectArtifactsCache extends DefaultProjectArtifactsCache { static class Record implements org.mvndaemon.mvnd.cache.CacheRecord {