mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
Merged ce27914ce9
Conflicts: core/src/main/java/hudson/model/AbstractItem.java core/src/main/java/hudson/model/AbstractProject.java core/src/main/java/hudson/model/Descriptor.java core/src/main/java/hudson/model/Hudson.java core/src/main/java/hudson/tasks/BuildTrigger.java core/src/main/resources/hudson/model/View/newJob.jelly core/src/main/resources/hudson/model/View/sidepanel.jelly core/src/main/resources/hudson/views/Messages_ja.properties maven-plugin/src/main/java/hudson/maven/MavenBuild.java maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java
This commit is contained in:
commit
039e43cf48
65 files changed
+477
-97
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.AbstractBuild;
|
||||
@@ -99,6 +101,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;
|
||||
@@ -376,6 +379,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
* null if this build is done by earlier version of Jenkins that didn't record this information
|
||||
* (this means the build was done by Maven2.x)
|
||||
*/
|
||||
@Exported
|
||||
public String getMavenVersionUsed() {
|
||||
return mavenVersionUsed;
|
||||
}
|
||||
@@ -404,6 +408,14 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
return super.getDynamic(token,req,rsp);
|
||||
}
|
||||
|
||||
/**
|
||||
* Information about artifacts produced by Maven.
|
||||
*/
|
||||
@Exported
|
||||
public MavenAggregatedArtifactRecord getMavenArtifacts() {
|
||||
return getAction(MavenAggregatedArtifactRecord.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Computes the latest module builds that correspond to this build.
|
||||
* (when individual modules are built, a new ModuleSetBuild is not created,
|
||||
@@ -512,7 +524,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