Skip to content

[MNG-4660] Increase usefulness of logging #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mthmulders wants to merge 2 commits into from
Closed

[MNG-4660] Increase usefulness of logging #414

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9914ea0
[MNG-4660] Increase usefulness of logging
mthmulders Dec 23, 2020
0238f94
Nit: operator '+' should be on a new line
mthmulders Dec 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions maven-core/src/main/java/org/apache/maven/ReactorReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.internal.MavenWorkspaceReader;
import org.codehaus.plexus.logging.Logger;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.repository.WorkspaceRepository;
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
Expand All @@ -64,7 +65,7 @@ class ReactorReader
private static final Collection<String> COMPILE_PHASE_TYPES =
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;

Expand All @@ -75,9 +76,8 @@ class ReactorReader
private WorkspaceRepository repository;

@Inject
ReactorReader( MavenSession session, Logger logger )
ReactorReader( MavenSession session )
{
this.logger = logger;
this.session = session;
this.projectsByGAV = new HashMap<>( session.getAllProjects().size() * 2 );
session.getAllProjects().forEach( project ->
Expand Down Expand Up @@ -266,7 +266,12 @@ private boolean isPackagedArtifactUpToDate( MavenProject project, File packagedA
long outputFileLastModified = Files.getLastModifiedTime( outputFile ).toMillis();
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; "
Comment thread
mthmulders marked this conversation as resolved.
+ "file {} is more recent than {}.",
project.getArtifactId(),
relativizeOutputFile( outputFile ), relativizeOutputFile( packagedArtifactFile.toPath() )
);
return false;
}
}
Expand All @@ -275,7 +280,7 @@ private boolean isPackagedArtifactUpToDate( MavenProject project, File packagedA
}
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. "
+ "Continuing with the assumption that it is up-to-date.", e );
return true;
Expand All @@ -288,6 +293,12 @@ private boolean hasBeenPackagedDuringThisSession( MavenProject project )
|| 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.
*
Expand Down