diff --git a/pom.xml b/pom.xml index a4ad00c..44fc61c 100644 --- a/pom.xml +++ b/pom.xml @@ -43,18 +43,24 @@ UTF-8 1.8 1.8 - 3.9.9 + 3.9.11 org.apache.commons commons-lang3 - 3.17.0 + 3.19.0 + + + commons-io + commons-io + 2.20.0 org.apache.maven.shared file-management + 3.1.0 @@ -90,7 +96,7 @@ org.junit.jupiter junit-jupiter-api - 5.12.0 + 5.14.0 test @@ -104,16 +110,16 @@ maven-invoker-plugin - 3.9.0 + 3.9.1 maven-javadoc-plugin - 3.11.2 + 3.12.0 org.eclipse.sisu sisu-maven-plugin - 0.9.0.M2 + 0.9.0.M4 org.codehaus.plexus diff --git a/src/main/java/com/inteligr8/maven/ban/AbstractBanConfiguration.java b/src/main/java/com/inteligr8/maven/ban/AbstractBanConfiguration.java index 77efb1e..6ff3a05 100644 --- a/src/main/java/com/inteligr8/maven/ban/AbstractBanConfiguration.java +++ b/src/main/java/com/inteligr8/maven/ban/AbstractBanConfiguration.java @@ -156,11 +156,10 @@ public abstract class AbstractBanConfiguration implements BanConfiguration { this.logger.debug("The latest artifact was found: {}", latestArtifact); File file = latestArtifact.getFile(); 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(); return new BanConfigurationDownloader(this.session, this.artifactResolver, this.versionRangeResolver, file); - } else { - return null; } } @@ -189,7 +188,7 @@ public abstract class AbstractBanConfiguration implements BanConfiguration { try { VersionRangeResult vrresult = this.versionRangeResolver.resolveVersionRange(this.session.getRepositorySession(), vrrequest); 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; } else { this.logger.debug("The artifact version discovered: {}: {}", vrresult.getHighestVersion(), logId); diff --git a/src/main/java/com/inteligr8/maven/ban/PurgeRepoMojo.java b/src/main/java/com/inteligr8/maven/ban/PurgeRepoMojo.java index 6860ce5..311ff60 100644 --- a/src/main/java/com/inteligr8/maven/ban/PurgeRepoMojo.java +++ b/src/main/java/com/inteligr8/maven/ban/PurgeRepoMojo.java @@ -33,6 +33,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; +import javax.inject.Singleton; import org.apache.maven.artifact.versioning.ArtifactVersion; 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.Parameter; import org.apache.maven.project.MavenProject; -import org.codehaus.plexus.component.annotations.Component; import org.eclipse.aether.impl.ArtifactResolver; import org.eclipse.aether.impl.VersionRangeResolver; @@ -58,7 +58,7 @@ import com.inteligr8.maven.model.ArtifactFilter; defaultPhase = LifecyclePhase.CLEAN, requiresProject = false ) -@Component( role = org.apache.maven.plugin.Mojo.class ) +@Singleton public class PurgeRepoMojo extends AbstractMojo { @Inject