Skip to content

Commit 29a0b08

Browse files
committed
Use the new plugin Log api
1 parent d9c3cb1 commit 29a0b08

File tree

5 files changed

+17
-19
lines changed

5 files changed

+17
-19
lines changed

pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,6 @@ under the License.
7676
<version>${mavenVersion}</version>
7777
<scope>provided</scope>
7878
</dependency>
79-
<dependency>
80-
<groupId>org.slf4j</groupId>
81-
<artifactId>slf4j-api</artifactId>
82-
<version>${slf4jVersion}</version>
83-
<scope>provided</scope>
84-
</dependency>
8579
<dependency>
8680
<groupId>org.codehaus.plexus</groupId>
8781
<artifactId>plexus-utils</artifactId>

src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121

2222
import org.apache.maven.api.RemoteRepository;
2323
import org.apache.maven.api.Version;
24+
import org.apache.maven.api.plugin.Log;
2425
import org.apache.maven.api.plugin.Mojo;
2526
import org.apache.maven.api.Session;
2627
import org.apache.maven.api.plugin.MojoException;
28+
import org.apache.maven.api.plugin.annotations.Component;
2729
import org.apache.maven.api.plugin.annotations.Parameter;
2830
import org.apache.maven.api.services.VersionParser;
29-
import org.slf4j.Logger;
30-
import org.slf4j.LoggerFactory;
3131

3232
/**
3333
* Abstract class for Deploy mojo's.
@@ -39,7 +39,8 @@ public abstract class AbstractDeployMojo
3939

4040
private static final String FIXED_MAVEN_VERSION = "3.9.0";
4141

42-
protected final Logger logger = LoggerFactory.getLogger( getClass() );
42+
@Component
43+
protected Log logger;
4344

4445
/**
4546
* Flag whether Maven is currently in online/offline mode.
@@ -109,7 +110,7 @@ protected Session getSession()
109110
return session;
110111
}
111112

112-
protected Logger getLog()
113+
protected Log getLog()
113114
{
114115
return logger;
115116
}

src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ private Path readingPomFromJarFile()
206206
.orElse( null );
207207
if ( entry != null )
208208
{
209-
logger.debug( "Using " + entry.getName() + " as pomFile" );
209+
getLog().debug( "Using " + entry.getName() + " as pomFile" );
210210

211211
try ( InputStream pomInputStream = jarFile.getInputStream( entry ) )
212212
{
@@ -226,7 +226,7 @@ private Path readingPomFromJarFile()
226226
}
227227
else
228228
{
229-
logger.info( "pom.xml not found in " + file.getFileName() );
229+
getLog().info( "pom.xml not found in " + file.getFileName() );
230230
}
231231
}
232232
}
@@ -244,7 +244,7 @@ public void execute()
244244
if ( !Files.exists( file ) )
245245
{
246246
String message = "The specified file '" + file + "' does not exist";
247-
logger.error( message );
247+
getLog().error( message );
248248
throw new MojoException( message );
249249
}
250250

@@ -312,12 +312,12 @@ public void execute()
312312
artifactManager.setPath( pomArtifact, deployedPom );
313313
if ( generatePom )
314314
{
315-
logger.debug( "Deploying generated POM" );
315+
getLog().debug( "Deploying generated POM" );
316316
deployables.add( pomArtifact );
317317
}
318318
else
319319
{
320-
logger.debug( "Skipping deploying POM" );
320+
getLog().debug( "Skipping deploying POM" );
321321
}
322322
}
323323
}

src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public void execute()
186186
|| ( "snapshots".equals( skip ) && session.isVersionSnapshot( project.getVersion() ) )
187187
)
188188
{
189-
logger.info( "Skipping artifact deployment" );
189+
getLog().info( "Skipping artifact deployment" );
190190
putState( State.SKIPPED );
191191
}
192192
else
@@ -202,7 +202,7 @@ public void execute()
202202
}
203203
else
204204
{
205-
logger.info( "Deferring deploy for " + project.getGroupId()
205+
getLog().info( "Deferring deploy for " + project.getGroupId()
206206
+ ":" + project.getArtifactId() + ":" + project.getVersion() + " at end" );
207207
putState( State.TO_BE_DEPLOYED, processProject( project
208208
) );
@@ -325,7 +325,7 @@ else if ( !isSnapshot && altReleaseDeploymentRepository != null )
325325

326326
if ( altDeploymentRepo != null )
327327
{
328-
logger.info( "Using alternate deployment repository " + altDeploymentRepo );
328+
getLog().info( "Using alternate deployment repository " + altDeploymentRepo );
329329

330330
Matcher matcher = ALT_LEGACY_REPO_SYNTAX_PATTERN.matcher( altDeploymentRepo );
331331

@@ -337,7 +337,7 @@ else if ( !isSnapshot && altReleaseDeploymentRepository != null )
337337

338338
if ( "default".equals( layout ) )
339339
{
340-
logger.warn( "Using legacy syntax for alternative repository. "
340+
getLog().warn( "Using legacy syntax for alternative repository. "
341341
+ "Use \"" + id + "::" + url + "\" instead." );
342342
repo = createDeploymentArtifactRepository( id, url );
343343
}

src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java

+3
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@
4545
import org.apache.maven.api.plugin.testing.stubs.ArtifactStub;
4646
import org.apache.maven.api.plugin.testing.stubs.ProjectStub;
4747
import org.apache.maven.api.plugin.testing.stubs.SessionStub;
48+
import org.apache.maven.internal.impl.DefaultLog;
4849
import org.junit.jupiter.api.Test;
4950
import org.junit.jupiter.api.extension.ExtendWith;
5051
import org.mockito.ArgumentCaptor;
5152
import org.mockito.junit.jupiter.MockitoExtension;
53+
import org.slf4j.LoggerFactory;
5254

5355
import static org.apache.maven.api.plugin.testing.MojoExtension.getVariableValueFromObject;
5456
import static org.apache.maven.api.plugin.testing.MojoExtension.setVariableValueToObject;
@@ -298,6 +300,7 @@ class TestDeployMojo extends DeployMojo
298300
{
299301
super();
300302
this.session = DeployMojoTest.this.session;
303+
this.logger = new DefaultLog( LoggerFactory.getLogger( "anonymous" ) );
301304
}
302305
}
303306

0 commit comments

Comments
 (0)