From c4590529f731ba30b5deb0961d73f76e35ab70ff Mon Sep 17 00:00:00 2001 From: alanharder Date: Thu, 17 Mar 2011 09:15:26 -0700 Subject: [PATCH 1/7] [FIXED JENKINS-7442] Change ArgumentListBuilder.toWindowsCommand() to not escape %VAR% type references by default (can now be done by passing "true" parameter). This restores ability to use %VAR% references for ant build steps on windows. --- changelog.html | 3 ++ .../java/hudson/util/ArgumentListBuilder.java | 28 +++++++---- .../hudson/util/ArgumentListBuilderTest.java | 11 ++++- test/src/test/java/hudson/tasks/AntTest.java | 46 ++++++++++++++++++- .../main/webapp/help/ant/ant-properties.html | 5 +- 5 files changed, 80 insertions(+), 13 deletions(-) diff --git a/changelog.html b/changelog.html index 1b826ce259..dce7d315ad 100644 --- a/changelog.html +++ b/changelog.html @@ -80,6 +80,9 @@ Upcoming changes
  • Email fails when sending to multiple recipients if _any_ of them are in error (issue 9006) +
  • + Ant properties with Windows %VAR% type variables did not expand since 1.370. + (issue 7442)
  • Fixed a concurrent data access corruption in crumb generation.
  • diff --git a/core/src/main/java/hudson/util/ArgumentListBuilder.java b/core/src/main/java/hudson/util/ArgumentListBuilder.java index 9c25e7ff55..66f7152efd 100644 --- a/core/src/main/java/hudson/util/ArgumentListBuilder.java +++ b/core/src/main/java/hudson/util/ArgumentListBuilder.java @@ -267,22 +267,25 @@ public class ArgumentListBuilder implements Serializable { * is needed since the command is now passed as a string to the CMD.EXE shell. * This is done as follows: * Wrap arguments in double quotes if they contain any of: - * space *?,;^&<>|" or % followed by a letter. + * space *?,;^&<>|" + * and if escapeVars is true, % followed by a letter. *
    When testing from command prompt, these characters also need to be * prepended with a ^ character: ^&<>| -- however, invoking cmd.exe from - * Hudson does not seem to require this extra escaping so it is not added by + * Jenkins does not seem to require this extra escaping so it is not added by * this method. *
    A " is prepended with another " character. Note: Windows has issues * escaping some combinations of quotes and spaces. Quotes should be avoided. - *
    A % followed by a letter has that letter wrapped in double quotes, - * to avoid possible variable expansion. ie, %foo% becomes "%"f"oo%". - * The second % does not need special handling because it is not followed - * by a letter.
    + *
    If escapeVars is true, a % followed by a letter has that letter wrapped + * in double quotes, to avoid possible variable expansion. + * ie, %foo% becomes "%"f"oo%". The second % does not need special handling + * because it is not followed by a letter.
    * Example: "-Dfoo=*abc?def;ghi^jkl&mnostu|vwx""yz%"e"nd" + * @param escapeVars True to escape %VAR% references; false to leave these alone + * so they may be expanded when the command is run * @return new ArgumentListBuilder that runs given command through cmd.exe /C * @since 1.386 */ - public ArgumentListBuilder toWindowsCommand() { + public ArgumentListBuilder toWindowsCommand(boolean escapeVars) { StringBuilder quotedArgs = new StringBuilder(); boolean quoted, percent; for (String arg : args) { @@ -300,7 +303,8 @@ public class ArgumentListBuilder implements Serializable { if (!quoted) quoted = startQuoting(quotedArgs, arg, i); quotedArgs.append('"'); } - else if (percent && ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'))) { + else if (percent && escapeVars + && ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'))) { if (!quoted) quoted = startQuoting(quotedArgs, arg, i); quotedArgs.append('"').append(c); c = '"'; @@ -320,6 +324,14 @@ public class ArgumentListBuilder implements Serializable { return new ArgumentListBuilder().add("cmd.exe", "/C").addQuoted(quotedArgs.toString()); } + /** + * Calls toWindowsCommand(false) + * @see #toWindowsCommand(boolean) + */ + public ArgumentListBuilder toWindowsCommand() { + return toWindowsCommand(false); + } + private static boolean startQuoting(StringBuilder buf, String arg, int atIndex) { buf.append('"').append(arg.substring(0, atIndex)); return true; diff --git a/core/src/test/java/hudson/util/ArgumentListBuilderTest.java b/core/src/test/java/hudson/util/ArgumentListBuilderTest.java index 0a6254af47..b6ec679606 100644 --- a/core/src/test/java/hudson/util/ArgumentListBuilderTest.java +++ b/core/src/test/java/hudson/util/ArgumentListBuilderTest.java @@ -119,13 +119,22 @@ public class ArgumentListBuilderTest extends Assert { "-Dfoo7=foo|bar\"baz", // add quotes and "" for " "-Dfoo8=% %QED% %comspec% %-%(%.%", // add quotes, and extra quotes for %Q and %c "-Dfoo9=%'''%%@%"); // no quotes as none of the % are followed by a letter + // By default, does not escape %VAR% + assertArrayEquals(new String[] { "cmd.exe", "/C", + "\"ant.bat -Dfoo1=abc \"-Dfoo2=foo bar\"" + + " \"-Dfoo3=/u*r\" \"-Dfoo4=/us?\" \"-Dfoo10=bar,baz\" \"-Dfoo5=foo;bar^baz\"" + + " \"-Dfoo6=&here;\" \"-Dfoo7=foo|bar\"\"baz\"" + + " \"-Dfoo8=% %QED% %comspec% %-%(%.%\"" + + " -Dfoo9=%'''%%@% && exit %%ERRORLEVEL%%\"" }, + builder.toWindowsCommand().toCommandArray()); + // Pass flag to escape %VAR% assertArrayEquals(new String[] { "cmd.exe", "/C", "\"ant.bat -Dfoo1=abc \"-Dfoo2=foo bar\"" + " \"-Dfoo3=/u*r\" \"-Dfoo4=/us?\" \"-Dfoo10=bar,baz\" \"-Dfoo5=foo;bar^baz\"" + " \"-Dfoo6=&here;\" \"-Dfoo7=foo|bar\"\"baz\"" + " \"-Dfoo8=% %\"Q\"ED% %\"c\"omspec% %-%(%.%\"" + " -Dfoo9=%'''%%@% && exit %%ERRORLEVEL%%\"" }, - builder.toWindowsCommand().toCommandArray()); + builder.toWindowsCommand(true).toCommandArray()); } @Test diff --git a/test/src/test/java/hudson/tasks/AntTest.java b/test/src/test/java/hudson/tasks/AntTest.java index cc79293113..2fc5894c95 100644 --- a/test/src/test/java/hudson/tasks/AntTest.java +++ b/test/src/test/java/hudson/tasks/AntTest.java @@ -26,6 +26,7 @@ package hudson.tasks; import com.gargoylesoftware.htmlunit.html.HtmlButton; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import hudson.Functions; import hudson.matrix.Axis; import hudson.matrix.AxisList; import hudson.matrix.MatrixRun; @@ -43,6 +44,7 @@ import hudson.tools.InstallSourceProperty; import hudson.tools.ToolProperty; import hudson.tools.ToolPropertyDescriptor; import hudson.util.DescribableList; +import org.jvnet.hudson.test.Bug; import org.jvnet.hudson.test.ExtractResourceSCM; import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.SingleFileSCM; @@ -145,8 +147,9 @@ public class AntTest extends HudsonTestCase { assertTrue("Missing $BUILD_NUMBER: " + log, log.contains("vNUM=1")); assertTrue("Missing $BUILD_ID: " + log, log.contains("vID=2")); // Assuming the year starts with 2! assertTrue("Missing $JOB_NAME: " + log, log.contains(project.getName())); - // Odd build tag, but it's constructed with getParent().getName() and the parent is the matrix - // configuration, not the project.. if matrix build tag ever changes, update expected value here: + // Odd build tag, but it's constructed with getParent().getName() and the parent is the + // matrix configuration, not the project.. if matrix build tag ever changes, update + // expected value here: assertTrue("Missing $BUILD_TAG: " + log, log.contains("vTAG=jenkins-AX=is-1")); assertTrue("Missing $EXECUTOR_NUMBER: " + log, log.matches("(?s).*vEXEC=\\d.*")); // $NODE_NAME is expected to be empty when running on master.. not checking. @@ -161,4 +164,43 @@ public class AntTest extends HudsonTestCase { assertTrue("Missing build parameter $FOO: " + log, log.contains("vFOO=bar")); assertTrue("Missing matrix axis $AX: " + log, log.contains("vAX=is")); } + + public void testParameterExpansionByShell() throws Exception { + String antName = configureDefaultAnt().getName(); + FreeStyleProject project = createFreeStyleProject(); + project.setScm(new ExtractResourceSCM(getClass().getResource("ant-job.zip"))); + String homeVar = Functions.isWindows() ? "%HOME%" : "$HOME"; + project.addProperty(new ParametersDefinitionProperty( + new StringParameterDefinition("vFOO", homeVar, ""), + new StringParameterDefinition("vBAR", "Home sweet " + homeVar + ".", ""))); + project.getBuildersList().add(new Ant("", antName, null, null, + "vHOME=" + homeVar + "\nvFOOHOME=Foo " + homeVar + "\n")); + FreeStyleBuild build = project.scheduleBuild2(0, new UserCause()).get(); + assertBuildStatusSuccess(build); + String log = getLog(build); + if (!Functions.isWindows()) homeVar = "\\" + homeVar; // Regex escape for $ + assertTrue("Missing simple HOME parameter: " + log, + log.matches("(?s).*vFOO=(?!" + homeVar + ").*")); + assertTrue("Missing HOME parameter with other text: " + log, + log.matches("(?s).*vBAR=Home sweet (?!" + homeVar + ")[^\\r\\n]*\\..*")); + assertTrue("Missing HOME ant property: " + log, + log.matches("(?s).*vHOME=(?!" + homeVar + ").*")); + assertTrue("Missing HOME ant property with other text: " + log, + log.matches("(?s).*vFOOHOME=Foo (?!" + homeVar + ").*")); + } + + @Bug(7108) + public void testEscapeXmlInParameters() throws Exception { + String antName = configureDefaultAnt().getName(); + FreeStyleProject project = createFreeStyleProject(); + project.setScm(new ExtractResourceSCM(getClass().getResource("ant-job.zip"))); + project.addProperty(new ParametersDefinitionProperty( + new StringParameterDefinition("vFOO", "", ""))); + project.getBuildersList().add(new Ant("", antName, null, null, "vBAR=\n")); + FreeStyleBuild build = project.scheduleBuild2(0, new UserCause()).get(); + assertBuildStatusSuccess(build); + String log = getLog(build); + assertTrue("Missing parameter: " + log, log.contains("vFOO=")); + assertTrue("Missing ant property: " + log, log.contains("vBAR=")); + } } diff --git a/war/src/main/webapp/help/ant/ant-properties.html b/war/src/main/webapp/help/ant/ant-properties.html index c377f3c3f7..e157df5a1c 100644 --- a/war/src/main/webapp/help/ant/ant-properties.html +++ b/war/src/main/webapp/help/ant/ant-properties.html @@ -7,8 +7,9 @@ name1=value1 name2=$VAR2 These are passed to Ant like "-Dname1=value1 -Dname2=value2". - Always use $VAR style for parameter references (do not use %VAR% style, - even when build runs on Windows). + Always use $VAR style (even on Windows) for references to Jenkins-defined + environment variables. On Windows, %VAR% style references may be used + for environment variables that exist outside of Jenkins. Backslashes are used for escaping, so use \\ for a single backslash. Double quotes (") should be avoided, as ant on *nix wraps parameters in quotes quotes and runs them through eval, and Windows has its own issues From 920ecff5f056c01339a1ffcee51a4ef54c5e10d4 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 20 Mar 2011 22:44:21 -0700 Subject: [PATCH 2/7] [maven-release-plugin] prepare release jenkins-1_402 --- 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 8072d390dd..2aaf3ee957 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jenkins-ci.main - 1.402-SNAPSHOT + 1.402 cli Jenkins CLI diff --git a/core/pom.xml b/core/pom.xml index 7bf9be9197..5475ae255a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402-SNAPSHOT + 1.402 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 7b4464f5e2..4183b4b73d 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402-SNAPSHOT + 1.402 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 64179b648a..dfac9d8dea 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402-SNAPSHOT + 1.402 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 72889a3e6d..1ebd6866f6 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402-SNAPSHOT + 1.402 maven-plugin diff --git a/maven3-agent/pom.xml b/maven3-agent/pom.xml index 66a9b72773..5465a24c64 100755 --- a/maven3-agent/pom.xml +++ b/maven3-agent/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.main pom - 1.402-SNAPSHOT + 1.402 maven3-agent Jenkins Maven3 CLI Agent diff --git a/maven3-interceptor/pom.xml b/maven3-interceptor/pom.xml index b34ed92a13..ad05c87d5b 100755 --- a/maven3-interceptor/pom.xml +++ b/maven3-interceptor/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.main pom - 1.402-SNAPSHOT + 1.402 maven3-interceptor Jenkins Maven3 Interceptor diff --git a/pom.xml b/pom.xml index 3c4f04e75b..36c53b4c08 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402-SNAPSHOT + 1.402 pom Jenkins main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 7491292e9b..ff4c472ce0 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402-SNAPSHOT + 1.402 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 398804c7ae..e0e27c9b51 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jenkins-ci.main - 1.402-SNAPSHOT + 1.402 4.0.0 org.jenkins-ci.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index ca5d5be9fc..bbfe4b41df 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402-SNAPSHOT + 1.402 ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index d99be6c940..125acff266 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402-SNAPSHOT + 1.402 ../pom.xml From cd5809ffbc8721db03daa1cad494d3cc410007b6 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 20 Mar 2011 22:44:21 -0700 Subject: [PATCH 3/7] [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 2aaf3ee957..8c06805e6f 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jenkins-ci.main - 1.402 + 1.403-SNAPSHOT cli Jenkins CLI diff --git a/core/pom.xml b/core/pom.xml index 5475ae255a..a38d610d4e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402 + 1.403-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 4183b4b73d..6574368cbc 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402 + 1.403-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index dfac9d8dea..fefcafb14a 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402 + 1.403-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 1ebd6866f6..6bc60fcde4 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402 + 1.403-SNAPSHOT maven-plugin diff --git a/maven3-agent/pom.xml b/maven3-agent/pom.xml index 5465a24c64..f267c48c19 100755 --- a/maven3-agent/pom.xml +++ b/maven3-agent/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.main pom - 1.402 + 1.403-SNAPSHOT maven3-agent Jenkins Maven3 CLI Agent diff --git a/maven3-interceptor/pom.xml b/maven3-interceptor/pom.xml index ad05c87d5b..c196d73a4d 100755 --- a/maven3-interceptor/pom.xml +++ b/maven3-interceptor/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.main pom - 1.402 + 1.403-SNAPSHOT maven3-interceptor Jenkins Maven3 Interceptor diff --git a/pom.xml b/pom.xml index 36c53b4c08..c97dab2268 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402 + 1.403-SNAPSHOT pom Jenkins main module diff --git a/remoting/pom.xml b/remoting/pom.xml index ff4c472ce0..8152b1b0fc 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402 + 1.403-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index e0e27c9b51..3bff2bdc38 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jenkins-ci.main - 1.402 + 1.403-SNAPSHOT 4.0.0 org.jenkins-ci.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index bbfe4b41df..6adb9a5f2a 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402 + 1.403-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 125acff266..5f3aeaab87 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.402 + 1.403-SNAPSHOT ../pom.xml From 76a1396c87c9e05c9e2b234303f7397b20bb6acc Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 20 Mar 2011 23:17:49 -0700 Subject: [PATCH 4/7] [maven-release-plugin] prepare release jenkins-1_403 --- 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 8c06805e6f..77d36fc4f9 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jenkins-ci.main - 1.403-SNAPSHOT + 1.403 cli Jenkins CLI diff --git a/core/pom.xml b/core/pom.xml index a38d610d4e..3e59c3232c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403-SNAPSHOT + 1.403 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 6574368cbc..3e5c0c46cd 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403-SNAPSHOT + 1.403 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index fefcafb14a..e4aa7ac83f 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403-SNAPSHOT + 1.403 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 6bc60fcde4..b9f0347eff 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403-SNAPSHOT + 1.403 maven-plugin diff --git a/maven3-agent/pom.xml b/maven3-agent/pom.xml index f267c48c19..c1042eb594 100755 --- a/maven3-agent/pom.xml +++ b/maven3-agent/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.main pom - 1.403-SNAPSHOT + 1.403 maven3-agent Jenkins Maven3 CLI Agent diff --git a/maven3-interceptor/pom.xml b/maven3-interceptor/pom.xml index c196d73a4d..5addf42fce 100755 --- a/maven3-interceptor/pom.xml +++ b/maven3-interceptor/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.main pom - 1.403-SNAPSHOT + 1.403 maven3-interceptor Jenkins Maven3 Interceptor diff --git a/pom.xml b/pom.xml index c97dab2268..5099ca66fc 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403-SNAPSHOT + 1.403 pom Jenkins main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 8152b1b0fc..2a71419723 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403-SNAPSHOT + 1.403 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 3bff2bdc38..0f3b8b818a 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jenkins-ci.main - 1.403-SNAPSHOT + 1.403 4.0.0 org.jenkins-ci.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 6adb9a5f2a..cc26f94be6 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403-SNAPSHOT + 1.403 ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 5f3aeaab87..9020d5f4e0 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403-SNAPSHOT + 1.403 ../pom.xml From 59eb946cf669cbf49f9a4c3d54d6802b0513fa0e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 20 Mar 2011 23:17:50 -0700 Subject: [PATCH 5/7] [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 77d36fc4f9..8b53cf7d9c 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jenkins-ci.main - 1.403 + 1.404-SNAPSHOT cli Jenkins CLI diff --git a/core/pom.xml b/core/pom.xml index 3e59c3232c..691599a819 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403 + 1.404-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 3e5c0c46cd..1a0b6c226e 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403 + 1.404-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index e4aa7ac83f..8a61ef309f 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403 + 1.404-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index b9f0347eff..7e37074729 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403 + 1.404-SNAPSHOT maven-plugin diff --git a/maven3-agent/pom.xml b/maven3-agent/pom.xml index c1042eb594..a83b59a8b6 100755 --- a/maven3-agent/pom.xml +++ b/maven3-agent/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.main pom - 1.403 + 1.404-SNAPSHOT maven3-agent Jenkins Maven3 CLI Agent diff --git a/maven3-interceptor/pom.xml b/maven3-interceptor/pom.xml index 5addf42fce..3f89f98b59 100755 --- a/maven3-interceptor/pom.xml +++ b/maven3-interceptor/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.main pom - 1.403 + 1.404-SNAPSHOT maven3-interceptor Jenkins Maven3 Interceptor diff --git a/pom.xml b/pom.xml index 5099ca66fc..6e9b5a1ad4 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403 + 1.404-SNAPSHOT pom Jenkins main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 2a71419723..8da34ae728 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403 + 1.404-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 0f3b8b818a..5be6601964 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jenkins-ci.main - 1.403 + 1.404-SNAPSHOT 4.0.0 org.jenkins-ci.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index cc26f94be6..336929e6c6 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403 + 1.404-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 9020d5f4e0..c0d3f5dd1d 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.403 + 1.404-SNAPSHOT ../pom.xml From b9e1b752bb35c4d5cc95c5110818472e74d97b9d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 20 Mar 2011 23:34:03 -0700 Subject: [PATCH 6/7] updated changelog for release --- changelog.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog.html b/changelog.html index dce7d315ad..2880ffdfdb 100644 --- a/changelog.html +++ b/changelog.html @@ -66,7 +66,10 @@ Upcoming changes +

    What's new in 1.402 (2011/03/20)

    • Fixed a race condition in the remote data transfer that results in silent file copy failures. @@ -109,7 +112,6 @@ Upcoming changes Include OS type and version of slave in the system information page. (issue 8996)
    -

    What's new in 1.401 (2011/03/13)

    • From 4b63591a76bfb32e72a37295b16f394504f834d1 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 20 Mar 2011 23:37:09 -0700 Subject: [PATCH 7/7] 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 2917667684..ad65d11bb3 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +jenkins (1.403) unstable; urgency=low + + * See http://jenkins-ci.org/changelog for more details. + + -- Kohsuke Kawaguchi Sun, 20 Mar 2011 23:34:50 -0700 + jenkins (1.401) unstable; urgency=low * See http://jenkins-ci.org/changelog for more details.