minor tweaks

This commit is contained in:
2025-10-06 17:22:06 -04:00
parent 4495bdec38
commit 9ef50c933d
2 changed files with 5 additions and 6 deletions
@@ -156,11 +156,10 @@ public abstract class AbstractBanConfiguration implements BanConfiguration {
this.logger.debug("The latest artifact was found: {}", latestArtifact); this.logger.debug("The latest artifact was found: {}", latestArtifact);
File file = latestArtifact.getFile(); File file = latestArtifact.getFile();
return new BanConfigurationDownloader(this.session, this.artifactResolver, this.versionRangeResolver, file); return new BanConfigurationDownloader(this.session, this.artifactResolver, this.versionRangeResolver, file);
} else if (artifact != null) { } else {
this.logger.debug("Using the raw artifact: {}", artifact);
File file = artifact.getFile(); File file = artifact.getFile();
return new BanConfigurationDownloader(this.session, this.artifactResolver, this.versionRangeResolver, file); return new BanConfigurationDownloader(this.session, this.artifactResolver, this.versionRangeResolver, file);
} else {
return null;
} }
} }
@@ -189,7 +188,7 @@ public abstract class AbstractBanConfiguration implements BanConfiguration {
try { try {
VersionRangeResult vrresult = this.versionRangeResolver.resolveVersionRange(this.session.getRepositorySession(), vrrequest); VersionRangeResult vrresult = this.versionRangeResolver.resolveVersionRange(this.session.getRepositorySession(), vrrequest);
if (vrresult.getVersions().isEmpty()) { if (vrresult.getVersions().isEmpty()) {
this.logger.info("The artifact version range could not be resolved: {}", logId); this.logger.debug("The artifact version range could not be resolved: {}", logId);
return null; return null;
} else { } else {
this.logger.debug("The artifact version discovered: {}: {}", vrresult.getHighestVersion(), logId); this.logger.debug("The artifact version discovered: {}: {}", vrresult.getHighestVersion(), logId);
@@ -33,6 +33,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton;
import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
@@ -46,7 +47,6 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.annotations.Component;
import org.eclipse.aether.impl.ArtifactResolver; import org.eclipse.aether.impl.ArtifactResolver;
import org.eclipse.aether.impl.VersionRangeResolver; import org.eclipse.aether.impl.VersionRangeResolver;
@@ -58,7 +58,7 @@ import com.inteligr8.maven.model.ArtifactFilter;
defaultPhase = LifecyclePhase.CLEAN, defaultPhase = LifecyclePhase.CLEAN,
requiresProject = false requiresProject = false
) )
@Component( role = org.apache.maven.plugin.Mojo.class ) @Singleton
public class PurgeRepoMojo extends AbstractMojo { public class PurgeRepoMojo extends AbstractMojo {
@Inject @Inject