diff --git a/changelog.html b/changelog.html
index 60014516b8..e693a19182 100644
--- a/changelog.html
+++ b/changelog.html
@@ -45,13 +45,18 @@ Upcoming changes
M3 builds doesn't have a colorized console
(issue 8411)
Bad path for submodules
- (issue 8452)
+ (issue 8452)
+ Add more options to configure maven project building
+ (issue 8406)
+
-
Added CharacterEncodingFilter to prevent Non-ASCII characters from getting garbled.
@@ -64,7 +69,6 @@ Upcoming changes
- POMs parsing fails in m2 projects which has a wrong inheritence (m3 constraint).
(issue 8390)
-
-
diff --git a/debian/debian/changelog b/debian/debian/changelog
index d12fa090e1..c8951f87d1 100644
--- a/debian/debian/changelog
+++ b/debian/debian/changelog
@@ -1,3 +1,9 @@
+hudson (1.393) unstable; urgency=low
+
+ * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi Sun, 09 Jan 2011 18:06:56 -0800
+
hudson (1.392) unstable; urgency=low
* See http://hudson.dev.java.net/changelog.html for more details.
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
index ae78892d60..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;
@@ -181,6 +184,25 @@ public final class MavenModuleSet extends AbstractMavenProjectfalse to be faster
+ * @since 1.394
+ */
+ private boolean resolveDependencies = false;
+
+ /**
+ * parameter for pom parsing by default
false to be faster
+ * @since 1.394
+ */
+ private boolean processPlugins = false;
+
+ /**
+ * parameter for validation level during pom parsing by default the one corresponding
+ * to the maven version used (2 or 3)
+ * @since 1.394
+ */
+ private int mavenValidationLevel = -1;
/**
* Reporters configured at {@link MavenModuleSet} level. Applies to all {@link MavenModule} builds.
@@ -358,7 +380,28 @@ 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() {
@@ -853,6 +909,14 @@ public final class MavenModuleSet extends AbstractMavenProject getMavenValidationLevels() {
+ return mavenValidationLevels;
+ }
@Override
public boolean configure( StaplerRequest req, JSONObject o ) {
@@ -873,7 +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 28d35606fc..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
@@ -88,6 +88,19 @@ THE SOFTWARE.
checked="${!it.aggregatorStyleBuild}" />
+
+
+
+
+
+
+
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 2c44b38fd2..b39d617a19 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -10,7 +10,7 @@
org.jvnet.hudson.plugins
plugin
Hudson plugin POM
- 1.392
+ 1.393
pom
@@ -38,7 +38,7 @@
org.jvnet.hudson.main
maven-plugin
- 1.392
+ 1.393
@@ -48,25 +48,25 @@
org.jvnet.hudson.main
hudson-war
war
- 1.392
+ 1.393
test
org.jvnet.hudson.main
hudson-core
- 1.392
+ 1.393
provided
org.jvnet.hudson.main
hudson-test-harness
- 1.392
+ 1.393
test
org.jvnet.hudson.main
ui-samples-plugin
- 1.392
+ 1.393
test
@@ -97,7 +97,7 @@
org.jvnet.hudson.main
maven-plugin
- 1.392
+ 1.393