Merge branch 'develop' into stable

This commit is contained in:
2025-11-05 14:12:47 -05:00
3 changed files with 17 additions and 12 deletions
+12 -6
View File
@@ -43,18 +43,24 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.version>3.9.9</maven.version>
<maven.version>3.9.11</maven.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.17.0</version>
<version>3.19.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.20.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>file-management</artifactId>
<!-- v3.2+ appears to require maven v4+ -->
<version>3.1.0</version>
</dependency>
<dependency>
@@ -90,7 +96,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.12.0</version>
<version>5.14.0</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -104,16 +110,16 @@
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.9.0</version>
<version>3.9.1</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.11.2</version>
<version>3.12.0</version>
</plugin>
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
<version>0.9.0.M2</version>
<version>0.9.0.M4</version>
</plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
@@ -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);
@@ -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