[java-mvn-enforcer] branch main updated: JMVN-90 Troubleshoot Maven artifact resolution errors

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository java-mvn-enforcer.

View the commit online:
https://codeberg.org/Shibboleth/java-mvn-enforcer/commit/b9b3e6d11cb7a09fbebc6b2e2848e514afaa9a29

The following commit(s) were added to refs/heads/main by this push:
     new b9b3e6d  JMVN-90 Troubleshoot Maven artifact resolution errors
b9b3e6d is described below

commit b9b3e6d11cb7a09fbebc6b2e2848e514afaa9a29
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Oct 19 15:35:13 2026 +0100

    JMVN-90 Troubleshoot Maven artifact resolution errors
    
    https://shibboleth.atlassian.net/browse/JMVN-90
    
    Remove all the retry code
---
 .../shibboleth/mvn/enforcer/impl/JarEnforcer.java  | 42 +++++-----------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/src/main/java/net/shibboleth/mvn/enforcer/impl/JarEnforcer.java b/src/main/java/net/shibboleth/mvn/enforcer/impl/JarEnforcer.java
index 6d3361f..4192241 100644
--- a/src/main/java/net/shibboleth/mvn/enforcer/impl/JarEnforcer.java
+++ b/src/main/java/net/shibboleth/mvn/enforcer/impl/JarEnforcer.java
@@ -44,16 +44,12 @@ import org.apache.maven.enforcer.rule.api.AbstractEnforcerRule;
 import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.project.MavenProject;
-import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResolutionException;
 import org.eclipse.aether.resolution.ArtifactResult;
-import org.eclipse.aether.resolution.ResolutionErrorPolicy;
-import org.eclipse.aether.util.repository.SimpleResolutionErrorPolicy;
 import org.slf4j.Logger;
 
 import net.shibboleth.mvn.enforcer.impl.GPGKeyRing.Signature;
@@ -139,9 +135,6 @@ public class JarEnforcer extends AbstractEnforcerRule implements MavenLoader{
     /** The thing used to do resolution. */
     @Nonnull private final RepositorySystem repositorySystem;
 
-    /** The parameters to resolution. Specifically, do not cache. */
-    private RepositorySystemSession repositorySystemSession;
-
     /** Our logger.  Setup at the start of {@link #execute()}. */
     private Logger log;
 
@@ -198,17 +191,6 @@ public class JarEnforcer extends AbstractEnforcerRule implements MavenLoader{
         return Path.of(depCheckReportPath);
     }
 
-    /** Get our dedicated {@link RepositorySystemSession}.
-     * @return a {@link RepositorySystemSession}
-     */
-    private synchronized RepositorySystemSession ensureRepositorySystemSession() {
-        if (repositorySystemSession == null) {
-            repositorySystemSession = new DefaultRepositorySystemSession(session.getRepositorySession()).
-                 setResolutionErrorPolicy(new SimpleResolutionErrorPolicy(ResolutionErrorPolicy.CACHE_DISABLED));
-        }
-        return repositorySystemSession;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -517,22 +499,16 @@ public class JarEnforcer extends AbstractEnforcerRule implements MavenLoader{
 
         final Artifact artifact = new DefaultArtifact(groupId, artifactId, classifier, type, version);
         final ArtifactRequest req = new ArtifactRequest(artifact, project.getRemoteProjectRepositories(), null);
-        int retryCount = 0;
         log.debug("Resolving {}", artifact);
-        while(true) {
-	        try {
-	            final ArtifactResult res = repositorySystem.resolveArtifact(ensureRepositorySystemSession(),  req);
-	            final File file = res.getArtifact().getFile();
-	            log.debug("Resolved to {}", file.getAbsolutePath());
-	            return file;
-	        } catch (final ArtifactResolutionException e) {
-				final PrintWriter pw = new PrintWriter(new StringWriter());
-				e.printStackTrace(pw);
-				log.error("Resolution of {} failed {} {} \n {}", artifact, e.getMessage(), e.getCause(), pw);
-	            if (retryCount++ > 1) {
-                    break;
-	            }
-	        }
+        try {
+            final ArtifactResult res = repositorySystem.resolveArtifact(session.getRepositorySession(),  req);
+            final File file = res.getArtifact().getFile();
+            log.debug("Resolved to {}", file.getAbsolutePath());
+            return file;
+        } catch (final ArtifactResolutionException e) {
+			final PrintWriter pw = new PrintWriter(new StringWriter());
+			e.printStackTrace(pw);
+			log.error("Resolution of {} failed {} {} \n {}", artifact, e.getMessage(), e.getCause(), pw);
         }
         return null;
     }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.