Skip to content
Permalink
Browse files

Revert JENKINS-8383 as it didn't work with Maven 2(cherry picked from…

… commit db23d8c)

Conflicts:

	changelog.html
  • Loading branch information
kohsuke committed Sep 8, 2011
1 parent 05bb6a3 commit ab1eed1488923415754719a87e887c66cfff343e
Showing with 6 additions and 33 deletions.
  1. +2 −2 changelog.html
  2. +4 −31 maven-plugin/src/main/java/hudson/maven/reporters/MavenFingerprinter.java
@@ -76,8 +76,8 @@ <h3><a name=v1.430>What's new in 1.430</a> <!--=DATE=--></h3>
<li class=rfe>
Introduce a fine-grained permission to control who is allowed to run the Groovy Console.
<li class=rfe>
Maven jobs should include fingerprints of their parent POMs
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-8383">issue 8383</a>)
Add support for maven-android-plugin integration test reports
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-10913">issue 10913</a>)
</ul>
</div><!--=END=-->
<h3><a name=v1.429>What's new in 1.429</a> (2011/09/06)</h3>
@@ -81,12 +81,10 @@ 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 {
// TODO (kutzi, 2011/09/06): it should be perfectly save to move all these records to the
// postBuild method as artifacts should only be added by mojos, but never removed/modified.
record(pom.getArtifacts(),used);
record(pom.getArtifacts(),used);
record(pom.getArtifact(),produced);
record(pom.getAttachedArtifacts(),produced);
record(pom.getGroupId() + ":" + pom.getArtifactId(),pom.getFile(),produced);
record(pom.getGroupId(),pom.getFile(),produced);

return true;
}
@@ -95,11 +93,7 @@ public boolean postExecute(MavenBuildProxy build, MavenProject pom, MojoInfo moj
* Sends the collected fingerprints over to the master and record them.
*/
public boolean postBuild(MavenBuildProxy build, MavenProject pom, BuildListener listener) throws InterruptedException, IOException {

recordParents(pom);

build.executeAsync(new BuildCallable<Void,IOException>() {
private static final long serialVersionUID = -1360161848504044869L;
// record is transient, so needs to make a copy first
private final Map<String,String> u = used;
private final Map<String,String> p = produced;
@@ -125,27 +119,6 @@ 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 actual 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);
@@ -166,14 +139,14 @@ private void record(Artifact a, Map<String,String> record) throws IOException, I
* This method contains the logic to avoid doubly recording the fingerprint
* of the same file.
*/
private void record(String fileNamePrefix, File f, Map<String, String> record) throws IOException, InterruptedException {
private void record(String groupId, File f, Map<String, String> record) throws IOException, InterruptedException {
if(f==null || files.contains(f) || !f.isFile())
return;

// new file
files.add(f);
String digest = new FilePath(f).digest();
record.put(fileNamePrefix+':'+f.getName(),digest);
record.put(groupId+':'+f.getName(),digest);
}

@Extension

0 comments on commit ab1eed1

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