mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
[maven-plugin] Cleanup of deprecated calls, updating POM to point to current versions of maven-hpi-plugin and maven-stapler-plugin.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22024 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
560dea1197
commit
5dfb1adb36
6 files changed
+20
-15
No files matched your search
@@ -43,6 +43,7 @@ import hudson.model.Hudson;
|
||||
import hudson.model.ParametersAction;
|
||||
import hudson.model.Result;
|
||||
import hudson.model.Computer;
|
||||
import hudson.model.Run;
|
||||
import hudson.model.TaskListener;
|
||||
import hudson.model.Cause.UpstreamCause;
|
||||
import hudson.remoting.Channel;
|
||||
@@ -391,7 +392,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
if(!project.isAggregatorStyleBuild()) {
|
||||
// start module builds
|
||||
logger.println("Triggering "+project.getRootModule().getModuleName());
|
||||
project.getRootModule().scheduleBuild(new UpstreamCause(MavenModuleSetBuild.this));
|
||||
project.getRootModule().scheduleBuild(new UpstreamCause((Run<?,?>)MavenModuleSetBuild.this));
|
||||
} else {
|
||||
// do builds here
|
||||
try {
|
||||
@@ -465,7 +466,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
}
|
||||
|
||||
if (project.getAlternateSettings() != null) {
|
||||
margs.add("-s").add(project.getWorkspace().child(project.getAlternateSettings()));
|
||||
margs.add("-s").add(getWorkspace().child(project.getAlternateSettings()));
|
||||
}
|
||||
|
||||
margs.addTokenized(envVars.expand(project.getGoals()));
|
||||
@@ -804,7 +805,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
this.properties = project.getMavenProperties();
|
||||
this.nonRecursive = project.isNonRecursive();
|
||||
if (project.usesPrivateRepository()) {
|
||||
this.privateRepository = project.getWorkspace().child(".repository").getRemote();
|
||||
this.privateRepository = project.getLastBuild().getWorkspace().child(".repository").getRemote();
|
||||
}
|
||||
else {
|
||||
this.privateRepository = null;
|
||||
|
||||
Reference in new issue
Block a user