diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 22460ad095..cb3938efc9 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -45,7 +45,7 @@ THE SOFTWARE. 3.1.0 ${mavenVersion} 0.9.0.M2 - 0.0.0.M2a + 0.0.0.M4 2.4 @@ -112,12 +112,42 @@ THE SOFTWARE. org.jenkins-ci.main.maven maven3-agent ${mavenInterceptorsVersion} - + + + org.sonatype.sisu + sisu-inject-plexus + + + org.sonatype.sisu + sisu-inject-bean + + + + + org.jenkins-ci.main.maven + maven31-agent + ${mavenInterceptorsVersion} + org.jenkins-ci.main.maven maven3-interceptor ${mavenInterceptorsVersion} + + + org.sonatype.sisu + sisu-inject-plexus + + + org.sonatype.sisu + sisu-inject-bean + + + + + org.jenkins-ci.main.maven + maven31-interceptor + ${mavenInterceptorsVersion} org.jenkins-ci.main.maven @@ -187,7 +217,20 @@ THE SOFTWARE. org.eclipse.sisu org.eclipse.sisu.plexus ${sisuInjectVersion} - + + + org.sonatype.sisu @@ -412,6 +455,7 @@ THE SOFTWARE. + org.apache.maven.plugins maven-dependency-plugin diff --git a/maven-plugin/src/main/java/hudson/maven/Maven3ProcessFactory.java b/maven-plugin/src/main/java/hudson/maven/Maven3ProcessFactory.java index d2ecbd338d..2c0ddf9ddb 100644 --- a/maven-plugin/src/main/java/hudson/maven/Maven3ProcessFactory.java +++ b/maven-plugin/src/main/java/hudson/maven/Maven3ProcessFactory.java @@ -46,7 +46,7 @@ import org.jvnet.hudson.maven3.listeners.HudsonMavenExecutionResult; /** * {@link AbstractMavenProcessFactory} for Maven 3. * - * @author Olivier Lam + * @author Olivier Lamy */ public class Maven3ProcessFactory extends AbstractMavenProcessFactory implements ProcessCache.Factory { @@ -112,12 +112,12 @@ public class Maven3ProcessFactory extends AbstractMavenProcessFactory implements /** * Finds classworlds.jar */ - private static final class GetClassWorldsJar implements Callable { + protected static final class GetClassWorldsJar implements Callable { private static final long serialVersionUID = -2599434124883557137L; private final String mvnHome; private final TaskListener listener; - private GetClassWorldsJar(String mvnHome, TaskListener listener) { + protected GetClassWorldsJar(String mvnHome, TaskListener listener) { this.mvnHome = mvnHome; this.listener = listener; } diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java index 43218130c5..a67fb93da2 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java @@ -703,13 +703,26 @@ public class MavenBuild extends AbstractMavenBuild { LOGGER.fine(getFullDisplayName()+" is building with mavenVersion " + mavenVersion + " from file " + mavenInformation.getVersionResourcePath()); - boolean maven3orLater = MavenUtil.maven3orLater(mavenVersion); + MavenUtil.MavenVersion mavenVersionType = MavenUtil.getMavenVersion( mavenVersion ); - ProcessCache.MavenProcess process = MavenBuild.mavenProcessCache.get( launcher.getChannel(), listener, maven3orLater - ? new Maven3ProcessFactory( - getParent().getParent(), MavenBuild.this, launcher, envVars, getMavenOpts(listener, envVars), null ) - : new MavenProcessFactory( - getParent().getParent(), MavenBuild.this, launcher, envVars, getMavenOpts(listener, envVars), null )); + final ProcessCache.Factory factory; + + switch ( mavenVersionType ){ + case MAVEN_2: + LOGGER.fine( "using maven 2 " + mavenVersion ); + factory = new MavenProcessFactory( getParent().getParent(), MavenBuild.this, launcher, envVars, getMavenOpts(listener, envVars), null ); + break; + case MAVEN_3_0_X: + LOGGER.fine( "using maven 3 " + mavenVersion ); + factory = new Maven3ProcessFactory( getParent().getParent(), MavenBuild.this, launcher, envVars, getMavenOpts(listener, envVars), null ); + break; + default: + LOGGER.fine( "using maven 3 " + mavenVersion ); + factory = new Maven31ProcessFactory( getParent().getParent(), MavenBuild.this, launcher, envVars, getMavenOpts(listener, envVars), null ); + + } + + ProcessCache.MavenProcess process = MavenBuild.mavenProcessCache.get( launcher.getChannel(), listener, factory); ArgumentListBuilder margs = new ArgumentListBuilder("-N","-B"); FilePath localRepo = mms.getLocalRepository().locate(MavenBuild.this); @@ -729,7 +742,7 @@ public class MavenBuild extends AbstractMavenBuild { // backward compatibility systemProps.put("hudson.build.number",String.valueOf(getNumber())); - if (maven3orLater) + if (mavenVersionType == MavenUtil.MavenVersion.MAVEN_3_0_X || mavenVersionType == MavenUtil.MavenVersion.MAVEN_3_1) { // FIXME here for maven 3 builds listener.getLogger().println("Building single Maven modules is not implemented for Maven 3, yet!"); diff --git a/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java b/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java index cfa021d5ec..461848a545 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java @@ -41,7 +41,9 @@ import java.io.PrintStream; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Zip; import org.codehaus.plexus.classworlds.ClassWorld; +import org.jvnet.hudson.maven3.agent.Maven31Agent; import org.jvnet.hudson.maven3.agent.Maven3Main; +import org.jvnet.hudson.maven3.launcher.Maven31Interceptor; import org.jvnet.hudson.maven3.launcher.Maven3Launcher; import org.jvnet.hudson.maven3.listeners.HudsonMavenExecutionResult; @@ -57,7 +59,9 @@ public class MavenComputerListener extends ComputerListener { PrintStream logger = listener.getLogger(); copyJar(logger, root, Main.class, "maven-agent"); copyJar(logger, root, Maven3Main.class, "maven3-agent"); + copyJar(logger, root, Maven31Agent.class, "maven31-agent"); copyJar(logger, root, Maven3Launcher.class, "maven3-interceptor"); + copyJar(logger, root, Maven31Interceptor.class, "maven31-interceptor"); copyJar(logger, root, AbortException.class, "maven-interceptor"); copyJar(logger, root, HudsonMavenExecutionResult.class, "maven3-interceptor-commons" ); copyJar(logger, root, Maven21Interceptor.class, "maven2.1-interceptor"); diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 662cb44ad6..999aced5b6 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -683,7 +683,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild${skipTests} - - - repo.jenkins-ci.org @@ -310,6 +307,11 @@ THE SOFTWARE. maven-deploy-plugin 2.7 + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + org.apache.maven.plugins maven-compiler-plugin