mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
Based on further conversation with the Artifactory plugin developers, revisiting this extension point.
This is a breaking change, but this extension point was added very recently, and it's based on the input from Artifactory plugin, so there's not much point in keeping one that doesn't serve the intended use case.
This commit is contained in:
1 parent
41a9a68a5e
commit
495d97dd5f
9 files changed
+186
-63
No files matched your search
@@ -683,18 +683,16 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
if ( maven3orLater )
|
||||
{
|
||||
LOGGER.fine( "using maven 3 " + mavenVersion );
|
||||
process =
|
||||
MavenBuild.mavenProcessCache.get( launcher.getChannel(), slistener,
|
||||
new Maven3ProcessFactory( project, launcher, envVars, getMavenOpts(listener, envVars),
|
||||
pom.getParent() ) );
|
||||
process = MavenBuild.mavenProcessCache.get( launcher.getChannel(), slistener,
|
||||
new Maven3ProcessFactory( project, MavenModuleSetBuild.this, launcher, envVars, getMavenOpts(listener, envVars),
|
||||
pom.getParent() ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
LOGGER.fine( "using maven 2 " + mavenVersion );
|
||||
process =
|
||||
MavenBuild.mavenProcessCache.get( launcher.getChannel(), slistener,
|
||||
new MavenProcessFactory( project, launcher, envVars,getMavenOpts(listener, envVars),
|
||||
pom.getParent() ) );
|
||||
process = MavenBuild.mavenProcessCache.get( launcher.getChannel(), slistener,
|
||||
new MavenProcessFactory( project, MavenModuleSetBuild.this, launcher, envVars,getMavenOpts(listener, envVars),
|
||||
pom.getParent() ) );
|
||||
}
|
||||
|
||||
ArgumentListBuilder margs = new ArgumentListBuilder().add("-B").add("-f", pom.getRemote());
|
||||
@@ -1045,9 +1043,9 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
|
||||
String rootPOMRelPrefix;
|
||||
|
||||
private final PlexusModuleContributor plexusContributors = PlexusModuleContributor.aggregate();
|
||||
private final PlexusModuleContributor plexusContributors;
|
||||
|
||||
PomParser(BuildListener listener, MavenInstallation mavenHome, String mavenVersion, EnvVars envVars, MavenModuleSetBuild build) {
|
||||
PomParser(BuildListener listener, MavenInstallation mavenHome, String mavenVersion, EnvVars envVars, MavenModuleSetBuild build) throws IOException, InterruptedException {
|
||||
// project cannot be shipped to the remote JVM, so all the relevant properties need to be captured now.
|
||||
MavenModuleSet project = build.getProject();
|
||||
this.listener = listener;
|
||||
@@ -1095,6 +1093,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
project.getScm().getModuleRoot( build.getWorkspace(), project.getLastBuild() ).getRemote();
|
||||
|
||||
this.mavenValidationLevel = project.getMavenValidationLevel();
|
||||
plexusContributors = PlexusModuleContributorFactory.aggregate(build);
|
||||
}
|
||||
|
||||
private boolean isUpdateSnapshots(String goals) {
|
||||
|
||||
Reference in new issue
Block a user