[java-mvn-enforcer] 01/03: Use slf4j logging in enforcer

[Rod Widdowson]

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

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

View the commit online:
http://git.shibboleth.net/view/?p=java-mvn-enforcer.git;a=commit;h=81b46c9795910f55e03bc4f182a7978e983260e0

commit 81b46c9795910f55e03bc4f182a7978e983260e0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Nov 11 20:01:14 2021 +0000

    Use slf4j logging in enforcer
---
 .../shibboleth/mvn/enforcer/impl/JarEnforcer.java    | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 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 ba767aa..0e2ab75 100644
--- a/src/main/java/net/shibboleth/mvn/enforcer/impl/JarEnforcer.java
+++ b/src/main/java/net/shibboleth/mvn/enforcer/impl/JarEnforcer.java
@@ -36,8 +36,8 @@ import org.apache.maven.enforcer.rule.api.EnforcerRule;
 import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
 import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
 import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
+import org.slf4j.Logger;
 
 import net.shibboleth.mvn.enforcer.impl.ParsedPom.PomArtifact;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -94,18 +94,18 @@ public class JarEnforcer implements EnforcerRule, MavenLoader{
     private MavenProject project;
 
     /** Our Maven log. */
-    private Log log;
+    private Logger log;
 
     @Override
     public void execute(final EnforcerRuleHelper helper) throws EnforcerRuleException {
-        log = helper.getLog();
-        EnforcerLogger.setMavenLogger(log);
+        EnforcerLogger.setMavenLogger(helper.getLog());
+        log = EnforcerLogger.getLogger(JarEnforcer.class);
 
         final List<Path> jarPaths = new ArrayList<>();
         for (final String name: StringSupport.stringToList(jarDirs, XMLConstants.LIST_DELIMITERS)) {
             final Path result = Path.of(name);
             if (Files.notExists(result) || !Files.isDirectory(result)) {
-                log.warn("Directory " + name + " does not exist or is not a directory");
+                log.warn("Directory {{} does not exist or is not a directory", name);
             } else {
                 jarPaths.add(result);
             }
@@ -179,7 +179,7 @@ public class JarEnforcer implements EnforcerRule, MavenLoader{
                   PomArtifact("org.opensaml", "opensaml-parent", "4.1.0");
             final Path resolvedPom = downloadArtifact(artifact, "pom");
             // Resolved pm path is <pathTpM2Repo>/group1/group2/..../artifact/version/pomfilename
-            log.debug("Resolved Pom = " + resolvedPom.toString());
+            log.debug("Resolved Pom = {}", resolvedPom);
             Path root = resolvedPom.getParent().getParent().getParent(); // strip version, artifact
             int index = artifact.getGroupId().indexOf('.');
             while (index > 0) {
@@ -187,7 +187,7 @@ public class JarEnforcer implements EnforcerRule, MavenLoader{
                 index = artifact.getGroupId().indexOf('.', index+1);
             }
             root = root.getParent();
-            log.info("Inferred M2 Root at " + root.toString());
+            log.info("Inferred M2 Root at ", root);
             final File out2 = target.resolve("m2SignatureReport.txt").toFile();
             try (final PrintWriter report =
                     new PrintWriter(new BufferedOutputStream(new FileOutputStream(out2)))) {
@@ -272,7 +272,7 @@ public class JarEnforcer implements EnforcerRule, MavenLoader{
                 artifact.getArtifactId(), artifact.getVersion(), "", type);
 
         if (mavenArtifact == null) {
-            log.error("Could not create " + artifact.toString() + ":" + type);
+            log.error("Could not create {} : {} ", artifact, type);
         } else {
             final ArtifactResolutionRequest request = new ArtifactResolutionRequest()
                 .setArtifact( mavenArtifact )
@@ -281,10 +281,10 @@ public class JarEnforcer implements EnforcerRule, MavenLoader{
                 .setRemoteRepositories( project.getRemoteArtifactRepositories());
             final ArtifactResolutionResult result = artifactResolver.resolve(request);
             if (result.isSuccess()) {
-                log.debug("Resolved OK :" + artifact.toString() + ":" + type);
+                log.debug("Resolved OK : {} : ", artifact, type);
                 return mavenArtifact.getFile().toPath();
             }
-            log.info("Could not resolve " + artifact.toString() + ":" + type);
+            log.info("Could not resolve {} : {} ", artifact, type);
         }
         return null;
     }

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