From be7b3adb4adbe9741d9660d901e6855a2abfe095 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 10 Jan 2011 18:30:22 +0100 Subject: [PATCH] [HUDSON-8406] Add more options to configure maven project building --- .../java/hudson/maven/MavenModuleSet.java | 47 ++++++++++++++++--- .../hudson/maven/MavenModuleSetBuild.java | 9 ++++ .../MavenModuleSet/configure-entries.jelly | 11 ++++- 3 files changed, 60 insertions(+), 7 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index 52503e5326..33591c8fb7 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -73,6 +73,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Properties; @@ -83,6 +84,8 @@ import javax.servlet.ServletException; import net.sf.json.JSONObject; +import org.apache.commons.lang.math.NumberUtils; +import org.apache.maven.model.building.ModelBuildingRequest; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -193,6 +196,13 @@ public final class MavenModuleSet extends AbstractMavenProject mavenValidationLevels = new LinkedHashMap(); public DescriptorImpl() { super(); load(); + mavenValidationLevels.put( "DEFAULT", -1 ); + mavenValidationLevels.put( "LEVEL_MINIMAL", ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL ); + mavenValidationLevels.put( "LEVEL_MAVEN_2_0", ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 ); + mavenValidationLevels.put( "LEVEL_MAVEN_3_0", ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 ); + mavenValidationLevels.put( "LEVEL_MAVEN_3_1", ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 ); + mavenValidationLevels.put( "LEVEL_STRICT", ModelBuildingRequest.VALIDATION_LEVEL_STRICT ); } public String getGlobalMavenOpts() { @@ -886,6 +909,14 @@ public final class MavenModuleSet extends AbstractMavenProject getMavenValidationLevels() { + return mavenValidationLevels; + } @Override public boolean configure( StaplerRequest req, JSONObject o ) { @@ -906,9 +937,13 @@ public final class MavenModuleSet extends AbstractMavenProject(), new File(workspaceProper) ); mavenEmbedderRequest.setWorkspaceReader( reactorReader ); } + + + if (this.mavenValidationLevel >= 0) { + mavenEmbedderRequest.setValidationLevel( this.mavenValidationLevel ); + } + //mavenEmbedderRequest.setClassLoader( MavenEmbedderUtils.buildClassRealm( mavenHome.getHomeDir(), null, null ) ); MavenEmbedder embedder = MavenUtil.createEmbedder( mavenEmbedderRequest ); diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly index e7017e3841..5e565c0164 100644 --- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly +++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly @@ -91,7 +91,16 @@ THE SOFTWARE. + checked="${it.isProcessPlugins()}" /> + + + + +