From 28c7c410100baba740fed5cc16251da79ffe7882 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Mon, 25 Dec 2023 20:40:16 +0100 Subject: [PATCH] [MSHARED-1345] Bump org.apache.maven.shared:maven-shared-utils from 3.2.1 to 3.4.2 --- pom.xml | 2 +- .../apache/maven/shared/jarsigner/DefaultJarSigner.java | 3 ++- .../shared/jarsigner/JarSignerCommandLineBuilder.java | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 292c478..5668b06 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ org.apache.maven.shared maven-shared-utils - 3.2.1 + 3.4.2 diff --git a/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java b/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java index b21e487..991e03c 100644 --- a/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java +++ b/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java @@ -23,6 +23,7 @@ import org.apache.maven.shared.utils.cli.javatool.AbstractJavaTool; import org.apache.maven.shared.utils.cli.javatool.JavaToolException; import org.codehaus.plexus.component.annotations.Component; +import org.slf4j.LoggerFactory; /** * Default implementation of component {@link JarSigner}. @@ -40,7 +41,7 @@ public DefaultJarSigner() { @Override protected Commandline createCommandLine(JarSignerRequest request, String javaToolFile) throws JavaToolException { JarSignerCommandLineBuilder cliBuilder = new JarSignerCommandLineBuilder(); - cliBuilder.setLogger(getLogger()); + cliBuilder.setLogger(LoggerFactory.getLogger(this.getClass())); cliBuilder.setJarSignerFile(javaToolFile); try { Commandline cli = cliBuilder.build(request); diff --git a/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java b/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java index 1a31972..85b16ad 100644 --- a/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java +++ b/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java @@ -24,8 +24,8 @@ import org.apache.maven.shared.utils.StringUtils; import org.apache.maven.shared.utils.cli.Arg; import org.apache.maven.shared.utils.cli.Commandline; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.logging.console.ConsoleLogger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * To build the command line for a given {@link JarSignerRequest}. @@ -34,9 +34,8 @@ * @since 1.0 */ public class JarSignerCommandLineBuilder { - private static final Logger DEFAULT_LOGGER = new ConsoleLogger(0, JarSignerCommandLineBuilder.class.getName()); - private Logger logger = DEFAULT_LOGGER; + private Logger logger = LoggerFactory.getLogger(JarSignerCommandLineBuilder.class); private String jarSignerFile;