From 08404ba839e31f6a47cd7115ba1aa215502425cd Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Jan 2011 17:54:01 -0800 Subject: [PATCH 1/8] [maven-release-plugin] prepare release hudson-1_393 --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- maven3-agent/pom.xml | 2 +- maven3-interceptor/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 72192fa9fb..78b6a0f94e 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.393-SNAPSHOT + 1.393 cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 2407e170db..6e7dbcffea 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393-SNAPSHOT + 1.393 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index e1483c5f6e..f35b829ea8 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393-SNAPSHOT + 1.393 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 1497280560..882f207406 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393-SNAPSHOT + 1.393 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 81668315b9..5a2c7a0c4a 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393-SNAPSHOT + 1.393 maven-plugin diff --git a/maven3-agent/pom.xml b/maven3-agent/pom.xml index 94b8c0dc21..7360f0fd5f 100755 --- a/maven3-agent/pom.xml +++ b/maven3-agent/pom.xml @@ -4,7 +4,7 @@ org.jvnet.hudson.main pom - 1.393-SNAPSHOT + 1.393 maven3-agent Hudson Maven3 CLI Agent diff --git a/maven3-interceptor/pom.xml b/maven3-interceptor/pom.xml index b7ca8c8397..78a12b7e9f 100755 --- a/maven3-interceptor/pom.xml +++ b/maven3-interceptor/pom.xml @@ -4,7 +4,7 @@ org.jvnet.hudson.main pom - 1.393-SNAPSHOT + 1.393 maven3-interceptor Hudson Maven3 Interceptor diff --git a/pom.xml b/pom.xml index 2f709dd028..62c0e84249 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393-SNAPSHOT + 1.393 pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 12b4337c73..4ae5ba9075 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393-SNAPSHOT + 1.393 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 963eee119e..0549c3d155 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.393-SNAPSHOT + 1.393 4.0.0 org.jvnet.hudson.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index cd4f128f79..a0f8ddb4d8 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393-SNAPSHOT + 1.393 ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 46d5818b62..4a1e0a9558 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393-SNAPSHOT + 1.393 ../pom.xml From 98f0da71d4e62283e1517afca1a5d7d5617b2b51 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Jan 2011 17:54:02 -0800 Subject: [PATCH 2/8] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- maven3-agent/pom.xml | 2 +- maven3-interceptor/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 78b6a0f94e..e1d7024245 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.393 + 1.394-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 6e7dbcffea..b51244ec27 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393 + 1.394-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index f35b829ea8..f907103596 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393 + 1.394-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 882f207406..cf79b1bbd5 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393 + 1.394-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 5a2c7a0c4a..e9ec5a42c2 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393 + 1.394-SNAPSHOT maven-plugin diff --git a/maven3-agent/pom.xml b/maven3-agent/pom.xml index 7360f0fd5f..9e3c84fd89 100755 --- a/maven3-agent/pom.xml +++ b/maven3-agent/pom.xml @@ -4,7 +4,7 @@ org.jvnet.hudson.main pom - 1.393 + 1.394-SNAPSHOT maven3-agent Hudson Maven3 CLI Agent diff --git a/maven3-interceptor/pom.xml b/maven3-interceptor/pom.xml index 78a12b7e9f..47b25b663f 100755 --- a/maven3-interceptor/pom.xml +++ b/maven3-interceptor/pom.xml @@ -4,7 +4,7 @@ org.jvnet.hudson.main pom - 1.393 + 1.394-SNAPSHOT maven3-interceptor Hudson Maven3 Interceptor diff --git a/pom.xml b/pom.xml index 62c0e84249..1153f7450d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393 + 1.394-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 4ae5ba9075..eda8015f72 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393 + 1.394-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 0549c3d155..d6a48d497f 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.393 + 1.394-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index a0f8ddb4d8..4a2254e3e3 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393 + 1.394-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 4a1e0a9558..fbff6bb88d 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.393 + 1.394-SNAPSHOT ../pom.xml From 4cf0043be8e916c3868404a8125ffd06838f9bf4 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Jan 2011 18:06:10 -0800 Subject: [PATCH 3/8] updated changelog for release --- changelog.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog.html b/changelog.html index 1646b2044f..ac83594f5d 100644 --- a/changelog.html +++ b/changelog.html @@ -46,7 +46,10 @@ Upcoming changes +

What's new in 1.393 (2011/01/09)

  • Added CharacterEncodingFilter to prevent Non-ASCII characters from getting garbled. @@ -59,7 +62,6 @@ Upcoming changes
  • POMs parsing fails in m2 projects which has a wrong inheritence (m3 constraint). (issue 8390)
-

What's new in 1.392 (2010/12/31)

  • From a6486f7e448642dde9d6d89743e47d3faea518ae Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Jan 2011 18:06:16 -0800 Subject: [PATCH 4/8] released a new plugin parent POM --- plugins/pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 From e9fe92c6ac807f81dc067297483dbd5132c9028c Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Jan 2011 18:09:12 -0800 Subject: [PATCH 5/8] updated changelog as a part of the release --- debian/debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) 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. From b02f9cc603e2501760c4084c169508b4ff348f96 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 10 Jan 2011 17:32:11 +0100 Subject: [PATCH 6/8] [HUDSON-8406] Add more options to configure maven project building processPlugins and resolveDependencies are now configurable --- .../java/hudson/maven/MavenModuleSet.java | 37 ++++++++++++++++++- .../hudson/maven/MavenModuleSetBuild.java | 11 ++++-- .../MavenModuleSet/configure-entries.jelly | 4 ++ 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index ae78892d60..52503e5326 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -181,6 +181,18 @@ 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; /** * Reporters configured at {@link MavenModuleSet} level. Applies to all {@link MavenModule} builds. @@ -358,6 +370,26 @@ public final class MavenModuleSet extends AbstractMavenProject + + From be7b3adb4adbe9741d9660d901e6855a2abfe095 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 10 Jan 2011 18:30:22 +0100 Subject: [PATCH 7/8] [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()}" /> + + + + + From 4895dbef2fe9405adcaf7f004fd55e93f6269287 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 10 Jan 2011 18:33:10 +0100 Subject: [PATCH 8/8] changelog pour HUDSON-8406 --- changelog.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index 12f101fa5f..e693a19182 100644 --- a/changelog.html +++ b/changelog.html @@ -45,7 +45,9 @@ 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)