Skip to content
Permalink
Browse files

Merge pull request #225 from pauxus/master

[JENKINS-8383] Record fingerprints for parent POMs, too
Originally-Committed-As: 9015b0bd0a40602eac35c55abc7c3829848752ce
  • Loading branch information
kutzi committed Sep 6, 2011
2 parents 31a05d1 + cf49b58 commit ee60a842bc0e0bf92feaa596b9da43181697a226
Showing with 24 additions and 2 deletions.
  1. +24 −2 src/main/java/hudson/maven/reporters/MavenFingerprinter.java
@@ -81,10 +81,11 @@ public boolean preBuild(MavenBuildProxy build, MavenProject pom, BuildListener l
* Mojos perform different dependency resolution, so we need to check this for each mojo.
*/
public boolean postExecute(MavenBuildProxy build, MavenProject pom, MojoInfo mojo, BuildListener listener, Throwable error) throws InterruptedException, IOException {
record(pom.getArtifacts(),used);
recordParents(pom);
record(pom.getArtifacts(),used);
record(pom.getArtifact(),produced);
record(pom.getAttachedArtifacts(),produced);
record(pom.getGroupId(),pom.getFile(),produced);
record(pom.getGroupId() + ":" + pom.getArtifactId(),pom.getFile(),produced);

return true;
}
@@ -119,6 +120,27 @@ public Void call(MavenBuild build) throws IOException, InterruptedException {
return true;
}

private void recordParents(MavenProject pom) throws IOException, InterruptedException {
MavenProject parent = pom.getParent();
while (parent != null) {
File parentFile = parent.getFile();
if (parentFile == null) {
// Parent Artifact contains no acual file, so we resolve against
// the local repository
parentFile = parent.getProjectBuildingRequest()
.getLocalRepository().find(parent.getArtifact())
.getFile();
}
// we need to include the artifact Id for poms as well, otherwise a
// project with the same groupId would override its parent's
// fingerprint
record(parent.getGroupId() + ":" + parent.getArtifactId(),
parentFile, used);
parent = parent.getParent();
}
}


private void record(Collection<Artifact> artifacts, Map<String,String> record) throws IOException, InterruptedException {
for (Artifact a : artifacts)
record(a,record);

0 comments on commit ee60a84

Please sign in to comment.
You can’t perform that action at this time.