Skip to content
Merged
Changes from all commits
Commits
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 impl/maven-core/src/main/java/org/apache/maven/ReactorReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,12 @@ public File findArtifact(Artifact artifact) {
// No project, but most certainly a dependency which has been built previously
File packagedArtifactFile = findInProjectLocalRepository(artifact);
if (packagedArtifactFile != null && packagedArtifactFile.exists()) {
// Check if artifact is up-to-date
project = getProject(artifact, getAllProjects());
if (project != null) {
isPackagedArtifactUpToDate(project, packagedArtifactFile);
// Check if artifact is up-to-date (only for non-POM artifacts)
if (!"pom".equals(artifact.getExtension())) {
project = getProject(artifact, getAllProjects());
if (project != null) {
isPackagedArtifactUpToDate(project, packagedArtifactFile);
}
}
return packagedArtifactFile;
}
Expand Down Expand Up @@ -176,7 +178,9 @@ private File findArtifact(MavenProject project, Artifact artifact, boolean check
File packagedArtifactFile = findInProjectLocalRepository(artifact);
if (packagedArtifactFile != null
&& packagedArtifactFile.exists()
&& (!checkUptodate || isPackagedArtifactUpToDate(project, packagedArtifactFile))) {
&& (!checkUptodate
|| "pom".equals(artifact.getExtension())
|| isPackagedArtifactUpToDate(project, packagedArtifactFile))) {
return packagedArtifactFile;
}

Expand Down Expand Up @@ -252,7 +256,14 @@ private boolean isPackagedArtifactUpToDate(MavenProject project, File packagedAr
+ "please run a full `mvn package` build",
relativizeOutputFile(outputFile),
project.getArtifactId());
return true;
return false;
} else if (LOGGER.isDebugEnabled()) {
LOGGER.debug(
"File '{}' timestamp {} vs artifact timestamp {} for '{}'",
relativizeOutputFile(outputFile),
outputFileLastModified,
artifactLastModified,
project.getArtifactId());
}
}

Expand Down