Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-4660] Increase usefulness of logging

This commit is contained in:
Maarten Mulders 2020-12-23 15:56:15 +01:00
parent 9f88494b60
commit 7e21a521c7
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
maven-core/src/main/java/org/apache/maven/ReactorReader.java
View File

@ -43,10 +43,11 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model; import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.internal.MavenWorkspaceReader; import org.apache.maven.repository.internal.MavenWorkspaceReader;
import org.codehaus.plexus.logging.Logger;
import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.repository.WorkspaceRepository; import org.eclipse.aether.repository.WorkspaceRepository;
import org.eclipse.aether.util.artifact.ArtifactIdUtils; import org.eclipse.aether.util.artifact.ArtifactIdUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* An implementation of a workspace reader that knows how to search the Maven reactor for artifacts, either as packaged * An implementation of a workspace reader that knows how to search the Maven reactor for artifacts, either as packaged
@ -64,7 +65,7 @@ class ReactorReader
private static final Collection<String> COMPILE_PHASE_TYPES = private static final Collection<String> COMPILE_PHASE_TYPES =
Arrays.asList( "jar", "ejb-client", "war", "rar", "ejb3", "par", "sar", "wsr", "har", "app-client" ); Arrays.asList( "jar", "ejb-client", "war", "rar", "ejb3", "par", "sar", "wsr", "har", "app-client" );
private Logger logger; private static final Logger LOGGER = LoggerFactory.getLogger( ReactorReader.class );
private MavenSession session; private MavenSession session;
@ -75,9 +76,8 @@ class ReactorReader
private WorkspaceRepository repository; private WorkspaceRepository repository;
@Inject @Inject
ReactorReader( MavenSession session, Logger logger ) ReactorReader( MavenSession session )
{ {
this.logger = logger;
this.session = session; this.session = session;
this.projectsByGAV = new HashMap<>( session.getAllProjects().size() * 2 ); this.projectsByGAV = new HashMap<>( session.getAllProjects().size() * 2 );
session.getAllProjects().forEach( project -> session.getAllProjects().forEach( project ->
@ -266,7 +266,12 @@ class ReactorReader
long outputFileLastModified = Files.getLastModifiedTime( outputFile ).toMillis(); long outputFileLastModified = Files.getLastModifiedTime( outputFile ).toMillis();
if ( outputFileLastModified > artifactLastModified ) if ( outputFileLastModified > artifactLastModified )
{ {
logger.warn( "Packaged artifact is not up-to-date compared to the build output directory" ); LOGGER.warn(
"Packaged artifact for {} is not up-to-date compared to the build output directory; "
+ "file {} is more recent than {}.",
project.getArtifactId(),
relativizeOutputFile( outputFile ), relativizeOutputFile( packagedArtifactFile.toPath() )
);
return false; return false;
} }
} }
@ -275,7 +280,7 @@ class ReactorReader
} }
catch ( IOException e ) catch ( IOException e )
{ {
logger.warn( "An I/O error occurred while checking if the packaged artifact is up-to-date " LOGGER.warn( "An I/O error occurred while checking if the packaged artifact is up-to-date "
+ "against the build output directory. " + "against the build output directory. "
+ "Continuing with the assumption that it is up-to-date.", e ); + "Continuing with the assumption that it is up-to-date.", e );
return true; return true;
@ -288,6 +293,12 @@ class ReactorReader
|| project.hasLifecyclePhase( "deploy" ); || project.hasLifecyclePhase( "deploy" );
} }
private Path relativizeOutputFile( final Path outputFile )
{
Path projectBaseDirectory = Paths.get( session.getRequest().getMultiModuleProjectDirectory().toURI() );
return projectBaseDirectory.relativize( outputFile );
}
/** /**
* Tries to resolve the specified artifact from the artifacts of the given project. * Tries to resolve the specified artifact from the artifacts of the given project.
* *