[sling-slingfeature-maven-plugin] branch master updated: SLING-9913 : ArtifactProvider should not log stack trace if artifact is not found

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 4eadd6e  SLING-9913 : ArtifactProvider should not log stack trace if 
artifact is not found
4eadd6e is described below

commit 4eadd6e84407bd082e161e15a3b85f8b3f15c8e6
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Mon Nov 16 17:18:31 2020 +0100

    SLING-9913 : ArtifactProvider should not log stack trace if artifact is not 
found
---
 .../sling/feature/maven/mojos/AbstractFeatureMojo.java    |  2 +-
 .../org/apache/sling/feature/maven/mojos/ApisJarMojo.java | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java 
b/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java
index 79aad7c..5bb5a8e 100644
--- 
a/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java
+++ 
b/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java
@@ -343,7 +343,7 @@ public abstract class AbstractFeatureMojo extends 
AbstractMojo {
                     .getOrResolveArtifact(project, mavenSession, 
artifactHandlerManager, artifactResolver, id)
                     .getFile().toURI().toURL();
             } catch (Exception e) {
-                getLog().error(e);
+                getLog().debug("Artifact " + id.toMvnId() + " not found");
                 return null;
             }
         }
diff --git 
a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java 
b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
index f4b2ea3..6c94857 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
@@ -30,7 +30,6 @@ import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -699,9 +698,9 @@ public class ApisJarMojo extends 
AbstractIncludingFeatureMojo {
         }
     }
 
-    private File getArtifactFile(final ArtifactProvider artifactProvider, 
final ArtifactId artifactId)
+    private File getArtifactFile(final ArtifactId artifactId)
             throws MojoExecutionException {
-        final URL artifactURL = retrieve(artifactProvider, artifactId);
+        final URL artifactURL = retrieve(artifactId);
         if (artifactURL == null) {
             throw new MojoExecutionException("Unable to find artifact " + 
artifactId.toMvnId());
         }
@@ -768,7 +767,7 @@ public class ApisJarMojo extends 
AbstractIncludingFeatureMojo {
      * @throws MojoExecutionException
      */
     private void onArtifact(final ApisJarContext ctx, Artifact artifact) 
throws MojoExecutionException {
-        final File bundleFile = getArtifactFile(artifactProvider, 
artifact.getId());
+        final File bundleFile = getArtifactFile(artifact.getId());
 
         final Manifest manifest = getManifest(artifact.getId(), bundleFile);
 
@@ -1082,7 +1081,7 @@ public class ApisJarMojo extends 
AbstractIncludingFeatureMojo {
 
                 Artifact syntheticArtifact = new Artifact(
                         new ArtifactId(groupId, artifactId, version, 
classifier, null));
-                final File bundleFile = getArtifactFile(artifactProvider, 
syntheticArtifact.getId());
+                final File bundleFile = 
getArtifactFile(syntheticArtifact.getId());
 
                 processBinary(ctx, info, bundleFile, syntheticArtifact, null, 
skipBinDeflate, skipSourceDeflate);
             }
@@ -1116,7 +1115,7 @@ public class ApisJarMojo extends 
AbstractIncludingFeatureMojo {
         return null;
     }
 
-    private URL retrieve(final ArtifactProvider artifactProvider, final 
ArtifactId artifactId) {
+    private URL retrieve(final ArtifactId artifactId) {
         getLog().debug("Retrieving artifact " + artifactId + "...");
         URL sourceFile = artifactProvider.provide(artifactId);
         if (sourceFile != null) {
@@ -1209,7 +1208,7 @@ public class ApisJarMojo extends 
AbstractIncludingFeatureMojo {
             final ArtifactId sourcesArtifactId, final boolean allowFallback) 
throws MojoExecutionException {
         boolean failed = false;
         try {
-            final URL url = retrieve(artifactProvider, sourcesArtifactId);
+            final URL url = retrieve(sourcesArtifactId);
             if (url != null) {
                 File sourcesBundle = IOUtils.getFileFromURL(url, true, null);
                 deflate(info.getSourceDirectory(), sourcesBundle, 
info.getUsedExportedPackageIncludes());
@@ -1275,7 +1274,7 @@ public class ApisJarMojo extends 
AbstractIncludingFeatureMojo {
         if (model == null) {
             getLog().debug("Retrieving POM " + pomArtifactId.toMvnId() + 
"...");
             // POM file must exist, let the plugin fail otherwise
-            final URL pomURL = retrieve(artifactProvider, pomArtifactId);
+            final URL pomURL = retrieve(pomArtifactId);
             if (pomURL == null) {
                 throw new MojoExecutionException("Unable to find artifact " + 
pomArtifactId.toMvnId());
             }