mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
call sequence of this is different from that of Maven2, and this breaks MavenArtifactArchiver.
By the time MavenModuleSetBuild.notifyModuleBuild() is called, we need the processing on one module to be completed.
This commit is contained in:
1 parent
a4df6c6a7b
commit
f53bb92f94
7 files changed
+69
-18
No files matched your search
@@ -33,6 +33,8 @@ import hudson.FilePath.FileCallable;
|
||||
import hudson.Launcher;
|
||||
import hudson.Util;
|
||||
import hudson.maven.MavenBuild.ProxyImpl2;
|
||||
import hudson.maven.reporters.MavenAggregatedArtifactRecord;
|
||||
import hudson.maven.reporters.MavenArtifactRecord;
|
||||
import hudson.maven.reporters.MavenFingerprinter;
|
||||
import hudson.maven.reporters.MavenMailer;
|
||||
import hudson.model.AbstractProject;
|
||||
@@ -95,6 +97,7 @@ import org.apache.maven.project.ProjectBuildingException;
|
||||
import org.codehaus.plexus.util.PathTool;
|
||||
import org.kohsuke.stapler.StaplerRequest;
|
||||
import org.kohsuke.stapler.StaplerResponse;
|
||||
import org.kohsuke.stapler.export.Exported;
|
||||
import org.sonatype.aether.transfer.TransferCancelledException;
|
||||
import org.sonatype.aether.transfer.TransferEvent;
|
||||
import org.sonatype.aether.transfer.TransferListener;
|
||||
@@ -342,6 +345,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
* null if this build is done by earlier version of Hudson that didn't record this information
|
||||
* (this means the build was done by Maven2.x)
|
||||
*/
|
||||
@Exported
|
||||
public String getMavenVersionUsed() {
|
||||
return mavenVersionUsed;
|
||||
}
|
||||
@@ -476,7 +480,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
// new AggregatableAction
|
||||
MavenAggregatedReport mar = aa.createAggregatedAction(this, moduleBuilds);
|
||||
mar.update(moduleBuilds,newBuild);
|
||||
actions.add(mar);
|
||||
addAction(mar);
|
||||
modified = true;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user