From c565c56c8e75c2b5910a996f25704aa8baf25bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= Date: Tue, 3 May 2011 16:20:25 +0200 Subject: [PATCH 001/113] fix Tycho support --- .../main/java/hudson/maven/reporters/SurefireArchiver.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java index 78fdd14337..9f2c646424 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java @@ -245,6 +245,7 @@ public class SurefireArchiver extends MavenReporter { private boolean isSurefireTest(MojoInfo mojo) { if ((!mojo.is("com.sun.maven", "maven-junit-plugin", "test")) && (!mojo.is("org.sonatype.flexmojos", "flexmojos-maven-plugin", "test-run")) + && (!mojo.is("org.eclipse.tycho", "tycho-surefire-plugin", "test")) && (!mojo.is("org.sonatype.tycho", "maven-osgi-test-plugin", "test")) && (!mojo.is("org.apache.maven.plugins", "maven-surefire-plugin", "test")) && (!mojo.is("org.apache.maven.plugins", "maven-failsafe-plugin", "integration-test"))) @@ -290,6 +291,11 @@ public class SurefireArchiver extends MavenReporter { if (((skipTests != null) && (skipTests))) { return false; } + } else if (mojo.is("org.eclipse.tycho", "tycho-surefire-plugin", "test")) { + Boolean skipTests = mojo.getConfigurationValue("skipTest", Boolean.class); + if (((skipTests != null) && (skipTests))) { + return false; + } } } catch (ComponentConfigurationException e) { From e9568c5af6338441079cc841e561369a1c04a439 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 11 May 2011 21:39:41 -0700 Subject: [PATCH 002/113] keep track of commands sent and received to aid debugging --- remoting/src/main/java/hudson/remoting/Channel.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/remoting/src/main/java/hudson/remoting/Channel.java b/remoting/src/main/java/hudson/remoting/Channel.java index 94049f82b1..e9931cbc6a 100644 --- a/remoting/src/main/java/hudson/remoting/Channel.java +++ b/remoting/src/main/java/hudson/remoting/Channel.java @@ -172,6 +172,7 @@ public class Channel implements VirtualChannel, IChannel { */ private final Vector listeners = new Vector(); private int gcCounter; + private int commandsSent; /** * Total number of nanoseconds spent for remote class loading. @@ -485,6 +486,7 @@ public class Channel implements VirtualChannel, IChannel { oos.flush(); // make sure the command reaches the other end. } finally { Channel.setCurrent(old); + commandsSent++; } // unless this is the last command, have OOS and remote OIS forget all the objects we sent // in this command. Otherwise it'll keep objects in memory unnecessarily. @@ -977,15 +979,18 @@ public class Channel implements VirtualChannel, IChannel { } private final class ReaderThread extends Thread { + private int commandsReceived = 0; + private int commandsExecuted = 0; + public ReaderThread(String name) { super("Channel reader thread: "+name); } @Override public void run() { - Command cmd = null; try { while(inClosed==null) { + Command cmd = null; try { Channel old = Channel.setCurrent(Channel.this); try { @@ -1000,7 +1005,10 @@ public class Channel implements VirtualChannel, IChannel { throw ioe; } catch (ClassNotFoundException e) { logger.log(Level.SEVERE, "Unable to read a command (channel " + name + ")",e); + } finally { + commandsReceived++; } + if(logger.isLoggable(Level.FINE)) logger.fine("Received "+cmd); try { @@ -1008,6 +1016,8 @@ public class Channel implements VirtualChannel, IChannel { } catch (Throwable t) { logger.log(Level.SEVERE, "Failed to execute command "+cmd+ " (channel " + name + ")",t); logger.log(Level.SEVERE, "This command is created here",cmd.createdAt); + } finally { + commandsExecuted++; } } ois.close(); From 5b03fb003c1e04d5b658197e6617d4846d85c2d3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 11 May 2011 21:46:49 -0700 Subject: [PATCH 003/113] Don't let the debug option in Maven to block Mavens forked from tests --- .../main/java/org/jvnet/hudson/test/HudsonTestCase.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index a6417608e5..7e492bcb45 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -1851,6 +1851,15 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { // DNS multicast support takes up a lot of time during tests, so just disable it altogether // this also prevents tests from falsely advertising Hudson DNSMultiCast.disabled = true; + + if (!Functions.isWindows()) { + try { + GNUCLibrary.LIBC.unsetenv("MAVEN_OPTS"); + GNUCLibrary.LIBC.unsetenv("MAVEN_DEBUG_OPTS"); + } catch (Exception e) { + LOGGER.log(Level.WARNING,"Failed to cancel out MAVEN_OPTS",e); + } + } } public static class TestBuildWrapper extends BuildWrapper { From f72743f107232b7023011e17ff9de5cd704e6447 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 11 May 2011 22:46:11 -0700 Subject: [PATCH 004/113] run the test with timeout option --- test/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index c85e124305..f8e2dc9fe4 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -53,9 +53,9 @@ THE SOFTWARE. - com.sun.maven + org.kohsuke maven-junit-plugin - 1.8 + 1.9 @@ -65,6 +65,7 @@ THE SOFTWARE. true ${concurrency} -Dfile.encoding=UTF-8 + 300 From d67f4c5ff89c2f595bd2b9d04c5abe765fd9b9f6 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 13 May 2011 14:23:17 -0700 Subject: [PATCH 005/113] doc improvement --- .../main/java/hudson/matrix/MatrixBuild.java | 3 +- .../matrix/listeners/MatrixBuildListener.java | 120 ++++++++++++------ 2 files changed, 86 insertions(+), 37 deletions(-) diff --git a/core/src/main/java/hudson/matrix/MatrixBuild.java b/core/src/main/java/hudson/matrix/MatrixBuild.java index 2d100136aa..1b5a070cb3 100644 --- a/core/src/main/java/hudson/matrix/MatrixBuild.java +++ b/core/src/main/java/hudson/matrix/MatrixBuild.java @@ -218,7 +218,8 @@ public class MatrixBuild extends AbstractBuild { Collection touchStoneConfigurations = new HashSet(); Collection delayedConfigurations = new HashSet(); for (MatrixConfiguration c: activeConfigurations) { - if (!MatrixBuildListener.buildConfiguration(MatrixBuild.this, c)) continue; + if (!MatrixBuildListener.buildConfiguration(MatrixBuild.this, c)) + continue; // skip rebuild if (touchStoneFilter != null && c.getCombination().evalGroovyExpression(p.getAxes(), p.getTouchStoneCombinationFilter())) { touchStoneConfigurations.add(c); } else { diff --git a/core/src/main/java/hudson/matrix/listeners/MatrixBuildListener.java b/core/src/main/java/hudson/matrix/listeners/MatrixBuildListener.java index a0b2ce018f..c1b2a1354c 100644 --- a/core/src/main/java/hudson/matrix/listeners/MatrixBuildListener.java +++ b/core/src/main/java/hudson/matrix/listeners/MatrixBuildListener.java @@ -1,36 +1,84 @@ -package hudson.matrix.listeners; - -import hudson.ExtensionList; -import hudson.ExtensionPoint; -import hudson.matrix.MatrixConfiguration; -import hudson.matrix.MatrixBuild; -import hudson.model.Hudson; - -public abstract class MatrixBuildListener implements ExtensionPoint { - - /** - * Determine whether to build a given configuration or not - * @param b - * @param c - * @return - */ - public boolean doBuildConfiguration(MatrixBuild b, MatrixConfiguration c){return true;} - - public static boolean buildConfiguration(MatrixBuild b, MatrixConfiguration c) { - for (MatrixBuildListener l : all()) { - if(!l.doBuildConfiguration(b, c)) { - return false; - } - - } - - return true; - } - - /** - * Returns all the registered {@link MatrixBuildListener} descriptors. - */ - public static ExtensionList all() { - return Hudson.getInstance().getExtensionList(MatrixBuildListener.class); - } -} +/* + * The MIT License + * + * Copyright (c) 2011, Christian Wolfgang + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package hudson.matrix.listeners; + +import hudson.ExtensionList; +import hudson.ExtensionPoint; +import hudson.matrix.MatrixConfiguration; +import hudson.matrix.MatrixBuild; +import hudson.matrix.MatrixRun; +import hudson.model.Action; +import hudson.model.Hudson; +import hudson.model.Queue; +import hudson.model.Queue.Task; + +import java.util.List; + +/** + * Controls which subset of {@link MatrixRun}s to rebuild. + * + *

+ * Plugins can implement this extension point to filter out the subset of matrix project to build. + * Most typically, such a plugin would add a custom {@link Action} to a build when it goes to the queue + * ({@link Queue#schedule(Task, int, List)}, then access this from {@link MatrixBuild} to drive + * the filtering logic. + * + *

+ * See the matrix reloaded plugin for an example. + * + * @author Christian Wolfgang + * @since 1.413 + */ +public abstract class MatrixBuildListener implements ExtensionPoint { + /** + * Determine whether to build a given configuration or not + * + * @param b + * Never null. The umbrella build. + * @param c + * The configuration whose build is being considered. If any of the {@link MatrixBuildListener} + * returns false, then the build for this configuration is skipped, and the previous build + * of this configuration will be taken as the default result. + * @return + * True to let the build happen, false to skip it. + */ + public abstract boolean doBuildConfiguration(MatrixBuild b, MatrixConfiguration c); + + public static boolean buildConfiguration(MatrixBuild b, MatrixConfiguration c) { + for (MatrixBuildListener l : all()) { + if(!l.doBuildConfiguration(b, c)) { + return false; + } + } + + return true; + } + + /** + * Returns all the registered {@link MatrixBuildListener} descriptors. + */ + public static ExtensionList all() { + return Hudson.getInstance().getExtensionList(MatrixBuildListener.class); + } +} From 0203876cb01f0cfee1c790a3102a3508ff4f6a48 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 13 May 2011 14:25:15 -0700 Subject: [PATCH 006/113] [FIXED JENKINS-1613] Ability to build on configurable subset of matrix configurations This change introduces the necessary extension point. The implementation of this will be in a plugin. --- changelog.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.html b/changelog.html index af18612e06..935e990139 100644 --- a/changelog.html +++ b/changelog.html @@ -64,6 +64,9 @@ Upcoming changes

  • Fixed a ClassCastException caused by multiple loading of the same class in different classloaders. (issue 9017) +
  • + Support rebuilding a subset of matrix configurations + (issue 1613)
  • Gracefully handle old slave.jar to avoid AbstractMethodError (thread) From 8578e5801fe67b01966e76931e64c3d222b86375 Mon Sep 17 00:00:00 2001 From: bap2000 Date: Sat, 14 May 2011 17:20:33 +0100 Subject: [PATCH 007/113] Add @default for repeatable and repeatableProperty jelly tags --- .../main/resources/lib/form/repeatable.jelly | 7 +- .../lib/form/repeatableProperty.jelly | 5 +- .../java/lib/form/RepeatablePropertyTest.java | 159 ++++++++++++++++++ .../test/java/lib/form/RepeatableTest.java | 57 +++++++ .../ExcitingObject/config.jelly | 31 ++++ .../RepeatablePropertyTest/noDefault.jelly | 41 +++++ .../RepeatablePropertyTest/withDefault.jelly | 41 +++++ .../form/RepeatableTest/defaultForField.jelly | 48 ++++++ .../form/RepeatableTest/defaultForItems.jelly | 46 +++++ 9 files changed, 432 insertions(+), 3 deletions(-) create mode 100644 test/src/test/java/lib/form/RepeatablePropertyTest.java create mode 100644 test/src/test/resources/lib/form/RepeatablePropertyTest/ExcitingObject/config.jelly create mode 100644 test/src/test/resources/lib/form/RepeatablePropertyTest/noDefault.jelly create mode 100644 test/src/test/resources/lib/form/RepeatablePropertyTest/withDefault.jelly create mode 100644 test/src/test/resources/lib/form/RepeatableTest/defaultForField.jelly create mode 100644 test/src/test/resources/lib/form/RepeatableTest/defaultForItems.jelly diff --git a/core/src/main/resources/lib/form/repeatable.jelly b/core/src/main/resources/lib/form/repeatable.jelly index ae8ab7b821..7268f72da0 100644 --- a/core/src/main/resources/lib/form/repeatable.jelly +++ b/core/src/main/resources/lib/form/repeatable.jelly @@ -81,6 +81,9 @@ THE SOFTWARE. The item collection to loop over. Required unless @field is given. + + Use this collection for items if items or @field is null + true if the default 'add' button (that adds a new copy) shouldn't be displayed. When you use this attribute, @@ -107,14 +110,14 @@ THE SOFTWARE. - + - + diff --git a/core/src/main/resources/lib/form/repeatableProperty.jelly b/core/src/main/resources/lib/form/repeatableProperty.jelly index 3a36c94cda..772fc6f0ef 100644 --- a/core/src/main/resources/lib/form/repeatableProperty.jelly +++ b/core/src/main/resources/lib/form/repeatableProperty.jelly @@ -31,6 +31,9 @@ THE SOFTWARE. Used for the data binding. + + The default value to use for this collection when 'instance[field]' is null. + true if the default 'add' button (that adds a new copy) shouldn't be displayed. When you use this attribute, @@ -49,7 +52,7 @@ THE SOFTWARE. - +
    diff --git a/test/src/test/java/lib/form/RepeatablePropertyTest.java b/test/src/test/java/lib/form/RepeatablePropertyTest.java new file mode 100644 index 0000000000..825ffadf10 --- /dev/null +++ b/test/src/test/java/lib/form/RepeatablePropertyTest.java @@ -0,0 +1,159 @@ +/* + * The MIT License + * + * Copyright (C) 2010-2011 by Anthony Robinson + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package lib.form; + +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import com.gargoylesoftware.htmlunit.html.HtmlTextInput; +import hudson.Extension; +import hudson.model.Describable; +import hudson.model.Descriptor; +import hudson.model.Hudson; +import org.jvnet.hudson.test.HudsonTestCase; +import org.kohsuke.stapler.DataBoundConstructor; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class RepeatablePropertyTest extends HudsonTestCase implements Describable { + + private static final String VIEW_WITHOUT_DEFAULT = "noDefault"; + private static final String VIEW_WITH_DEFAULT = "withDefault"; + + public ArrayList testRepeatable; + public ArrayList defaults; + + public void testSimple() throws Exception { + testRepeatable = createRepeatable(); + assertFormContents(VIEW_WITHOUT_DEFAULT, testRepeatable); + } + + public void testNullFieldNoDefault() throws Exception { + assertFormContents(VIEW_WITHOUT_DEFAULT, new ArrayList()); + } + + public void testNullFieldWithDefault() throws Exception { + defaults = createRepeatable(); + assertFormContents(VIEW_WITH_DEFAULT, defaults); + } + + public void testFieldNotNullWithDefaultIgnoresDefaults() throws Exception { + testRepeatable = createRepeatable(); + defaults = new ArrayList(Arrays.asList( + new ExcitingObject("This default should be ignored"), + new ExcitingObject("Ignore me too") + )); + assertFormContents(VIEW_WITH_DEFAULT, testRepeatable); + } + + private void assertFormContents(final String viewName, final ArrayList expected) throws Exception { + final HtmlForm form = getForm(viewName); + final List inputs = toTextInputList(form.getElementsByAttribute("input", "type", "text")); + assertEquals("size", expected.size(), inputs.size()); + for (int i = 0; i < expected.size(); i++) + assertEquals(expected.get(i).greatProperty, inputs.get(i).getValueAttribute()); + } + + private List toTextInputList(final List inputs) { + assertNotNull(inputs); + final List textInputList = new ArrayList(); + for (HtmlElement input : inputs) { + assertTrue(input instanceof HtmlTextInput); + textInputList.add((HtmlTextInput) input); + } + return textInputList; + } + + private ArrayList createRepeatable() { + return new ArrayList(Arrays.asList( + new ExcitingObject("A nice thing"), + new ExcitingObject("I'm even better"), + new ExcitingObject("Don't bother, I'm not exciting at all") + )); + } + + private HtmlForm getForm(final String viewName) throws Exception { + final HtmlPage page = createWebClient().goTo("self/" + viewName); + final HtmlForm form = page.getFormByName("config"); + return form; + } + + public DescriptorImpl getDescriptor() { + return hudson.getDescriptorByType(DescriptorImpl.class); + } + + @Extension + public static final class DescriptorImpl extends Descriptor { + @Override + public String getDisplayName() { + return "RepeatablePropertyTest"; + } + } + + public static final class ExcitingObject implements Describable { + private final String greatProperty; + @DataBoundConstructor + public ExcitingObject(final String greatProperty) { + this.greatProperty = greatProperty; + } + public String getGreatProperty() { + return greatProperty; + } + public Descriptor getDescriptor() { + return Hudson.getInstance().getDescriptor(ExcitingObject.class); + } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ExcitingObject that = (ExcitingObject) o; + if (greatProperty != null ? !greatProperty.equals(that.greatProperty) : that.greatProperty != null) + return false; + return true; + } + @Override + public int hashCode() { + return greatProperty != null ? greatProperty.hashCode() : 0; + } + @Override + public String toString() { + return "ExcitingObject[" + greatProperty + ']'; + } + + @Extension + public static final class ExcitingDescriptor extends Descriptor { + public ExcitingDescriptor() { + super(ExcitingObject.class); + } + @Override + public String getDisplayName() { + return "This is an awesome thing!"; + } + } + } + +} diff --git a/test/src/test/java/lib/form/RepeatableTest.java b/test/src/test/java/lib/form/RepeatableTest.java index aa7b2b2166..71e45ba1a0 100644 --- a/test/src/test/java/lib/form/RepeatableTest.java +++ b/test/src/test/java/lib/form/RepeatableTest.java @@ -53,6 +53,7 @@ public class RepeatableTest extends HudsonTestCase { private Class bindClass; private List bindResult; public List list = new ArrayList(); + public List defaults = null; public Integer minimum = null; public void doSubmitTest(StaplerRequest req) throws Exception { @@ -135,6 +136,62 @@ public class RepeatableTest extends HudsonTestCase { + "{\"bool\":true,\"txt\":\"existing two\"},{\"bool\":false,\"txt\":\"new one\"}]", formData.get("foos").toString()); } + + public void testNoData() throws Exception { + list = null; + defaults = null; + gotoAndSubmitConfig("defaultForField"); + assertNull(formData.get("list")); + + gotoAndSubmitConfig("defaultForItems"); + assertNull(formData.get("list")); + } + + public void testItemsWithDefaults() throws Exception { + assertWithDefaults("defaultForItems"); + } + + public void testItemsDefaultsIgnoredIfFieldHasData() throws Exception { + assertDefaultsIgnoredIfHaveData("defaultForItems"); + } + + public void testFieldWithDefaults() throws Exception { + assertWithDefaults("defaultForField"); + } + + public void testFieldDefaultsIgnoredIfFieldHasData() throws Exception { + assertDefaultsIgnoredIfHaveData("defaultForField"); + } + + private void addDefaults() { + defaults = new ArrayList(); + defaults.add(new Foo("default one", true)); + defaults.add(new Foo("default two", false)); + } + + private void assertWithDefaults(final String viewName) throws Exception { + list = null; + addDefaults(); + gotoAndSubmitConfig(viewName); + assertNotNull(formData.get("list")); + assertEquals("[{\"bool\":true,\"txt\":\"default one\"},{\"bool\":false,\"txt\":\"default two\"}]", + formData.get("list").toString()); + } + + private void assertDefaultsIgnoredIfHaveData(final String viewName) throws Exception { + addData(); + addDefaults(); + gotoAndSubmitConfig(viewName); + assertNotNull(formData.get("list")); + assertEquals("[{\"bool\":true,\"txt\":\"existing one\"},{\"bool\":false,\"txt\":\"existing two\"}]", + formData.get("list").toString()); + } + + private void gotoAndSubmitConfig(final String viewName) throws Exception { + HtmlPage p = createWebClient().goTo("self/" + viewName); + HtmlForm f = p.getFormByName("config"); + submit(f); + } // ======================================================================== diff --git a/test/src/test/resources/lib/form/RepeatablePropertyTest/ExcitingObject/config.jelly b/test/src/test/resources/lib/form/RepeatablePropertyTest/ExcitingObject/config.jelly new file mode 100644 index 0000000000..44a1137d62 --- /dev/null +++ b/test/src/test/resources/lib/form/RepeatablePropertyTest/ExcitingObject/config.jelly @@ -0,0 +1,31 @@ + + + + + + + + + diff --git a/test/src/test/resources/lib/form/RepeatablePropertyTest/noDefault.jelly b/test/src/test/resources/lib/form/RepeatablePropertyTest/noDefault.jelly new file mode 100644 index 0000000000..239e6977ec --- /dev/null +++ b/test/src/test/resources/lib/form/RepeatablePropertyTest/noDefault.jelly @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + diff --git a/test/src/test/resources/lib/form/RepeatablePropertyTest/withDefault.jelly b/test/src/test/resources/lib/form/RepeatablePropertyTest/withDefault.jelly new file mode 100644 index 0000000000..880a7e380f --- /dev/null +++ b/test/src/test/resources/lib/form/RepeatablePropertyTest/withDefault.jelly @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + diff --git a/test/src/test/resources/lib/form/RepeatableTest/defaultForField.jelly b/test/src/test/resources/lib/form/RepeatableTest/defaultForField.jelly new file mode 100644 index 0000000000..387880b938 --- /dev/null +++ b/test/src/test/resources/lib/form/RepeatableTest/defaultForField.jelly @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + +
    +
    + + + +
    +
    +
    +
    diff --git a/test/src/test/resources/lib/form/RepeatableTest/defaultForItems.jelly b/test/src/test/resources/lib/form/RepeatableTest/defaultForItems.jelly new file mode 100644 index 0000000000..5870443180 --- /dev/null +++ b/test/src/test/resources/lib/form/RepeatableTest/defaultForItems.jelly @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + +
    +
    + + + +
    +
    +
    +
    From ba5ea333fe4cc0707659f60386ea72746efe62b5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 16 May 2011 09:39:48 -0700 Subject: [PATCH 008/113] [maven-release-plugin] prepare release jenkins-1_412 --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 5b16b696ff..f3bef0ff1e 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jenkins-ci.main - 1.412-SNAPSHOT + 1.412 cli Jenkins CLI diff --git a/core/pom.xml b/core/pom.xml index e8e5642821..184440cd31 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.412-SNAPSHOT + 1.412 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index ef691ae5e8..3de98c9905 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.412-SNAPSHOT + 1.412 maven-plugin diff --git a/pom.xml b/pom.xml index 97226385c9..7ab32a94b7 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.412-SNAPSHOT + 1.412 pom Jenkins main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 6e785c648c..efd3df1d6e 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.412-SNAPSHOT + 1.412 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index f8e2dc9fe4..6b92cf974a 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jenkins-ci.main - 1.412-SNAPSHOT + 1.412 4.0.0 org.jenkins-ci.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 4e63fef7c1..4cb2fe1b90 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.412-SNAPSHOT + 1.412 ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 7c0d5e8501..7d587c7839 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.412-SNAPSHOT + 1.412 ../pom.xml From 9d57d5733bc646ed3754dd3c4bfdc4682fd70625 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 16 May 2011 09:39:57 -0700 Subject: [PATCH 009/113] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index f3bef0ff1e..4f7aca5506 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jenkins-ci.main - 1.412 + 1.413-SNAPSHOT cli Jenkins CLI diff --git a/core/pom.xml b/core/pom.xml index 184440cd31..491d380851 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.412 + 1.413-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 3de98c9905..18dc20c0a1 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.412 + 1.413-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 7ab32a94b7..be3998ddfd 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.412 + 1.413-SNAPSHOT pom Jenkins main module diff --git a/remoting/pom.xml b/remoting/pom.xml index efd3df1d6e..592750a474 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.412 + 1.413-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 6b92cf974a..7445c1a543 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jenkins-ci.main - 1.412 + 1.413-SNAPSHOT 4.0.0 org.jenkins-ci.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 4cb2fe1b90..3f06ac5779 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.412 + 1.413-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 7d587c7839..37e085eecf 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.412 + 1.413-SNAPSHOT ../pom.xml From f6d0710eb3ab3e16d174bb64f12b51026a426f31 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 16 May 2011 09:53:34 -0700 Subject: [PATCH 010/113] updated changelog for release --- changelog.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog.html b/changelog.html index 0c69c591e5..e39e9920f2 100644 --- a/changelog.html +++ b/changelog.html @@ -61,13 +61,15 @@ Upcoming changes +

    What's new in 1.412 (2011/05/16)

    • Wait until updates are successfully installed before restarting Jenkins (issue 5047)
    -

    What's new in 1.411 (2011/05/09)

    • From 70acc1a076133d2fbdd0bbb52e5526868ddb9f44 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 16 May 2011 09:53:34 -0700 Subject: [PATCH 011/113] releasing a new plugin parent POM --- plugins/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index 42e2b9595c..3776db86cb 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -10,7 +10,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.412-SNAPSHOT + 1.412 pom org.jenkins-ci.main maven-plugin - 1.412-SNAPSHOT + 1.412 @@ -43,25 +43,25 @@ org.jenkins-ci.main jenkins-war war - 1.412-SNAPSHOT + 1.412 test org.jenkins-ci.main jenkins-core - 1.412-SNAPSHOT + 1.412 provided org.jenkins-ci.main jenkins-test-harness - 1.412-SNAPSHOT + 1.412 test org.jenkins-ci.main ui-samples-plugin - 1.412-SNAPSHOT + 1.412 test From a437c8b1e183ec6b31e34634cdc2c4a7c4b14d1a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 16 May 2011 09:53:41 -0700 Subject: [PATCH 012/113] toward the next release --- plugins/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index 3776db86cb..857c5c2be7 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -10,7 +10,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.412 + 1.413-SNAPSHOT pom org.jenkins-ci.main maven-plugin - 1.412 + 1.413-SNAPSHOT @@ -43,25 +43,25 @@ org.jenkins-ci.main jenkins-war war - 1.412 + 1.413-SNAPSHOT test org.jenkins-ci.main jenkins-core - 1.412 + 1.413-SNAPSHOT provided org.jenkins-ci.main jenkins-test-harness - 1.412 + 1.413-SNAPSHOT test org.jenkins-ci.main ui-samples-plugin - 1.412 + 1.413-SNAPSHOT test From 200bcaf27df8fa94eed21608a687a59810450f60 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 16 May 2011 09:57:12 -0700 Subject: [PATCH 013/113] 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 fc157ee557..c0a44a1983 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +jenkins (1.412) unstable; urgency=low + + * See http://jenkins-ci.org/changelog for more details. + + -- Kohsuke Kawaguchi Mon, 16 May 2011 09:54:33 -0700 + jenkins (1.411) unstable; urgency=low * See http://jenkins-ci.org/changelog for more details. From 6ae77ed34a29fb9200371a57603dc95d8df1ffb9 Mon Sep 17 00:00:00 2001 From: Mirko Friedenhagen Date: Fri, 13 May 2011 21:57:11 +0200 Subject: [PATCH 014/113] [FIXED JENKINS-9691] Boldify names of executed mojos for Freestyle and Maven2/3 jobs using Maven3 in console output. With Maven3 the output format for mojos has changed: - Add a new Maven3MojoNote and use it in MavenConsoleAnnotator. - This is sufficient for Freestyle jobs running Maven2 or 3 and Maven2/3 jobs running Maven 2. - Maven2/3 jobs running Maven 3 are using ExecutionEventLogger for printing start of mojo execution to console. --- changelog.html | 3 + .../hudson/tasks/_maven/Maven3MojoNote.java | 68 +++++++++++++++++++ .../tasks/_maven/MavenConsoleAnnotator.java | 4 ++ .../tasks/_maven/Maven3MojoNoteTest.java | 38 +++++++++++ .../maven/util/ExecutionEventLogger.java | 14 +++- 5 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 core/src/main/java/hudson/tasks/_maven/Maven3MojoNote.java create mode 100644 core/src/test/java/hudson/tasks/_maven/Maven3MojoNoteTest.java diff --git a/changelog.html b/changelog.html index d49a60b0e7..6d25b7061f 100644 --- a/changelog.html +++ b/changelog.html @@ -82,6 +82,9 @@ Upcoming changes
    • Replaced all gif images with png images (transparency support). (issue 3969) +
    • + Boldify names of executed mojos for Freestyle and Maven2/3 jobs using Maven3 in console output. + (issue 9691)
    diff --git a/core/src/main/java/hudson/tasks/_maven/Maven3MojoNote.java b/core/src/main/java/hudson/tasks/_maven/Maven3MojoNote.java new file mode 100644 index 0000000000..8dfb2c7d91 --- /dev/null +++ b/core/src/main/java/hudson/tasks/_maven/Maven3MojoNote.java @@ -0,0 +1,68 @@ +/* + * The MIT License + * + * Copyright (c) 2010, InfraDNA, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package hudson.tasks._maven; + +import hudson.Extension; +import hudson.MarkupText; +import hudson.console.ConsoleAnnotationDescriptor; +import hudson.console.ConsoleAnnotator; +import hudson.console.ConsoleNote; + +import java.util.regex.Pattern; + +/** + * Marks the log line that reports that Maven3 is executing a mojo. + * It'll look something like this: + * + *
    [INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ jobConfigHistory ---
    + * + * or + * + *
    [INFO] --- gmaven-plugin:1.0-rc-5:generateTestStubs (test-in-groovy) @ jobConfigHistory ---
    + * + * or + * + *
    [INFO] --- cobertura-maven-plugin:2.4:instrument (report:cobertura) @ sardine ---
    + * + * @author Mirko Friedenhagen + */ +public class Maven3MojoNote extends ConsoleNote { + public Maven3MojoNote() { + } + + @Override + public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) { + text.addMarkup(7,text.length(),"",""); + return null; + } + + @Extension + public static final class DescriptorImpl extends ConsoleAnnotationDescriptor { + public String getDisplayName() { + return "Maven 3 Mojos"; + } + } + + public static Pattern PATTERN = Pattern.compile("\\[INFO\\] --- .+-plugin:[^:]+:[^ ]+ \\(.+\\) @ .+ ---"); +} diff --git a/core/src/main/java/hudson/tasks/_maven/MavenConsoleAnnotator.java b/core/src/main/java/hudson/tasks/_maven/MavenConsoleAnnotator.java index bb668ff827..dfbe86cbc2 100644 --- a/core/src/main/java/hudson/tasks/_maven/MavenConsoleAnnotator.java +++ b/core/src/main/java/hudson/tasks/_maven/MavenConsoleAnnotator.java @@ -60,6 +60,10 @@ public class MavenConsoleAnnotator extends LineTransformationOutputStream { if (m.matches()) new MavenMojoNote().encodeTo(out); + m = Maven3MojoNote.PATTERN.matcher(line); + if (m.matches()) + new Maven3MojoNote().encodeTo(out); + m = MavenWarningNote.PATTERN.matcher(line); if (m.find()) new MavenWarningNote().encodeTo(out); diff --git a/core/src/test/java/hudson/tasks/_maven/Maven3MojoNoteTest.java b/core/src/test/java/hudson/tasks/_maven/Maven3MojoNoteTest.java new file mode 100644 index 0000000000..421632e868 --- /dev/null +++ b/core/src/test/java/hudson/tasks/_maven/Maven3MojoNoteTest.java @@ -0,0 +1,38 @@ +package hudson.tasks._maven; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import hudson.MarkupText; + +import org.junit.Test; + +public class Maven3MojoNoteTest { + + @Test + public void testAnnotateMavenPlugin() { + check("[INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ jobConfigHistory ---", "[INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ jobConfigHistory ---"); + } + + @Test + public void testAnnotateCodehausPlugin() { + check("[INFO] --- cobertura-maven-plugin:2.4:instrument (report:cobertura) @ sardine ---", "[INFO] --- cobertura-maven-plugin:2.4:instrument (report:cobertura) @ sardine ---"); + + } + + @Test + public void testAnnotateOtherPlugin() { + check("[INFO] --- gmaven-plugin:1.0-rc-5:generateTestStubs (test-in-groovy) @ jobConfigHistory ---", "[INFO] --- gmaven-plugin:1.0-rc-5:generateTestStubs (test-in-groovy) @ jobConfigHistory ---"); + } + + private void check(final String decorated, final String input) { + assertTrue(input + " does not match" + Maven3MojoNote.PATTERN, Maven3MojoNote.PATTERN.matcher(input).matches()); + assertEquals(decorated, annotate(input)); + } + + private String annotate(String text) { + final MarkupText markupText = new MarkupText(text); + new Maven3MojoNote().annotate(new Object(), markupText, 0); + return markupText.toString(true); + } + +} diff --git a/maven-plugin/src/main/java/hudson/maven/util/ExecutionEventLogger.java b/maven-plugin/src/main/java/hudson/maven/util/ExecutionEventLogger.java index 754b70d5c0..f27f2ddb84 100644 --- a/maven-plugin/src/main/java/hudson/maven/util/ExecutionEventLogger.java +++ b/maven-plugin/src/main/java/hudson/maven/util/ExecutionEventLogger.java @@ -19,6 +19,9 @@ package hudson.maven.util; * under the License. */ +import hudson.tasks._maven.Maven3MojoNote; + +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -261,13 +264,18 @@ public class ExecutionEventLogger { if ( logger.isInfoEnabled() ) { - StringBuilder buffer = new StringBuilder( 128 ); - + final Maven3MojoNote note = new Maven3MojoNote(); + final StringBuilder buffer = new StringBuilder( 128 ); + try { + buffer.append( note.encode() ); + } catch ( IOException e ) { + // As we use only memory buffers this should not happen, ever. + throw new RuntimeException( "Could not encode note?", e ); + } buffer.append( "--- " ); append( buffer, event.getMojoExecution() ); append( buffer, event.getProject() ); buffer.append( " ---" ); - logger.info( "" ); logger.info( buffer.toString() ); } From 5f3c463b014547a9e58adb06e4a83eedf3ddd503 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 16 May 2011 14:35:51 -0700 Subject: [PATCH 015/113] creating an RC branch --- changelog.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/changelog.html b/changelog.html index d49a60b0e7..cda6681e05 100644 --- a/changelog.html +++ b/changelog.html @@ -54,6 +54,14 @@ Upcoming changes + + + - - -

    What's new in 1.412 (2011/05/16)

      From 274143341d6e0e569660dc4e2afdf06bb5334b9e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 16 May 2011 14:35:54 -0700 Subject: [PATCH 016/113] the trunk is toward 1.414-SNAPSHOT --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- plugins/pom.xml | 12 ++++++------ pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 4f7aca5506..2c1401d549 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jenkins-ci.main - 1.413-SNAPSHOT + 1.414-SNAPSHOT cli Jenkins CLI diff --git a/core/pom.xml b/core/pom.xml index 491d380851..c33818e1cc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413-SNAPSHOT + 1.414-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 18dc20c0a1..109276d681 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413-SNAPSHOT + 1.414-SNAPSHOT maven-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index 857c5c2be7..174f80e361 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -10,7 +10,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.413-SNAPSHOT + 1.414-SNAPSHOT pom org.jenkins-ci.main maven-plugin - 1.413-SNAPSHOT + 1.414-SNAPSHOT @@ -43,25 +43,25 @@ org.jenkins-ci.main jenkins-war war - 1.413-SNAPSHOT + 1.414-SNAPSHOT test org.jenkins-ci.main jenkins-core - 1.413-SNAPSHOT + 1.414-SNAPSHOT provided org.jenkins-ci.main jenkins-test-harness - 1.413-SNAPSHOT + 1.414-SNAPSHOT test org.jenkins-ci.main ui-samples-plugin - 1.413-SNAPSHOT + 1.414-SNAPSHOT test diff --git a/pom.xml b/pom.xml index be3998ddfd..98516d2d93 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413-SNAPSHOT + 1.414-SNAPSHOT pom Jenkins main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 592750a474..81e0e3c51a 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413-SNAPSHOT + 1.414-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 7445c1a543..733068c14e 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jenkins-ci.main - 1.413-SNAPSHOT + 1.414-SNAPSHOT 4.0.0 org.jenkins-ci.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 3f06ac5779..556211859a 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.413-SNAPSHOT + 1.414-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 37e085eecf..11528ecaa5 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413-SNAPSHOT + 1.414-SNAPSHOT ../pom.xml From 642f3011f93f558849262981715d56e3945899f7 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 16 May 2011 14:59:50 -0700 Subject: [PATCH 017/113] The getRun method behaviour changed slightly. --- core/src/main/java/hudson/matrix/MatrixBuild.java | 15 +++++++++++++++ .../groovy/hudson/matrix/MatrixProjectTest.groovy | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/matrix/MatrixBuild.java b/core/src/main/java/hudson/matrix/MatrixBuild.java index 1b5a070cb3..824e998137 100644 --- a/core/src/main/java/hudson/matrix/MatrixBuild.java +++ b/core/src/main/java/hudson/matrix/MatrixBuild.java @@ -138,6 +138,21 @@ public class MatrixBuild extends AbstractBuild { return r; } + /** + * Returns all {@link MatrixRun}s for this {@link MatrixBuild}. + *

      + * Unlike {@link #getExactRuns()}, this method excludes those runs + * that didn't run and got inherited. + */ + public List getExactRuns() { + List r = new ArrayList(); + for(MatrixConfiguration c : getParent().getItems()) { + MatrixRun b = c.getBuildByNumber(getNumber()); + if (b != null) r.add(b); + } + return r; + } + @Override public String getWhyKeepLog() { MatrixBuild b = getNextBuild(); diff --git a/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy b/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy index 71669b05c8..f2c23b632b 100644 --- a/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy +++ b/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy @@ -122,7 +122,7 @@ public class MatrixProjectTest extends HudsonTestCase { p.getBuildersList().add(new UnstableBuilder()); build = p.scheduleBuild2(0).get(); - assertEquals(2, build.getRuns().size()); + assertEquals(2, build.exactRuns.size()); } @Override From 872b4dfb72b6aa7d39edabe383b4a7a3c0d06f9d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 16 May 2011 15:31:04 -0700 Subject: [PATCH 018/113] fixed a ConcurrentModificationException during startup --- changelog.html | 3 ++- core/src/main/java/hudson/PluginManager.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog.html b/changelog.html index cda6681e05..8d301a0a00 100644 --- a/changelog.html +++ b/changelog.html @@ -55,7 +55,8 @@ Upcoming changes

      diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index c288bfa2a9..4022f48a63 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -74,6 +74,7 @@ import java.util.Map; import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Level; import java.util.logging.Logger; @@ -91,7 +92,7 @@ public abstract class PluginManager extends AbstractModelObject { /** * All active plugins. */ - protected final List activePlugins = new ArrayList(); + protected final List activePlugins = new CopyOnWriteArrayList(); protected final List failedPlugins = new ArrayList(); From 70da17ed10d55122944fabf71cc396ef427ca4a2 Mon Sep 17 00:00:00 2001 From: Christopher Orr Date: Tue, 17 May 2011 01:28:29 +0200 Subject: [PATCH 019/113] [FIXED JENKINS-9699] Fix unescaped apostrophe in French translation. --- core/src/main/resources/hudson/triggers/Messages_fr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/triggers/Messages_fr.properties b/core/src/main/resources/hudson/triggers/Messages_fr.properties index 015458c182..58f50abe59 100644 --- a/core/src/main/resources/hudson/triggers/Messages_fr.properties +++ b/core/src/main/resources/hudson/triggers/Messages_fr.properties @@ -24,4 +24,4 @@ SCMTrigger.DisplayName=Scruter l''outil de gestion de version SCMTrigger.getDisplayName=Log du dernier accès à {0} SCMTrigger.SCMTriggerCause.ShortDescription=Un changement dans la base de code a provoqué le lancement de ce job TimerTrigger.DisplayName=Construire périodiquement -TimerTrigger.TimerTriggerCause.ShortDescription=L''échéance d'une alarme périodique a provoqué le lancement de ce job +TimerTrigger.TimerTriggerCause.ShortDescription=L''\u00e9\u00e9ch\u00e9ance d''une alarme p\u00e9riodique a provoqu\u00e9 le lancement de ce job From 008bb9db6541782288138923feedb6b2fe9481b3 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Wed, 18 May 2011 13:05:24 +0200 Subject: [PATCH 020/113] [FIXED JENKINS-6958] Make name parameter of create-job mandatory. --- core/src/main/java/hudson/cli/CreateJobCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/cli/CreateJobCommand.java b/core/src/main/java/hudson/cli/CreateJobCommand.java index 3f0c522c02..f640ae61a5 100644 --- a/core/src/main/java/hudson/cli/CreateJobCommand.java +++ b/core/src/main/java/hudson/cli/CreateJobCommand.java @@ -40,7 +40,7 @@ public class CreateJobCommand extends CLICommand { return "Creates a new job by reading stdin as a configuration XML file"; } - @Argument(metaVar="NAME",usage="Name of the job to create") + @Argument(metaVar="NAME",usage="Name of the job to create",required=true) public String name; protected int run() throws Exception { From 1ead9d3d3cfa356b748c2268c57d248b0e4f6f67 Mon Sep 17 00:00:00 2001 From: bap2000 Date: Wed, 18 May 2011 18:20:13 +0100 Subject: [PATCH 021/113] Add since tag to FilePath.list(includes, excludes) --- core/src/main/java/hudson/FilePath.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index 57c3fa2133..f4591a46e6 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/core/src/main/java/hudson/FilePath.java @@ -1211,6 +1211,7 @@ public final class FilePath implements Serializable { * See {@link FileSet} for the syntax. String like "foo/*.zip" or "foo/**/*.xml" * @return * can be empty but always non-null. + * @since 1.407 */ public FilePath[] list(final String includes, final String excludes) throws IOException, InterruptedException { return act(new FileCallable() { From 75a4dc09f8522ecdbcd06333742a79f6e8ee7ff9 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Thu, 19 May 2011 10:19:37 +0200 Subject: [PATCH 022/113] Directly show the restart link when Jenkins needs a restart. --- .../model/UpdateCenter/CoreUpdateMonitor/message.properties | 2 +- .../model/UpdateCenter/CoreUpdateMonitor/message_de.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.properties index 6579823d6f..08c42679a1 100644 --- a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.properties +++ b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.properties @@ -22,5 +22,5 @@ NewVersionAvailable=New version of Jenkins ({0}) is available for download \ (changelog). -UpgradeComplete=Upgrade to Jenkins {0} is complete, awaiting restart. +UpgradeComplete=Upgrade to Jenkins {0} is complete, awaiting restart. UpgradeProgress=Upgrade to Jenkins {0} is in progress or failed. diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_de.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_de.properties index ad82c6980c..b0102ce16d 100644 --- a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_de.properties +++ b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_de.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -UpgradeComplete=Aktualisierung auf Jenkins {0} abgeschlossen. Neustart von Jenkins erforderlich. +UpgradeComplete=Aktualisierung auf Jenkins {0} abgeschlossen. Neustart von Jenkins erforderlich. UpgradeProgress=Aktualisierung auf Jenkins {0} in Arbeit oder fehlgeschlagen. NewVersionAvailable=\ Eine neue Version von Jenkins ({0}) kann heruntergeladen werden \ From 208c7b613c9bc380e1e6f377be789e09f936bb84 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Thu, 19 May 2011 10:19:51 +0200 Subject: [PATCH 023/113] [JENKINS-6958] Added changelog. --- changelog.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.html b/changelog.html index 4a11ffe342..ad52e16cff 100644 --- a/changelog.html +++ b/changelog.html @@ -57,6 +57,9 @@ Upcoming changes
      • Fixed the concurrent modification exception in classloading during startup +
      • + Show an error message if no name is provided when creating a job (CLI) + (issue 6958)
      From 9610fe55c17853ef2f7e0eb39ce1333c6346270c Mon Sep 17 00:00:00 2001 From: Slide Date: Fri, 13 May 2011 10:03:50 -0700 Subject: [PATCH 024/113] [FIXED JENKINS-9671] Set NODE_NAME to master for "master" node --- core/src/main/java/hudson/model/Run.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index a836fadb6f..071d5cc746 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -43,6 +43,7 @@ import hudson.matrix.MatrixRun; import hudson.model.Descriptor.FormException; import hudson.model.listeners.RunListener; import hudson.model.listeners.SaveableListener; +import hudson.model.Hudson.MasterComputer; import hudson.search.SearchIndexBuilder; import hudson.security.ACL; import hudson.security.AccessControlled; @@ -1791,7 +1792,11 @@ public abstract class Run ,RunT extends Run Date: Thu, 19 May 2011 17:07:37 -0700 Subject: [PATCH 025/113] Adding merged pull requests to changelog --- changelog.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/changelog.html b/changelog.html index ad52e16cff..5198b5177c 100644 --- a/changelog.html +++ b/changelog.html @@ -60,6 +60,14 @@ Upcoming changes
    • Show an error message if no name is provided when creating a job (CLI) (issue 6958) +
    • + Fix unescaped apostrophe in French translation. + (issue 9699) +
    • + Set NODE_NAME for master node to "master" + (issue 9671) +
    • + Add a default attribute to repeatableProperty and repeatable jelly tags
    From e3a0be90cf61c686ef5c7a4af9f1e11b19a2038b Mon Sep 17 00:00:00 2001 From: laurents59 Date: Fri, 20 May 2011 09:18:54 +0200 Subject: [PATCH 026/113] Fixed unescaped apostrophe in french translation. --- .../main/resources/hudson/model/Hudson/legend_fr.properties | 2 +- core/src/main/resources/hudson/model/Messages_fr.properties | 4 ++-- .../resources/hudson/model/Run/confirmDelete_fr.properties | 2 +- .../hudson/util/DoubleLaunchChecker/index_fr.properties | 2 +- .../lib/hudson/project/config-retryCount_fr.properties | 2 +- .../hudson/maven/MavenProbeAction/envVars_fr.properties | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/resources/hudson/model/Hudson/legend_fr.properties b/core/src/main/resources/hudson/model/Hudson/legend_fr.properties index 0247c1cd75..b1d2443b35 100644 --- a/core/src/main/resources/hudson/model/Hudson/legend_fr.properties +++ b/core/src/main/resources/hudson/model/Hudson/legend_fr.properties @@ -31,7 +31,7 @@ health-81plus=La sant\u00E9 du projet est au dessus de 80%. Vous pouvez passer v red=Le dernier build est en échec. red_anime=Le dernier build est en échec. Un nouveau build est en cours. health-61to80=La sant\u00E9 du projet est entre 60% et 80%. Vous pouvez passer votre souris au dessus de l''ic\u00F4ne du projet pour plus d''informations. -health-80plus=La stabilité du projet est d'au moins 80%. Placez la souris au-dessus de l''icône du projet pour plus de détails. +health-80plus=La stabilité du projet est d''au moins 80%. Placez la souris au-dessus de l''icône du projet pour plus de détails. health-41to60=La sant\u00E9 du projet est entre 40% et 60%. Vous pouvez passer votre souris au dessus de l''ic\u00F4ne du projet pour plus d''informations. health-60to79=La stabilité du projet se situe entre 60% et 80%. Placez la souris au-dessus de l''icône du projet pour plus de détails. health-21to40=La sant\u00E9 du projet est entre 20% et 40%. Vous pouvez passer votre souris au dessus de l''ic\u00F4ne du projet pour plus d''informations. diff --git a/core/src/main/resources/hudson/model/Messages_fr.properties b/core/src/main/resources/hudson/model/Messages_fr.properties index faa9325d3c..5f51efdd35 100644 --- a/core/src/main/resources/hudson/model/Messages_fr.properties +++ b/core/src/main/resources/hudson/model/Messages_fr.properties @@ -41,7 +41,7 @@ AbstractProject.WorkspacePermission.Description=\ Si vous ne voulez pas qu''un utilisateur ait acc\u00e8s au code source, vous pouvez retirer ce droit. Api.MultipleMatch=Le XPath "{0}" correspond \u00e0 {1} noeud(s). \ - Merci de fournir un XPath qui ne correspond qu'\u00e0 un seul noeud, ou utilisez le param\u00e8tre de requ\u00e8te "wrapper" pour les encapsuler tous dans un \u00e9l\u00e9ment racine. + Merci de fournir un XPath qui ne correspond qu''\u00e0 un seul noeud, ou utilisez le param\u00e8tre de requ\u00e8te "wrapper" pour les encapsuler tous dans un \u00e9l\u00e9ment racine. Api.NoXPathMatch=Pas de correspondance avec le XPath {0} BallColor.Aborted=Annul\u00e9 @@ -134,7 +134,7 @@ Slave.InvalidConfig.Executors=Configuration esclave invalide pour {0}. Nombre d' Slave.InvalidConfig.NoName=Configuration esclave invalide. Le nom est vide. Slave.InvalidConfig.NoRemoteDir=Configuration esclave invalide pour {0}. Pas de r\u00e9pertoire distant fourni Slave.Launching={0} Lancement de l''agent esclave -Slave.Terminated={0} l'agent esclave a \u00e9t\u00e9 termin\u00e9 +Slave.Terminated={0} l''agent esclave a \u00e9t\u00e9 termin\u00e9 Slave.UnableToLaunch=Impossible de lancer l''agent esclave pour {0} {1} Slave.UnixSlave=Ceci est un esclave Unix Slave.WindowsSlave=Ceci est un esclave Windows diff --git a/core/src/main/resources/hudson/model/Run/confirmDelete_fr.properties b/core/src/main/resources/hudson/model/Run/confirmDelete_fr.properties index 777399b555..ae69f35f09 100644 --- a/core/src/main/resources/hudson/model/Run/confirmDelete_fr.properties +++ b/core/src/main/resources/hudson/model/Run/confirmDelete_fr.properties @@ -21,6 +21,6 @@ # THE SOFTWARE. Warning=Avertissement -cannotMsg=Impossible de supprimer ce build, parce qu'il est {0} +cannotMsg=Impossible de supprimer ce build, parce qu''il est {0} Are\ you\ sure\ about\ deleting\ the\ build?=Etes-vous sûr de vouloir supprimer le build? Yes=Oui diff --git a/core/src/main/resources/hudson/util/DoubleLaunchChecker/index_fr.properties b/core/src/main/resources/hudson/util/DoubleLaunchChecker/index_fr.properties index f5aebc3c83..40b2515ae2 100644 --- a/core/src/main/resources/hudson/util/DoubleLaunchChecker/index_fr.properties +++ b/core/src/main/resources/hudson/util/DoubleLaunchChecker/index_fr.properties @@ -28,4 +28,4 @@ message=\ incorrects. \ Merci de corriger le problème. This\ Jenkins=Cette instance de Jenkins -Other\ Jenkins=L'autre instance de Jenkins +Other\ Jenkins=L''autre instance de Jenkins diff --git a/core/src/main/resources/lib/hudson/project/config-retryCount_fr.properties b/core/src/main/resources/lib/hudson/project/config-retryCount_fr.properties index 762124e6b4..d1725e9120 100644 --- a/core/src/main/resources/lib/hudson/project/config-retryCount_fr.properties +++ b/core/src/main/resources/lib/hudson/project/config-retryCount_fr.properties @@ -22,5 +22,5 @@ Retry\ Count=Nombre de r\u00E9-essais -Number\ of\ Retrys\ needed\ if\ checkout\ fails=Nombre de Réessayer n'est pas nécessaire si la caisse +Number\ of\ Retrys\ needed\ if\ checkout\ fails= SCM\ checkout\ retry\ count=Nombre de retentatives de checkout du SCM diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_fr.properties index b11b956c4c..7b38a70d7b 100644 --- a/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_fr.properties +++ b/maven-plugin/src/main/resources/hudson/maven/MavenProbeAction/envVars_fr.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Environment\ Variables=Variables d'Environnement +Environment\ Variables=Variables d''Environnement From 78c709e91329d4b4ba6f36f25a64412ade63c215 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 20 May 2011 13:09:19 -0700 Subject: [PATCH 027/113] [JENKINS-8985] BuildTrigger modification to handle DependencyGroups. Pull individual Dependencys out of DependencyGroups we see in BuildTrigger.execute and make sure to actually kick those builds off as well, so that we can have two different dependencies (say, for different parameters) from one upstream project to a single downstream project. --- changelog.html | 3 +++ core/src/main/java/hudson/model/DependencyGraph.java | 8 ++++++-- core/src/main/java/hudson/tasks/BuildTrigger.java | 12 ++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/changelog.html b/changelog.html index 5198b5177c..854750336b 100644 --- a/changelog.html +++ b/changelog.html @@ -63,6 +63,9 @@ Upcoming changes
  • Fix unescaped apostrophe in French translation. (issue 9699) +
  • + Allow building multiple downstream dependencies on a single job via DependencyGraph and BuildTrigger. + (issue 8985)
  • Set NODE_NAME for master node to "master" (issue 9671) diff --git a/core/src/main/java/hudson/model/DependencyGraph.java b/core/src/main/java/hudson/model/DependencyGraph.java index 890454e91e..338040ad12 100644 --- a/core/src/main/java/hudson/model/DependencyGraph.java +++ b/core/src/main/java/hudson/model/DependencyGraph.java @@ -478,7 +478,7 @@ public final class DependencyGraph implements Comparator { /** * Collect multiple dependencies between the same two projects. */ - private static class DependencyGroup extends Dependency { + public static class DependencyGroup extends Dependency { private Set group = new LinkedHashSet(); DependencyGroup(Dependency first) { @@ -486,10 +486,14 @@ public final class DependencyGraph implements Comparator { group.add(first); } - void add(Dependency next) { + private void add(Dependency next) { group.add(next); } + public Set getGroup() { + return group; + } + @Override public boolean shouldTriggerBuild(AbstractBuild build, TaskListener listener, List actions) { diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java index 7d91efc155..5b07df573e 100644 --- a/core/src/main/java/hudson/tasks/BuildTrigger.java +++ b/core/src/main/java/hudson/tasks/BuildTrigger.java @@ -201,7 +201,19 @@ public class BuildTrigger extends Recorder implements DependecyDeclarer { } }); + List depsToBuild = new ArrayList(); for (Dependency dep : downstreamProjects) { + if (dep instanceof DependencyGraph.DependencyGroup) { + for (Dependency d : ((DependencyGraph.DependencyGroup)dep).getGroup()) { + depsToBuild.add(d); + } + } + else { + depsToBuild.add(dep); + } + } + + for (Dependency dep : depsToBuild) { AbstractProject p = dep.getDownstreamProject(); if (p.isDisabled()) { logger.println(Messages.BuildTrigger_Disabled(p.getName())); From c4d9fe8e0707330d1d59d6f30a3a2e32b36a88c0 Mon Sep 17 00:00:00 2001 From: bap2000 Date: Sat, 21 May 2011 14:41:25 +0100 Subject: [PATCH 028/113] [FIXED JENKINS-4000] , [FIXED JENKINS-4002] encrypt proxy password Proxy password is encrypted in xml config file, and in the UI --- .../main/java/hudson/ProxyConfiguration.java | 34 ++++++++++++++++--- .../hudson/PluginManager/advanced.jelly | 2 +- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/hudson/ProxyConfiguration.java b/core/src/main/java/hudson/ProxyConfiguration.java index 6ff8c33ce6..1601dcc2d7 100644 --- a/core/src/main/java/hudson/ProxyConfiguration.java +++ b/core/src/main/java/hudson/ProxyConfiguration.java @@ -27,6 +27,7 @@ import hudson.model.Hudson; import hudson.model.Saveable; import hudson.model.listeners.SaveableListener; import hudson.util.Scrambler; +import hudson.util.Secret; import hudson.util.XStream2; import java.io.File; @@ -59,10 +60,17 @@ public final class ProxyConfiguration implements Saveable { public final int port; /** - * Possibly null proxy user name and password. - * Password is base64 scrambled since this is persisted to disk. + * Possibly null proxy user name. */ - private final String userName,password; + private final String userName; + /** + * null + */ + private String password; + /** + * encrypted password + */ + private Secret secretPassword; public ProxyConfiguration(String name, int port) { this(name,port,null,null); @@ -72,15 +80,24 @@ public final class ProxyConfiguration implements Saveable { this.name = name; this.port = port; this.userName = userName; - this.password = Scrambler.scramble(password); + this.secretPassword = Secret.fromString(password); } public String getUserName() { return userName; } +// This method is public, if it was public only for jelly, then should make it private (or inline contents) +// Have left public, as can't tell if anyone else is using from plugins + /** + * @return the password in plain text + */ public String getPassword() { - return Scrambler.descramble(password); + return Secret.toString(secretPassword); + } + + public String getEncryptedPassword() { + return (secretPassword == null) ? null : secretPassword.getEncryptedValue(); } public Proxy createProxy() { @@ -94,6 +111,13 @@ public final class ProxyConfiguration implements Saveable { SaveableListener.fireOnChange(this, config); } + public Object readResolve() { + if (secretPassword == null) + secretPassword = Secret.fromString(Scrambler.descramble(password)); + password = null; + return this; + } + public static XmlFile getXmlFile() { return new XmlFile(XSTREAM, new File(Hudson.getInstance().getRootDir(), "proxy.xml")); } diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly index f5260e426e..904d3d6c1f 100644 --- a/core/src/main/resources/hudson/PluginManager/advanced.jelly +++ b/core/src/main/resources/hudson/PluginManager/advanced.jelly @@ -48,7 +48,7 @@ THE SOFTWARE. - + From 68f5a0d23ab4a5631df15b521b8eb71a2a74cc49 Mon Sep 17 00:00:00 2001 From: Christoph Kutzinski Date: Sun, 22 May 2011 12:09:29 +0200 Subject: [PATCH 029/113] [FIXED JENKINS-5044] catch FileNotFoundException if mojos are executed from a classes directory instead from a jar --- changelog.html | 3 + maven-plugin/pom.xml | 7 +++ .../main/java/hudson/maven/ExecutedMojo.java | 6 +- .../java/hudson/maven/ExecutedMojoTest.java | 62 +++++++++++++++++++ 4 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 maven-plugin/src/test/java/hudson/maven/ExecutedMojoTest.java diff --git a/changelog.html b/changelog.html index 854750336b..f2a4ea15d8 100644 --- a/changelog.html +++ b/changelog.html @@ -66,6 +66,9 @@ Upcoming changes
  • Allow building multiple downstream dependencies on a single job via DependencyGraph and BuildTrigger. (issue 8985) +
  • + Catch FileNotFoundException in Maven builds if Mojos are executed from a classes directory. + (issue 5044)
  • Set NODE_NAME for master node to "master" (issue 9671) diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 109276d681..d144057803 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -308,6 +308,13 @@ THE SOFTWARE. 1.1 true + + + junit + junit + 4.8.2 + test + diff --git a/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java b/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java index 145b59bd1d..843e5bd9b9 100644 --- a/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java +++ b/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java @@ -30,6 +30,7 @@ import hudson.remoting.Which; import hudson.util.ReflectionUtils; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.Serializable; import java.lang.reflect.Method; @@ -94,12 +95,15 @@ public final class ExecutedMojo implements Serializable { MojoDescriptor md = mojo.mojoExecution.getMojoDescriptor(); PluginDescriptor pd = md.getPluginDescriptor(); try { - Class clazz = getMojoClass( md, pd );// pd.getClassRealm().loadClass(md.getImplementation()); + Class clazz = getMojoClass( md, pd ); digest = Util.getDigestOf(new FileInputStream(Which.jarFile(clazz))); } catch (IllegalArgumentException e) { LOGGER.log(Level.WARNING, "Failed to locate jar for "+md.getImplementation(),e); } catch (ClassNotFoundException e) { // perhaps the plugin has failed to load. + } catch (FileNotFoundException e) { + // Maybe mojo was loaded from a classes dir instead of from a jar (JENKINS-5044) + LOGGER.log(Level.WARNING, "Failed to caculate digest for "+md.getImplementation(),e); } this.digest = digest; } diff --git a/maven-plugin/src/test/java/hudson/maven/ExecutedMojoTest.java b/maven-plugin/src/test/java/hudson/maven/ExecutedMojoTest.java new file mode 100644 index 0000000000..644b3e575e --- /dev/null +++ b/maven-plugin/src/test/java/hudson/maven/ExecutedMojoTest.java @@ -0,0 +1,62 @@ +package hudson.maven; + +import java.io.IOException; + +import org.apache.maven.plugin.MojoExecution; +import org.apache.maven.plugin.descriptor.MojoDescriptor; +import org.apache.maven.plugin.descriptor.PluginDescriptor; +import org.codehaus.plexus.classworlds.realm.ClassRealm; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.jvnet.hudson.test.Bug; + +/** + * Unit test for {@link ExecutedMojo}. + * + * @author kutzi + */ +public class ExecutedMojoTest { + + private MojoDescriptor mojoDescriptor; + + @Before + public void before() { + PluginDescriptor pluginDescriptor = new PluginDescriptor(); + pluginDescriptor.setGroupId("com.test"); + pluginDescriptor.setArtifactId("testPlugin"); + pluginDescriptor.setVersion("1.0"); + + ClassRealm classRealm = new ClassRealm(null, "test", getClass().getClassLoader()); + pluginDescriptor.setClassRealm(classRealm); + + MojoDescriptor descriptor = new MojoDescriptor(); + descriptor.setPluginDescriptor(pluginDescriptor); + this.mojoDescriptor = descriptor; + } + + @Test + public void testMojoFromJarFile() throws IOException, InterruptedException { + // Faking JUnit's Assert to be the plugin class + this.mojoDescriptor.setImplementation(Assert.class.getName()); + MojoExecution execution = new MojoExecution(this.mojoDescriptor); + MojoInfo info = new MojoInfo(execution, null, null, null); + + ExecutedMojo executedMojo = new ExecutedMojo(info, 1L); + + Assert.assertNotNull(executedMojo.digest); + } + + @Test + @Bug(5044) + public void testMojoFromClassesDirectory() throws IOException, InterruptedException { + // Faking this class as the mojo impl: + this.mojoDescriptor.setImplementation(getClass().getName()); + MojoExecution execution = new MojoExecution(this.mojoDescriptor); + MojoInfo info = new MojoInfo(execution, null, null, null); + + ExecutedMojo executedMojo = new ExecutedMojo(info, 1L); + + Assert.assertEquals("com.test", executedMojo.groupId); + } +} From 0b01182b8dc4aaaf7edba2bbf047b4594441ea35 Mon Sep 17 00:00:00 2001 From: Christoph Kutzinski Date: Sun, 22 May 2011 12:58:10 +0200 Subject: [PATCH 030/113] [FIXED JENKINS-9003] NPE when polling after node removed --- changelog.html | 3 +++ .../java/hudson/model/AbstractProject.java | 20 ++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index f2a4ea15d8..cc46c8079a 100644 --- a/changelog.html +++ b/changelog.html @@ -69,6 +69,9 @@ Upcoming changes
  • Catch FileNotFoundException in Maven builds if Mojos are executed from a classes directory. (issue 5044) +
  • + Fix NPE if node of last build isn't available anymore while polling for SCM changes. + (issue 9003 )
  • Set NODE_NAME for master node to "master" (issue 9671) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 715714cc01..cf01c0e9ea 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -1263,7 +1263,7 @@ public abstract class AbstractProject

    ,R extends A // lock the workspace of the last build FilePath ws=lb.getWorkspace(); - if (ws==null || !ws.exists()) { + if (workspaceOffline(lb)) { // workspace offline. build now, or nothing will ever be built Label label = getAssignedLabel(); if (label != null && label.isSelfLabel()) { @@ -1326,6 +1326,24 @@ public abstract class AbstractProject

    ,R extends A return NO_CHANGES; } } + + private boolean workspaceOffline(R build) throws IOException, InterruptedException { + FilePath ws = build.getWorkspace(); + if (ws==null || !ws.exists()) { + return true; + } + + Node builtOn = build.getBuiltOn(); + if (builtOn == null) { // node built-on doesn't exist anymore + return true; + } + + if (builtOn.toComputer() == null) { // node still exists, but has 0 executors - o.s.l.t. + return true; + } + + return false; + } /** * Returns true if this user has made a commit to this project. From a3d138867785a153aca10cfb056e786369678f88 Mon Sep 17 00:00:00 2001 From: Christoph Kutzinski Date: Sun, 22 May 2011 17:23:37 +0200 Subject: [PATCH 031/113] [FIXED JENKINS-9687] log build steps which have changed the build result to console --- changelog.html | 3 +++ .../main/java/hudson/model/AbstractBuild.java | 21 ++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index cc46c8079a..7e5b0b392a 100644 --- a/changelog.html +++ b/changelog.html @@ -77,6 +77,9 @@ Upcoming changes (issue 9671)

  • Add a default attribute to repeatableProperty and repeatable jelly tags +
  • + Log which build steps have changed the build result to build console. + (issue 9687) diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index 0c00c5d23c..dfb9fa8d50 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -659,7 +659,26 @@ public abstract class AbstractBuild

    ,R extends Abs } catch (AbstractMethodError e) { mon = BuildStepMonitor.BUILD; } - return mon.perform(bs, AbstractBuild.this, launcher, listener); + Result oldResult = AbstractBuild.this.getResult(); + boolean canContinue = mon.perform(bs, AbstractBuild.this, launcher, listener); + Result newResult = AbstractBuild.this.getResult(); + if (newResult != oldResult) { + String buildStepName = getBuildStepName(bs); + listener.getLogger().format("Build step '%s' changed build result to %s%n", buildStepName, newResult); + } + if (!canContinue) { + String buildStepName = getBuildStepName(bs); + listener.getLogger().format("Build step '%s' marked build as failure%n", buildStepName); + } + return canContinue; + } + + private String getBuildStepName(BuildStep bs) { + if (bs instanceof Describable) { + return ((Describable) bs).getDescriptor().getDisplayName(); + } else { + return bs.getClass().getSimpleName(); + } } protected final boolean preBuild(BuildListener listener,Map steps) { From 819c8528ded27db5636d5b76e2277b167eab0729 Mon Sep 17 00:00:00 2001 From: Christoph Kutzinski Date: Sun, 22 May 2011 21:10:37 +0200 Subject: [PATCH 032/113] implemented getDescriptor() to - hopefully - fix the AssertionError in the tests --- test/src/main/java/org/jvnet/hudson/test/MockBuilder.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/src/main/java/org/jvnet/hudson/test/MockBuilder.java b/test/src/main/java/org/jvnet/hudson/test/MockBuilder.java index 771cbe7621..fad81e9d5c 100644 --- a/test/src/main/java/org/jvnet/hudson/test/MockBuilder.java +++ b/test/src/main/java/org/jvnet/hudson/test/MockBuilder.java @@ -30,6 +30,11 @@ public class MockBuilder extends Builder { build.setResult(result); return true; } + + @Override + public Descriptor getDescriptor() { + return new DescriptorImpl(); + } @Extension public static final class DescriptorImpl extends Descriptor { From 3fda674236b88df569cd7cdeded91972720e2c97 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 22 May 2011 21:45:23 -0700 Subject: [PATCH 033/113] [maven-release-plugin] prepare release jenkins-1_413 --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 4f7aca5506..cbdfcec346 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jenkins-ci.main - 1.413-SNAPSHOT + 1.413 cli Jenkins CLI diff --git a/core/pom.xml b/core/pom.xml index 491d380851..9216de0d95 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413-SNAPSHOT + 1.413 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 18dc20c0a1..9d5c32e11d 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413-SNAPSHOT + 1.413 maven-plugin diff --git a/pom.xml b/pom.xml index be3998ddfd..88417774cc 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413-SNAPSHOT + 1.413 pom Jenkins main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 592750a474..4af23029fd 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413-SNAPSHOT + 1.413 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 7445c1a543..bf500e5409 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jenkins-ci.main - 1.413-SNAPSHOT + 1.413 4.0.0 org.jenkins-ci.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 3f06ac5779..3ddb8fa35a 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.413-SNAPSHOT + 1.413 ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 37e085eecf..e797b995fe 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413-SNAPSHOT + 1.413 ../pom.xml From e2c280490346ebc4d87705c5baa47fe3abcc999c Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 22 May 2011 21:45:39 -0700 Subject: [PATCH 034/113] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index cbdfcec346..2c1401d549 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jenkins-ci.main - 1.413 + 1.414-SNAPSHOT cli Jenkins CLI diff --git a/core/pom.xml b/core/pom.xml index 9216de0d95..c33818e1cc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413 + 1.414-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 9d5c32e11d..109276d681 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413 + 1.414-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 88417774cc..98516d2d93 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413 + 1.414-SNAPSHOT pom Jenkins main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 4af23029fd..81e0e3c51a 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413 + 1.414-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index bf500e5409..733068c14e 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jenkins-ci.main - 1.413 + 1.414-SNAPSHOT 4.0.0 org.jenkins-ci.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 3ddb8fa35a..556211859a 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.413 + 1.414-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index e797b995fe..11528ecaa5 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.413 + 1.414-SNAPSHOT ../pom.xml From dbf50fbf40c16b267ee238bd3fdc8969aa5ea8c2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 22 May 2011 22:02:27 -0700 Subject: [PATCH 035/113] updated changelog for release --- changelog.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog.html b/changelog.html index cda6681e05..d84b7c31c4 100644 --- a/changelog.html +++ b/changelog.html @@ -61,7 +61,10 @@ Upcoming changes

    +

    What's new in 1.413 (2011/05/22)

    • Fixed extra ' character in french translation. @@ -91,7 +94,6 @@ Upcoming changes Replaced all gif images with png images (transparency support). (issue 3969)
    -

    What's new in 1.412 (2011/05/16)

    • From 914880b0d75207b735f4338a4f080849eacf79f5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 22 May 2011 22:02:27 -0700 Subject: [PATCH 036/113] releasing a new plugin parent POM --- plugins/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index 857c5c2be7..81088d0378 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -10,7 +10,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.413-SNAPSHOT + 1.413 pom org.jenkins-ci.main maven-plugin - 1.413-SNAPSHOT + 1.413 @@ -43,25 +43,25 @@ org.jenkins-ci.main jenkins-war war - 1.413-SNAPSHOT + 1.413 test org.jenkins-ci.main jenkins-core - 1.413-SNAPSHOT + 1.413 provided org.jenkins-ci.main jenkins-test-harness - 1.413-SNAPSHOT + 1.413 test org.jenkins-ci.main ui-samples-plugin - 1.413-SNAPSHOT + 1.413 test From 18450827138081f91bc218f327e30bab3c56ce33 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 22 May 2011 22:02:34 -0700 Subject: [PATCH 037/113] toward the next release --- plugins/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index 81088d0378..174f80e361 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -10,7 +10,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.413 + 1.414-SNAPSHOT pom org.jenkins-ci.main maven-plugin - 1.413 + 1.414-SNAPSHOT @@ -43,25 +43,25 @@ org.jenkins-ci.main jenkins-war war - 1.413 + 1.414-SNAPSHOT test org.jenkins-ci.main jenkins-core - 1.413 + 1.414-SNAPSHOT provided org.jenkins-ci.main jenkins-test-harness - 1.413 + 1.414-SNAPSHOT test org.jenkins-ci.main ui-samples-plugin - 1.413 + 1.414-SNAPSHOT test From cb86f97e6e9341067f207ee61144ce629f272f76 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 22 May 2011 22:06:19 -0700 Subject: [PATCH 038/113] 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 c0a44a1983..89d3a24c96 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +jenkins (1.413) unstable; urgency=low + + * See http://jenkins-ci.org/changelog for more details. + + -- Kohsuke Kawaguchi Sun, 22 May 2011 22:03:39 -0700 + jenkins (1.412) unstable; urgency=low * See http://jenkins-ci.org/changelog for more details. From cee7a8584e877a6115b249b4a1f5ad32bb4fc873 Mon Sep 17 00:00:00 2001 From: laurents59 Date: Mon, 23 May 2011 09:37:44 +0200 Subject: [PATCH 039/113] Update french translation of UpdateCenter --- .../UpdateCenter/DownloadJob/Failure/status_fr.properties | 2 +- .../resources/hudson/model/UpdateCenter/index_fr.properties | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Failure/status_fr.properties b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Failure/status_fr.properties index c24d51bd7a..c2818cda8c 100644 --- a/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Failure/status_fr.properties +++ b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Failure/status_fr.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Failure= +Failure=\u00C9chec diff --git a/core/src/main/resources/hudson/model/UpdateCenter/index_fr.properties b/core/src/main/resources/hudson/model/UpdateCenter/index_fr.properties index 2eabc841ee..739f0e7955 100644 --- a/core/src/main/resources/hudson/model/UpdateCenter/index_fr.properties +++ b/core/src/main/resources/hudson/model/UpdateCenter/index_fr.properties @@ -20,9 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. +Update\ Center=Centre de mise à jour warning=Une fois l''installation terminée, Jenkins doit être redémarré \ pour prendre en compte les nouveaux plugins. -Restart\ When\ No\ Jobs\ Are\ Running=Red\u00E9marrer quand aucun job n''est en cours -Update\ Center=Centre de mise à jour Installing\ Plugins/Upgrades=Installation/Mise \u00E0 jour des Plugins -Restart\ Now=Redémarrer maintenant +Schedule\ Restart=Programmer un red\u00E9marrage \ No newline at end of file From 5376430f24b0940ec7819f893de7051af4c76b70 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 17 May 2011 11:56:13 -0700 Subject: [PATCH 040/113] typo --- core/src/main/java/hudson/model/ParameterValue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/ParameterValue.java b/core/src/main/java/hudson/model/ParameterValue.java index 570b607e34..5db1adb4ef 100644 --- a/core/src/main/java/hudson/model/ParameterValue.java +++ b/core/src/main/java/hudson/model/ParameterValue.java @@ -250,7 +250,7 @@ public abstract class ParameterValue implements Serializable { * provided by this object should be masked in output. * *

      - * Subclasses can override this to control the returne value. + * Subclasses can override this to control the return value. * * @since 1.378 */ From b08687a55bdf7f32012944ddf14d8c0ad85e80af Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 23 May 2011 02:02:09 -0700 Subject: [PATCH 041/113] creating an RC branch --- changelog.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/changelog.html b/changelog.html index b6629bee07..1af5f229cd 100644 --- a/changelog.html +++ b/changelog.html @@ -54,6 +54,14 @@ Upcoming changes

      + + + - - -

      What's new in 1.413 (2011/05/22)

        From 531f4398a65b85c3dbd217df84482d8792823a33 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 23 May 2011 02:02:13 -0700 Subject: [PATCH 042/113] the trunk is toward 1.415-SNAPSHOT --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- plugins/pom.xml | 12 ++++++------ pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 2c1401d549..60876efd7b 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jenkins-ci.main - 1.414-SNAPSHOT + 1.415-SNAPSHOT cli Jenkins CLI diff --git a/core/pom.xml b/core/pom.xml index c33818e1cc..48920c6bb7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.414-SNAPSHOT + 1.415-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index d144057803..8047696cc8 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.414-SNAPSHOT + 1.415-SNAPSHOT maven-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index 174f80e361..d1ab491b2b 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -10,7 +10,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.414-SNAPSHOT + 1.415-SNAPSHOT pom org.jenkins-ci.main maven-plugin - 1.414-SNAPSHOT + 1.415-SNAPSHOT @@ -43,25 +43,25 @@ org.jenkins-ci.main jenkins-war war - 1.414-SNAPSHOT + 1.415-SNAPSHOT test org.jenkins-ci.main jenkins-core - 1.414-SNAPSHOT + 1.415-SNAPSHOT provided org.jenkins-ci.main jenkins-test-harness - 1.414-SNAPSHOT + 1.415-SNAPSHOT test org.jenkins-ci.main ui-samples-plugin - 1.414-SNAPSHOT + 1.415-SNAPSHOT test diff --git a/pom.xml b/pom.xml index 98516d2d93..8b76bb1f10 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.414-SNAPSHOT + 1.415-SNAPSHOT pom Jenkins main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 81e0e3c51a..f3cb2d65d3 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.414-SNAPSHOT + 1.415-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 733068c14e..9577adaa42 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jenkins-ci.main - 1.414-SNAPSHOT + 1.415-SNAPSHOT 4.0.0 org.jenkins-ci.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 556211859a..46d5896ad7 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.414-SNAPSHOT + 1.415-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 11528ecaa5..ae1dcef118 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.414-SNAPSHOT + 1.415-SNAPSHOT ../pom.xml From ecb127fc6afb88869313cbfe39266c2d89d000d5 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 23 May 2011 10:09:21 -0700 Subject: [PATCH 043/113] Removing unneeded imports. --- .../hudson/maven/MavenProcessFactory.java | 23 ------------------- .../maven/reporters/MavenJavadocArchiver.java | 12 ---------- 2 files changed, 35 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java b/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java index b86630c2d5..7e05082ce3 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java @@ -25,14 +25,9 @@ package hudson.maven; import hudson.FilePath; import hudson.Launcher; -import hudson.Proc; -import hudson.AbortException; import hudson.EnvVars; -import hudson.slaves.Channels; -import static hudson.Util.fixNull; import hudson.maven.agent.Main; import hudson.maven.agent.Maven21Interceptor; -import hudson.maven.ProcessCache.NewProcess; import hudson.model.BuildListener; import hudson.model.Computer; import hudson.model.Executor; @@ -42,31 +37,13 @@ import hudson.model.Node; import hudson.model.Run.RunnerAbortedException; import hudson.model.TaskListener; import hudson.remoting.Callable; -import hudson.remoting.Channel; -import hudson.remoting.RemoteInputStream; -import hudson.remoting.RemoteOutputStream; -import hudson.remoting.SocketInputStream; -import hudson.remoting.SocketOutputStream; import hudson.remoting.Which; import hudson.tasks.Maven.MavenInstallation; -import hudson.tasks._maven.MavenConsoleAnnotator; import hudson.util.ArgumentListBuilder; -import hudson.util.IOException2; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Serializable; -import java.net.ServerSocket; -import java.net.Socket; -import java.net.SocketTimeoutException; -import java.nio.charset.Charset; -import java.nio.charset.UnsupportedCharsetException; -import java.util.Arrays; import java.util.logging.Logger; diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java index 846d9233f3..890f739ad8 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java @@ -24,27 +24,15 @@ */ package hudson.maven.reporters; -import hudson.FilePath; -import hudson.Util; import hudson.Extension; -import hudson.maven.MavenBuildProxy; import hudson.maven.MavenModule; -import hudson.maven.MavenReporter; import hudson.maven.MavenReporterDescriptor; import hudson.maven.MojoInfo; import hudson.maven.MavenModuleSet; -import hudson.maven.MavenReportInfo; import hudson.model.*; -import hudson.tasks.JavadocArchiver.JavadocAction; -import org.apache.maven.project.MavenProject; -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.List; /** * Records the javadoc and archives it. From c0628ee2e5aff3c45c955a1807d43c2ca0da6f52 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 23 May 2011 11:20:49 -0700 Subject: [PATCH 044/113] Removing unneeded imports --- core/src/main/java/hudson/model/FreeStyleProject.java | 8 -------- core/src/main/java/hudson/model/ParameterValue.java | 1 - core/src/main/java/hudson/model/Queue.java | 1 - .../main/java/org/jvnet/hudson/test/HudsonTestCase.java | 4 ---- 4 files changed, 14 deletions(-) diff --git a/core/src/main/java/hudson/model/FreeStyleProject.java b/core/src/main/java/hudson/model/FreeStyleProject.java index 76c4f527f8..84c43831cc 100644 --- a/core/src/main/java/hudson/model/FreeStyleProject.java +++ b/core/src/main/java/hudson/model/FreeStyleProject.java @@ -25,14 +25,6 @@ package hudson.model; import hudson.Extension; -import java.io.File; -import java.io.IOException; - -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -import javax.servlet.ServletException; - /** * Free-style software project. * diff --git a/core/src/main/java/hudson/model/ParameterValue.java b/core/src/main/java/hudson/model/ParameterValue.java index 5db1adb4ef..b9979e2dd2 100644 --- a/core/src/main/java/hudson/model/ParameterValue.java +++ b/core/src/main/java/hudson/model/ParameterValue.java @@ -27,7 +27,6 @@ package hudson.model; import hudson.EnvVars; import hudson.Util; import hudson.scm.SCM; -import hudson.slaves.OfflineCause; import hudson.tasks.BuildWrapper; import hudson.tasks.Builder; import hudson.util.VariableResolver; diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index daeea676d9..e564ff3650 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -78,7 +78,6 @@ import java.util.GregorianCalendar; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.NoSuchElementException; diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index 7e492bcb45..4062cd0fa1 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -111,7 +111,6 @@ import java.io.IOException; import java.io.InputStreamReader; import java.lang.annotation.Annotation; import java.lang.management.ThreadInfo; -import java.lang.ref.WeakReference; import java.lang.reflect.Array; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -123,14 +122,11 @@ import java.net.URLClassLoader; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.Enumeration; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Locale; -import java.util.Set; import java.util.UUID; import java.util.concurrent.*; import java.util.jar.Manifest; From cd48b4ebab0ea3f4cd60642fd0a1765889ef4ee4 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 24 May 2011 10:50:09 +0200 Subject: [PATCH 045/113] add changelog entry for [JENKINS-9326] --- changelog.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.html b/changelog.html index 1af5f229cd..0f043364e0 100644 --- a/changelog.html +++ b/changelog.html @@ -83,6 +83,9 @@ Upcoming changes
      • Set NODE_NAME for master node to "master" (issue 9671) +
      • + Jenkins Maven build does not recognize Tycho surfire reports with new groupId org.eclipse.tycho + (issue 9326)
      • Add a default attribute to repeatableProperty and repeatable jelly tags
      • From 76d0e891bb378a7fb385ac3441078a81dd1ccc90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Thu, 19 May 2011 08:58:24 +0200 Subject: [PATCH 046/113] Maven Best Practice : Always define plugins versions in the pluginManagement of the root POM --- cli/pom.xml | 3 +- core/pom.xml | 20 ++++++++---- maven-plugin/pom.xml | 7 ++-- plugins/pom.xml | 5 +-- pom.xml | 67 +++++++++++++++++++++++++++++++++++++++ remoting/pom.xml | 6 ++-- test/pom.xml | 16 +++------- ui-samples-plugin/pom.xml | 4 +-- war/pom.xml | 10 ++++-- 9 files changed, 108 insertions(+), 30 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 60876efd7b..ace8b6f299 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -13,6 +13,7 @@ maven-assembly-plugin + @@ -33,7 +34,7 @@ org.jvnet.localizer maven-localizer-plugin - 1.10 + diff --git a/core/pom.xml b/core/pom.xml index 48920c6bb7..34f390b5d8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -48,7 +48,7 @@ THE SOFTWARE. org.jvnet.hudson.tools maven-encoding-plugin - 1.1 + @@ -61,7 +61,7 @@ THE SOFTWARE. com.infradna.tool bridge-method-injector - 1.4 + @@ -73,6 +73,7 @@ THE SOFTWARE. org.kohsuke.stapler maven-stapler-plugin + true @@ -89,7 +90,7 @@ THE SOFTWARE. org.jvnet.localizer maven-localizer-plugin - 1.10 + @@ -105,7 +106,7 @@ THE SOFTWARE. org.kohsuke access-modifier-checker - 1.0 + @@ -117,7 +118,7 @@ THE SOFTWARE. org.codehaus.mojo antlr-maven-plugin - 2.1 + cron @@ -144,6 +145,7 @@ THE SOFTWARE. org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin + generate-resources @@ -181,6 +183,7 @@ THE SOFTWARE. maven-jar-plugin + @@ -198,7 +201,7 @@ THE SOFTWARE. --> org.codehaus.mojo apt-maven-plugin - 1.0-alpha-4 + true org.jvnet.hudson.tools.ExtensionPointListerFactory @@ -246,7 +249,7 @@ THE SOFTWARE. org.codehaus.mojo apt-maven-plugin - 1.0-alpha-2 + @@ -263,6 +266,7 @@ THE SOFTWARE. --> org.kohsuke.stapler maven-stapler-plugin + @@ -308,6 +312,7 @@ THE SOFTWARE. org.kohsuke.gmaven gmaven-plugin + @@ -327,6 +332,7 @@ THE SOFTWARE. maven-surefire-plugin + true diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 8047696cc8..8224d0f4ca 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -339,12 +339,13 @@ THE SOFTWARE. org.kohsuke.stapler maven-stapler-plugin + true org.jvnet.localizer maven-localizer-plugin - 1.8 + @@ -360,6 +361,7 @@ THE SOFTWARE. com.cloudbees maven-license-plugin + target/${project.artifactId}/WEB-INF/licenses.xml @@ -367,6 +369,7 @@ THE SOFTWARE. org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin + resgen @@ -397,7 +400,7 @@ THE SOFTWARE. org.codehaus.mojo cobertura-maven-plugin - 2.4-apb-SNAPSHOT + true diff --git a/plugins/pom.xml b/plugins/pom.xml index d1ab491b2b..d74220dee3 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -157,7 +157,7 @@ org.codehaus.groovy.maven gmaven-plugin - 1.0-rc-5 + test-in-groovy @@ -178,6 +178,7 @@ maven-surefire-plugin + @@ -190,7 +191,7 @@ com.cloudbees maven-license-plugin - 1.3 + diff --git a/pom.xml b/pom.xml index 8b76bb1f10..b55a9680f1 100644 --- a/pom.xml +++ b/pom.xml @@ -106,6 +106,11 @@ THE SOFTWARE. maven-jar-plugin 2.3.1 + + org.apache.maven.plugins + maven-war-plugin + 2.1-beta-1 + org.apache.maven.plugins maven-surefire-plugin @@ -179,6 +184,68 @@ THE SOFTWARE. + + + org.kohsuke + maven-junit-plugin + 1.9 + + + org.jvnet.localizer + maven-localizer-plugin + 1.10 + + + org.jvnet.hudson.tools + maven-encoding-plugin + 1.1 + + + com.infradna.tool + bridge-method-injector + 1.4 + + + org.codehaus.mojo + antlr-maven-plugin + 2.1 + + + org.codehaus.mojo + apt-maven-plugin + 1.0-alpha-4 + + + org.codehaus.mojo + cobertura-maven-plugin + 2.4-apb-SNAPSHOT + + + org.codehaus.mojo + findbugs-maven-plugin + 2.1 + + + org.apache.maven.plugins + maven-pmd-plugin + 2.5 + + + + org.jenkins-ci.tools + maven-jenkins-dev-plugin + 6.1.26-jenkins-1 + + + org.jvnet.updatecenter2 + maven-makepkgs-plugin + 0.3 + + + org.apache.maven.plugins + maven-antrun-plugin + 1.5 + diff --git a/remoting/pom.xml b/remoting/pom.xml index f3cb2d65d3..3581da2c1e 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -44,7 +44,7 @@ THE SOFTWARE. org.codehaus.mojo findbugs-maven-plugin - 2.1 + High @@ -52,7 +52,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-pmd-plugin - 2.5 + @@ -91,6 +92,7 @@ THE SOFTWARE. org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin + generate-resources diff --git a/test/pom.xml b/test/pom.xml index 9577adaa42..3e466c3170 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -47,6 +47,7 @@ THE SOFTWARE. maven-surefire-plugin + true @@ -55,7 +56,7 @@ THE SOFTWARE. org.kohsuke maven-junit-plugin - 1.9 + @@ -92,7 +93,7 @@ THE SOFTWARE. org.kohsuke.gmaven gmaven-plugin - 1.0-rc-5-patch-2 + preset-packager @@ -123,7 +124,7 @@ THE SOFTWARE. org.kohsuke.stapler maven-stapler-plugin - 1.15 + true @@ -230,6 +231,7 @@ THE SOFTWARE. org.kohsuke.gmaven gmaven-plugin + @@ -247,14 +249,6 @@ THE SOFTWARE. - - - com.sun.maven - maven-junit-plugin - - true - - diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 46d5896ad7..a6a9ff03d9 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -92,13 +92,13 @@ THE SOFTWARE. org.kohsuke.stapler maven-stapler-plugin - 1.15 + true org.jvnet.localizer maven-localizer-plugin - 1.8 + diff --git a/war/pom.xml b/war/pom.xml index ae1dcef118..2335f84b59 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -44,7 +44,7 @@ THE SOFTWARE. maven-war-plugin - 2.1-beta-1 + true @@ -68,6 +68,7 @@ THE SOFTWARE. maven-dependency-plugin + generate-resources @@ -83,6 +84,7 @@ THE SOFTWARE. org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin + package @@ -135,6 +137,7 @@ THE SOFTWARE. com.cloudbees maven-license-plugin + target/classes/META-INF/licenses.xml @@ -152,7 +155,7 @@ THE SOFTWARE. org.jenkins-ci.tools maven-jenkins-dev-plugin - 6.1.26-jenkins-1 + ${contextPath} @@ -341,6 +344,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-antrun-plugin + From d091f85484ecbbf52802dd90c9be1dcbb7d48200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sat, 21 May 2011 00:21:47 +0200 Subject: [PATCH 047/113] Remove hardcoded http wagon. It is provide by maven itself and it creates a conflict with the one used by the core (3.x for exemple) --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index b55a9680f1..53b0024cce 100644 --- a/pom.xml +++ b/pom.xml @@ -344,13 +344,6 @@ THE SOFTWARE. --> - - - org.apache.maven.wagon - wagon-http - 1.0-beta-5 - - From 520000d020f3a650e427cb79c6279653d77e2f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:03:51 +0200 Subject: [PATCH 048/113] upgrade maven-antrun-extended-plugin 1.39 -> 1.42 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 53b0024cce..e036ffe8ad 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ THE SOFTWARE. org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin - 1.39 + 1.42 org.apache.maven.plugins From e79ad5d03f38ed50459f2f1b4cf646b14f21c34a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:04:48 +0200 Subject: [PATCH 049/113] Upgrade maven-project-info-reports-plugin 2.1 -> 2.4 --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 34f390b5d8..58973b18eb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -841,7 +841,7 @@ THE SOFTWARE. maven-project-info-reports-plugin - 2.1 + 2.4 false From 2eb52961fb60bbcc728094cce2b538c9d2919323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:05:54 +0200 Subject: [PATCH 050/113] Upgrade maven-deploy-plugin from 2.5 to 2.6 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e036ffe8ad..d9b2e908e0 100644 --- a/pom.xml +++ b/pom.xml @@ -89,8 +89,8 @@ THE SOFTWARE. org.apache.maven.plugins maven-deploy-plugin - 2.5 - + 2.6 + org.apache.maven.plugins maven-install-plugin From 14ef8fec04ba54c0ced297e8a01f28465ce1698e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:07:46 +0200 Subject: [PATCH 051/113] Upgrade maven-javadoc-plugin from 2.6.1 to 2.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9b2e908e0..9ccb68a3e4 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-javadoc-plugin - 2.6.1 + 2.8 org.apache.maven.plugins From c38fdd1f8b24548d9f37f61b77a07c6ec16ca671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:08:23 +0200 Subject: [PATCH 052/113] Upgrade maven-war-plugin 2.1-beta-1 to 2.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9ccb68a3e4..5c6bb88dbb 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-war-plugin - 2.1-beta-1 + 2.1.1 org.apache.maven.plugins From 968f202d25e39c29ae0a16dc7e19d3566923fc74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:09:19 +0200 Subject: [PATCH 053/113] Upgrade maven-surefire-plugin 2.8 to 2.8.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c6bb88dbb..0e1e0ff6bb 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-surefire-plugin - 2.8 + 2.8.1 ${project.build.directory} From ca2576762d45c1f2f44d544fa47cbb1c8a413dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:09:52 +0200 Subject: [PATCH 054/113] Upgrade maven-dependency-plugin 2.1 -> 2.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e1e0ff6bb..f003c7bbb3 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-dependency-plugin - 2.1 + 2.2 org.apache.maven.plugins From b7c884da3063f55db85d41d809ba71fae334b320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:13:36 +0200 Subject: [PATCH 055/113] Upgrade maven-resources-plugin 2.4.3 -> 2.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f003c7bbb3..ecfc23b6f6 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-resources-plugin - 2.4.3 + 2.5 org.jenkins-ci.tools maven-jenkins-dev-plugin - 6.1.26-jenkins-1 + 6.1.26-jenkins-2 org.jenkins-ci.tools maven-jenkins-dev-plugin - 6.1.26-jenkins-1 + 6.1.26-jenkins-2 org.jvnet.updatecenter2 From c5c805b85809cb59467fa0455fe0338be67f9bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:30:10 +0200 Subject: [PATCH 063/113] Upgrade maven-makepkgs-plugin 0.3 -> 0.5.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0d04a4feaf..7478460010 100644 --- a/pom.xml +++ b/pom.xml @@ -239,8 +239,8 @@ THE SOFTWARE. org.jvnet.updatecenter2 maven-makepkgs-plugin - 0.3 - + 0.5.1 + org.apache.maven.plugins maven-antrun-plugin From a78812bfb2803c922f1ef6325eb062e38bf26f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:30:43 +0200 Subject: [PATCH 064/113] Upgrade maven-antrun-plugin 1.5 -> 1.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7478460010..e8c20da9fa 100644 --- a/pom.xml +++ b/pom.xml @@ -244,7 +244,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-antrun-plugin - 1.5 + 1.6 From 65e55c677f239d772ecd3796d853dabe5b27c88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:08:54 +0200 Subject: [PATCH 065/113] Set version of maven-gpg-plugin to 1.2 --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index e8c20da9fa..928f5987bd 100644 --- a/pom.xml +++ b/pom.xml @@ -91,6 +91,10 @@ THE SOFTWARE. maven-deploy-plugin 2.6 + + maven-gpg-plugin + 1.2 + org.apache.maven.plugins maven-install-plugin From c5a4d1631afbca89c4f159cc862dcc76b7379fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:01:46 +0200 Subject: [PATCH 066/113] Set findbugs-maven-plugin 2.3.2 --- core/pom.xml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 58973b18eb..6e96d4815d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -291,7 +291,7 @@ THE SOFTWARE. org.codehaus.mojo findbugs-maven-plugin - 1.2 + 2.3.2 Max Normal diff --git a/pom.xml b/pom.xml index 928f5987bd..0eb361cbb9 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ THE SOFTWARE. org.codehaus.mojo findbugs-maven-plugin - 2.1 + 2.3.2 org.apache.maven.plugins @@ -403,7 +403,7 @@ THE SOFTWARE. org.codehaus.mojo findbugs-maven-plugin - 2.4 + 2.3.2 High From 073734f363487abcfef815a0c0a3d5dda3876649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:31:18 +0200 Subject: [PATCH 067/113] Add maven-hpi-plugin 1.69 definition --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 0eb361cbb9..28685f19f3 100644 --- a/pom.xml +++ b/pom.xml @@ -250,6 +250,11 @@ THE SOFTWARE. maven-antrun-plugin 1.6 + + org.jenkins-ci.tools + maven-hpi-plugin + 1.69 + From 3c88fc56dd82f41c41d80972b013bd151cd06aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sat, 28 May 2011 12:13:30 +0200 Subject: [PATCH 068/113] JENKINS-9788 : Put test-harness execution in a profile. You can skip them by adding -P-run-test-harness in the build command line --- test/pom.xml | 118 ++++++++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 53 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index 9577adaa42..af79f5ccf8 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -46,48 +46,17 @@ THE SOFTWARE. - maven-surefire-plugin - - true - + org.kohsuke.stapler + maven-stapler-plugin + 1.15 + true - - org.kohsuke - maven-junit-plugin - 1.9 - - - - test - - - true - ${concurrency} - -Dfile.encoding=UTF-8 - 300 - - - - hudson.ClassicPluginStrategy.useAntClassLoader - true - - - hudson.maven.debug - ${mavenDebug} - - - java.io.tmpdir - ${project.build.directory} - - - buildDirectory - ${project.build.directory} - - - - - + maven-surefire-plugin + + true + + org.kohsuke.gmaven @@ -120,15 +89,9 @@ THE SOFTWARE. - - org.kohsuke.stapler - maven-stapler-plugin - 1.15 - true - - + + compile + org.jvnet.mock-javamail @@ -181,11 +145,11 @@ THE SOFTWARE. htmlunit 2.6-jenkins-4 - - - xml-apis - xml-apis - + + + xml-apis + xml-apis + @@ -214,6 +178,54 @@ THE SOFTWARE. + + + run-test-harness + + + + + org.kohsuke + maven-junit-plugin + 1.9 + + + + test + + + true + ${concurrency} + -Dfile.encoding=UTF-8 + 300 + + + + hudson.ClassicPluginStrategy.useAntClassLoader + true + + + hudson.maven.debug + ${mavenDebug} + + + java.io.tmpdir + ${project.build.directory} + + + buildDirectory + ${project.build.directory} + + + + + + + + + + + light-test From 72ecd06cb5ca23d198dd41acef2dde988d7ab20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Thu, 19 May 2011 08:58:24 +0200 Subject: [PATCH 069/113] Maven Best Practice : Always define plugins versions in the pluginManagement of the root POM --- cli/pom.xml | 3 +- core/pom.xml | 20 ++++++++---- maven-plugin/pom.xml | 7 ++-- plugins/pom.xml | 5 +-- pom.xml | 67 +++++++++++++++++++++++++++++++++++++++ remoting/pom.xml | 6 ++-- test/pom.xml | 16 +++------- ui-samples-plugin/pom.xml | 4 +-- war/pom.xml | 10 ++++-- 9 files changed, 108 insertions(+), 30 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 60876efd7b..ace8b6f299 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -13,6 +13,7 @@ maven-assembly-plugin + @@ -33,7 +34,7 @@ org.jvnet.localizer maven-localizer-plugin - 1.10 + diff --git a/core/pom.xml b/core/pom.xml index 48920c6bb7..34f390b5d8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -48,7 +48,7 @@ THE SOFTWARE. org.jvnet.hudson.tools maven-encoding-plugin - 1.1 + @@ -61,7 +61,7 @@ THE SOFTWARE. com.infradna.tool bridge-method-injector - 1.4 + @@ -73,6 +73,7 @@ THE SOFTWARE. org.kohsuke.stapler maven-stapler-plugin + true @@ -89,7 +90,7 @@ THE SOFTWARE. org.jvnet.localizer maven-localizer-plugin - 1.10 + @@ -105,7 +106,7 @@ THE SOFTWARE. org.kohsuke access-modifier-checker - 1.0 + @@ -117,7 +118,7 @@ THE SOFTWARE. org.codehaus.mojo antlr-maven-plugin - 2.1 + cron @@ -144,6 +145,7 @@ THE SOFTWARE. org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin + generate-resources @@ -181,6 +183,7 @@ THE SOFTWARE. maven-jar-plugin + @@ -198,7 +201,7 @@ THE SOFTWARE. --> org.codehaus.mojo apt-maven-plugin - 1.0-alpha-4 + true org.jvnet.hudson.tools.ExtensionPointListerFactory @@ -246,7 +249,7 @@ THE SOFTWARE. org.codehaus.mojo apt-maven-plugin - 1.0-alpha-2 + @@ -263,6 +266,7 @@ THE SOFTWARE. --> org.kohsuke.stapler maven-stapler-plugin + @@ -308,6 +312,7 @@ THE SOFTWARE. org.kohsuke.gmaven gmaven-plugin + @@ -327,6 +332,7 @@ THE SOFTWARE. maven-surefire-plugin + true diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 8047696cc8..8224d0f4ca 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -339,12 +339,13 @@ THE SOFTWARE. org.kohsuke.stapler maven-stapler-plugin + true org.jvnet.localizer maven-localizer-plugin - 1.8 + @@ -360,6 +361,7 @@ THE SOFTWARE. com.cloudbees maven-license-plugin + target/${project.artifactId}/WEB-INF/licenses.xml @@ -367,6 +369,7 @@ THE SOFTWARE. org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin + resgen @@ -397,7 +400,7 @@ THE SOFTWARE. org.codehaus.mojo cobertura-maven-plugin - 2.4-apb-SNAPSHOT + true diff --git a/plugins/pom.xml b/plugins/pom.xml index d1ab491b2b..d74220dee3 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -157,7 +157,7 @@ org.codehaus.groovy.maven gmaven-plugin - 1.0-rc-5 + test-in-groovy @@ -178,6 +178,7 @@ maven-surefire-plugin + @@ -190,7 +191,7 @@ com.cloudbees maven-license-plugin - 1.3 + diff --git a/pom.xml b/pom.xml index 8b76bb1f10..b55a9680f1 100644 --- a/pom.xml +++ b/pom.xml @@ -106,6 +106,11 @@ THE SOFTWARE. maven-jar-plugin 2.3.1 + + org.apache.maven.plugins + maven-war-plugin + 2.1-beta-1 + org.apache.maven.plugins maven-surefire-plugin @@ -179,6 +184,68 @@ THE SOFTWARE. + + + org.kohsuke + maven-junit-plugin + 1.9 + + + org.jvnet.localizer + maven-localizer-plugin + 1.10 + + + org.jvnet.hudson.tools + maven-encoding-plugin + 1.1 + + + com.infradna.tool + bridge-method-injector + 1.4 + + + org.codehaus.mojo + antlr-maven-plugin + 2.1 + + + org.codehaus.mojo + apt-maven-plugin + 1.0-alpha-4 + + + org.codehaus.mojo + cobertura-maven-plugin + 2.4-apb-SNAPSHOT + + + org.codehaus.mojo + findbugs-maven-plugin + 2.1 + + + org.apache.maven.plugins + maven-pmd-plugin + 2.5 + + + + org.jenkins-ci.tools + maven-jenkins-dev-plugin + 6.1.26-jenkins-1 + + + org.jvnet.updatecenter2 + maven-makepkgs-plugin + 0.3 + + + org.apache.maven.plugins + maven-antrun-plugin + 1.5 + diff --git a/remoting/pom.xml b/remoting/pom.xml index f3cb2d65d3..3581da2c1e 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -44,7 +44,7 @@ THE SOFTWARE. org.codehaus.mojo findbugs-maven-plugin - 2.1 + High @@ -52,7 +52,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-pmd-plugin - 2.5 + @@ -91,6 +92,7 @@ THE SOFTWARE. org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin + generate-resources diff --git a/test/pom.xml b/test/pom.xml index af79f5ccf8..5437c86319 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -48,11 +48,12 @@ THE SOFTWARE. org.kohsuke.stapler maven-stapler-plugin - 1.15 + true maven-surefire-plugin + true @@ -61,7 +62,7 @@ THE SOFTWARE. org.kohsuke.gmaven gmaven-plugin - 1.0-rc-5-patch-2 + preset-packager @@ -187,7 +188,7 @@ THE SOFTWARE. org.kohsuke maven-junit-plugin - 1.9 + @@ -242,6 +243,7 @@ THE SOFTWARE. org.kohsuke.gmaven gmaven-plugin + @@ -259,14 +261,6 @@ THE SOFTWARE. - - - com.sun.maven - maven-junit-plugin - - true - - diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 46d5896ad7..a6a9ff03d9 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -92,13 +92,13 @@ THE SOFTWARE. org.kohsuke.stapler maven-stapler-plugin - 1.15 + true org.jvnet.localizer maven-localizer-plugin - 1.8 + diff --git a/war/pom.xml b/war/pom.xml index ae1dcef118..2335f84b59 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -44,7 +44,7 @@ THE SOFTWARE. maven-war-plugin - 2.1-beta-1 + true @@ -68,6 +68,7 @@ THE SOFTWARE. maven-dependency-plugin + generate-resources @@ -83,6 +84,7 @@ THE SOFTWARE. org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin + package @@ -135,6 +137,7 @@ THE SOFTWARE. com.cloudbees maven-license-plugin + target/classes/META-INF/licenses.xml @@ -152,7 +155,7 @@ THE SOFTWARE. org.jenkins-ci.tools maven-jenkins-dev-plugin - 6.1.26-jenkins-1 + ${contextPath} @@ -341,6 +344,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-antrun-plugin + From 709337aaa85a23c653ca38c9940de5f6ccac03ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sat, 21 May 2011 00:21:47 +0200 Subject: [PATCH 070/113] Remove hardcoded http wagon. It is provide by maven itself and it creates a conflict with the one used by the core (3.x for exemple) --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index b55a9680f1..53b0024cce 100644 --- a/pom.xml +++ b/pom.xml @@ -344,13 +344,6 @@ THE SOFTWARE. --> - - - org.apache.maven.wagon - wagon-http - 1.0-beta-5 - - From c82be090bb5d2a49217b3dd4a5115f41f4bea6bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:03:51 +0200 Subject: [PATCH 071/113] upgrade maven-antrun-extended-plugin 1.39 -> 1.42 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 53b0024cce..e036ffe8ad 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ THE SOFTWARE. org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin - 1.39 + 1.42 org.apache.maven.plugins From e17d7706ec637e18e4746a5c523f3fe13e339d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:04:48 +0200 Subject: [PATCH 072/113] Upgrade maven-project-info-reports-plugin 2.1 -> 2.4 --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 34f390b5d8..58973b18eb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -841,7 +841,7 @@ THE SOFTWARE. maven-project-info-reports-plugin - 2.1 + 2.4 false From af2a1d38b888fd44985f237a3af7b2de76eb4a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:05:54 +0200 Subject: [PATCH 073/113] Upgrade maven-deploy-plugin from 2.5 to 2.6 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e036ffe8ad..d9b2e908e0 100644 --- a/pom.xml +++ b/pom.xml @@ -89,8 +89,8 @@ THE SOFTWARE. org.apache.maven.plugins maven-deploy-plugin - 2.5 - + 2.6 + org.apache.maven.plugins maven-install-plugin From fd22e3199a043a082c80ddead7a6dfa175a8a119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:07:46 +0200 Subject: [PATCH 074/113] Upgrade maven-javadoc-plugin from 2.6.1 to 2.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9b2e908e0..9ccb68a3e4 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-javadoc-plugin - 2.6.1 + 2.8 org.apache.maven.plugins From ebac3e97c183a22d0830219cdf26da79613ecbfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:08:23 +0200 Subject: [PATCH 075/113] Upgrade maven-war-plugin 2.1-beta-1 to 2.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9ccb68a3e4..5c6bb88dbb 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-war-plugin - 2.1-beta-1 + 2.1.1 org.apache.maven.plugins From fc2358b5c4124ada2389996bdce658e0634ba0db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:09:19 +0200 Subject: [PATCH 076/113] Upgrade maven-surefire-plugin 2.8 to 2.8.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c6bb88dbb..0e1e0ff6bb 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-surefire-plugin - 2.8 + 2.8.1 ${project.build.directory} From 3ceed62d6ef4dfafb0b619a36630f96c9e96121a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:09:52 +0200 Subject: [PATCH 077/113] Upgrade maven-dependency-plugin 2.1 -> 2.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e1e0ff6bb..f003c7bbb3 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-dependency-plugin - 2.1 + 2.2 org.apache.maven.plugins From 096a283877240d39db9cd1542ea0fcc0ba0e26b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:13:36 +0200 Subject: [PATCH 078/113] Upgrade maven-resources-plugin 2.4.3 -> 2.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f003c7bbb3..ecfc23b6f6 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-resources-plugin - 2.4.3 + 2.5 org.jenkins-ci.tools maven-jenkins-dev-plugin - 6.1.26-jenkins-1 + 6.1.26-jenkins-2 org.jenkins-ci.tools maven-jenkins-dev-plugin - 6.1.26-jenkins-1 + 6.1.26-jenkins-2 org.jvnet.updatecenter2 From 0213156355ca0ca1ad84ab9adf30a334c477a271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:30:10 +0200 Subject: [PATCH 086/113] Upgrade maven-makepkgs-plugin 0.3 -> 0.5.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0d04a4feaf..7478460010 100644 --- a/pom.xml +++ b/pom.xml @@ -239,8 +239,8 @@ THE SOFTWARE. org.jvnet.updatecenter2 maven-makepkgs-plugin - 0.3 - + 0.5.1 + org.apache.maven.plugins maven-antrun-plugin From be73451fd446c1f8a39a1d6f588c53ab200cd5f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:30:43 +0200 Subject: [PATCH 087/113] Upgrade maven-antrun-plugin 1.5 -> 1.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7478460010..e8c20da9fa 100644 --- a/pom.xml +++ b/pom.xml @@ -244,7 +244,7 @@ THE SOFTWARE. org.apache.maven.plugins maven-antrun-plugin - 1.5 + 1.6 From 1bb75ccce19299cf92efe2b0fe1a3b69c007bb32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:08:54 +0200 Subject: [PATCH 088/113] Set version of maven-gpg-plugin to 1.2 --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index e8c20da9fa..928f5987bd 100644 --- a/pom.xml +++ b/pom.xml @@ -91,6 +91,10 @@ THE SOFTWARE. maven-deploy-plugin 2.6 + + maven-gpg-plugin + 1.2 + org.apache.maven.plugins maven-install-plugin From 557d8adecf7c2ef4e5b65e180f67d2715cfe226f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:01:46 +0200 Subject: [PATCH 089/113] Set findbugs-maven-plugin 2.3.2 --- core/pom.xml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 58973b18eb..6e96d4815d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -291,7 +291,7 @@ THE SOFTWARE. org.codehaus.mojo findbugs-maven-plugin - 1.2 + 2.3.2 Max Normal diff --git a/pom.xml b/pom.xml index 928f5987bd..0eb361cbb9 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ THE SOFTWARE. org.codehaus.mojo findbugs-maven-plugin - 2.1 + 2.3.2 org.apache.maven.plugins @@ -403,7 +403,7 @@ THE SOFTWARE. org.codehaus.mojo findbugs-maven-plugin - 2.4 + 2.3.2 High From 0cfbe3ffe897731cba74cf2149a9adec8004b8f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sun, 22 May 2011 23:31:18 +0200 Subject: [PATCH 090/113] Add maven-hpi-plugin 1.69 definition --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 0eb361cbb9..28685f19f3 100644 --- a/pom.xml +++ b/pom.xml @@ -250,6 +250,11 @@ THE SOFTWARE. maven-antrun-plugin 1.6 + + org.jenkins-ci.tools + maven-hpi-plugin + 1.69 + From 8e85eab6d981bb0d28cf91904c10f364f8897f2c Mon Sep 17 00:00:00 2001 From: Seiji Sogabe Date: Sat, 28 May 2011 21:34:11 +0900 Subject: [PATCH 091/113] Fixed "Weather report" and "Changes". http://jenkins.361315.n4.nabble.com/jenkinsci-ja-142-td3474686.html#a3556651 --- core/src/main/java/hudson/model/ComputerSet.java | 4 ++-- .../model/AbstractBuild/changes_ja.properties | 4 ++-- .../model/AbstractBuild/tasks_ja.properties | 2 +- .../model/AbstractProject/changes_ja.properties | 10 +++++----- .../model/AbstractProject/main_ja.properties | 2 +- .../AbstractProject/sidepanel_ja.properties | 4 ++-- .../hudson/model/ComputerSet/index.jelly | 8 +++++--- .../hudson/views/Messages_ja.properties | 16 ++++++++-------- .../WeatherColumn/columnHeader_ja.properties | 4 ++-- 9 files changed, 28 insertions(+), 26 deletions(-) diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java index 4d3f59d218..b8fa62a242 100644 --- a/core/src/main/java/hudson/model/ComputerSet.java +++ b/core/src/main/java/hudson/model/ComputerSet.java @@ -44,9 +44,9 @@ import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import java.io.File; import java.io.IOException; import java.util.AbstractList; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import java.util.logging.Level; import java.util.logging.Logger; @@ -105,7 +105,7 @@ public final class ComputerSet extends AbstractModelObject { * Returns a subset pf {@link #getMonitors()} that are {@linkplain NodeMonitor#isIgnored() not ignored}. */ public static Map,NodeMonitor> getNonIgnoredMonitors() { - Map,NodeMonitor> r = new HashMap, NodeMonitor>(); + Map,NodeMonitor> r = new LinkedHashMap, NodeMonitor>(); for (NodeMonitor m : monitors) { if(!m.isIgnored()) r.put(m.getDescriptor(),m); diff --git a/core/src/main/resources/hudson/model/AbstractBuild/changes_ja.properties b/core/src/main/resources/hudson/model/AbstractBuild/changes_ja.properties index 152a35bc12..3de1f83a3d 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/changes_ja.properties +++ b/core/src/main/resources/hudson/model/AbstractBuild/changes_ja.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman +# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Changes=\u5909\u66f4 \ No newline at end of file +Changes=\u5909\u66f4\u5c65\u6b74 \ No newline at end of file diff --git a/core/src/main/resources/hudson/model/AbstractBuild/tasks_ja.properties b/core/src/main/resources/hudson/model/AbstractBuild/tasks_ja.properties index 95ec83cb5d..a3de308fb2 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/tasks_ja.properties +++ b/core/src/main/resources/hudson/model/AbstractBuild/tasks_ja.properties @@ -22,7 +22,7 @@ Back\ to\ Project=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3078\u623b\u308b Status=\u72b6\u614b -Changes=\u5909\u66f4 +Changes=\u5909\u66f4\u5c65\u6b74 Console\ Output=\u30b3\u30f3\u30bd\u30fc\u30eb\u51fa\u529b raw=\u672a\u52a0\u5de5 Configure=\u8a2d\u5b9a diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_ja.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_ja.properties index bd4946b6f7..11ca4887af 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/changes_ja.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/changes_ja.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman. Seiji Sogabe +# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman. Seiji Sogabe # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -changes.title={0}\u306E\u5909\u66F4 -Changes=\u5909\u66F4 -from.label=#{0} \u304B\u3089 -to.label=#{0} \u307E\u3067 \ No newline at end of file +changes.title={0}\u306e\u5909\u66f4 +Changes=\u5909\u66f4\u5c65\u6b74 +from.label=#{0} \u304b\u3089 +to.label=#{0} \u307e\u3067 \ No newline at end of file diff --git a/core/src/main/resources/hudson/model/AbstractProject/main_ja.properties b/core/src/main/resources/hudson/model/AbstractProject/main_ja.properties index 1491140745..25cc20ec66 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/main_ja.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/main_ja.properties @@ -21,7 +21,7 @@ # THE SOFTWARE. Workspace=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9 -Recent\ Changes=\u6700\u65b0\u306e\u5909\u66f4 +Recent\ Changes=\u5909\u66f4\u5c65\u6b74s Last\ Successful\ Artifacts=\u6700\u65b0\u6210\u529f\u30d3\u30eb\u30c9\u306e\u6210\u679c\u7269 Latest\ Test\ Result=\u6700\u65b0\u306e\u30c6\u30b9\u30c8\u7d50\u679c Latest\ Aggregated\ Test\ Result=\u6700\u65b0\u306e\u96c6\u7d04\u3055\u308c\u305f\u30c6\u30b9\u30c8\u7d50\u679c diff --git a/core/src/main/resources/hudson/model/AbstractProject/sidepanel_ja.properties b/core/src/main/resources/hudson/model/AbstractProject/sidepanel_ja.properties index 36d132197d..4d243cf2c8 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/sidepanel_ja.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/sidepanel_ja.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman +# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ Back\ to\ Dashboard=\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u3078\u623b\u308b Status=\u72b6\u614b -Changes=\u5909\u66f4 +Changes=\u5909\u66f4\u5c65\u6b74 Workspace=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9 Wipe\ Out\ Workspace=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u306e\u30af\u30ea\u30a2 delete={0}\u306e\u524a\u9664 diff --git a/core/src/main/resources/hudson/model/ComputerSet/index.jelly b/core/src/main/resources/hudson/model/ComputerSet/index.jelly index 622a9b98be..8c62c59657 100644 --- a/core/src/main/resources/hudson/model/ComputerSet/index.jelly +++ b/core/src/main/resources/hudson/model/ComputerSet/index.jelly @@ -37,13 +37,14 @@ THE SOFTWARE. - + - + + @@ -57,7 +58,8 @@ THE SOFTWARE. ${c.iconAltText} - + + diff --git a/core/src/main/resources/hudson/views/Messages_ja.properties b/core/src/main/resources/hudson/views/Messages_ja.properties index 2cac213423..40402bd650 100644 --- a/core/src/main/resources/hudson/views/Messages_ja.properties +++ b/core/src/main/resources/hudson/views/Messages_ja.properties @@ -20,11 +20,11 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -BuildButtonColumn.DisplayName=\u30D3\u30EB\u30C9\u30DC\u30BF\u30F3 -JobColumn.DisplayName=\u540D\u524D -LastDurationColumn.DisplayName=\u30D3\u30EB\u30C9\u6240\u8981\u6642\u9593 -LastFailureColumn.DisplayName=\u6700\u65B0\u306E\u5931\u6557\u30D3\u30EB\u30C9 -LastStableColumn.DisplayName=\u6700\u65B0\u306E\u5B89\u5B9A\u30D3\u30EB\u30C9 -LastSuccessColumn.DisplayName=\u6700\u65B0\u306E\u6210\u529F\u30D3\u30EB\u30C9 -StatusColumn.DisplayName=\u30B9\u30C6\u30FC\u30BF\u30B9 -WeatherColumn.DisplayName=\u5929\u6C17\u4E88\u5831 +BuildButtonColumn.DisplayName=\u30d3\u30eb\u30c9\u30dc\u30bf\u30f3 +JobColumn.DisplayName=\u540d\u524d +LastDurationColumn.DisplayName=\u30d3\u30eb\u30c9\u6240\u8981\u6642\u9593 +LastFailureColumn.DisplayName=\u6700\u65b0\u306e\u5931\u6557\u30d3\u30eb\u30c9 +LastStableColumn.DisplayName=\u6700\u65b0\u306e\u5b89\u5b9a\u30d3\u30eb\u30c9 +LastSuccessColumn.DisplayName=\u6700\u65b0\u306e\u6210\u529f\u30d3\u30eb\u30c9 +StatusColumn.DisplayName=\u30b9\u30c6\u30fc\u30bf\u30b9 +WeatherColumn.DisplayName=\u7a7a\u6a21\u69d8 diff --git a/core/src/main/resources/hudson/views/WeatherColumn/columnHeader_ja.properties b/core/src/main/resources/hudson/views/WeatherColumn/columnHeader_ja.properties index de2f1aef3d..b494da4e78 100644 --- a/core/src/main/resources/hudson/views/WeatherColumn/columnHeader_ja.properties +++ b/core/src/main/resources/hudson/views/WeatherColumn/columnHeader_ja.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman, Martin Eigenbrodt +# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman, Martin Eigenbrodt # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,4 +21,4 @@ # THE SOFTWARE. Weather\ report\ showing\ aggregated\ status\ of\ recent\ builds=\ - \u6700\u8FD1\u306E\u30D3\u30EB\u30C9\u306E\u30B9\u30C6\u30FC\u30BF\u30B9\u3092\u96C6\u7D04\u3057\u305F\u5929\u6C17\u4E88\u5831 + \u6700\u8fd1\u306e\u30d3\u30eb\u30c9\u306e\u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u96c6\u7d04\u3057\u305f\u7a7a\u6a21\u69d8 From 398fb10048ae4a6a772b2b1fe081cf4496559740 Mon Sep 17 00:00:00 2001 From: Seiji Sogabe Date: Sat, 28 May 2011 21:46:07 +0900 Subject: [PATCH 092/113] mistake. rollback. --- core/src/main/java/hudson/model/ComputerSet.java | 4 ++-- .../main/resources/hudson/model/ComputerSet/index.jelly | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java index b8fa62a242..0407e11322 100644 --- a/core/src/main/java/hudson/model/ComputerSet.java +++ b/core/src/main/java/hudson/model/ComputerSet.java @@ -44,7 +44,7 @@ import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import java.io.File; import java.io.IOException; import java.util.AbstractList; -import java.util.LinkedHashMap; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.logging.Level; @@ -105,7 +105,7 @@ public final class ComputerSet extends AbstractModelObject { * Returns a subset pf {@link #getMonitors()} that are {@linkplain NodeMonitor#isIgnored() not ignored}. */ public static Map,NodeMonitor> getNonIgnoredMonitors() { - Map,NodeMonitor> r = new LinkedHashMap, NodeMonitor>(); + Map,NodeMonitor> r = new HashMap, NodeMonitor>(); for (NodeMonitor m : monitors) { if(!m.isIgnored()) r.put(m.getDescriptor(),m); diff --git a/core/src/main/resources/hudson/model/ComputerSet/index.jelly b/core/src/main/resources/hudson/model/ComputerSet/index.jelly index 8c62c59657..622a9b98be 100644 --- a/core/src/main/resources/hudson/model/ComputerSet/index.jelly +++ b/core/src/main/resources/hudson/model/ComputerSet/index.jelly @@ -37,14 +37,13 @@ THE SOFTWARE. - +
        S ${%Name}${m.columnCaption} ${c.displayName}
        - - + @@ -58,8 +57,7 @@ THE SOFTWARE. ${c.iconAltText} - - + From 9485e36e330064ebd337900352f32d3a79b6166f Mon Sep 17 00:00:00 2001 From: bap2000 Date: Sat, 28 May 2011 14:07:12 +0100 Subject: [PATCH 093/113] Ignore vim backup files --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index d84681e336..66394a91ca 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,9 @@ out .project build +# vim +*~ + war/images/16x16 war/images/24x24 war/images/32x32 From 8af3905a24da8b6354d3d200dced04f0ff4dd7c3 Mon Sep 17 00:00:00 2001 From: bap2000 Date: Sat, 28 May 2011 14:10:37 +0100 Subject: [PATCH 094/113] Fix version and usage text from java -jar jenkins.war --x --- changelog.html | 5 ++++- war/pom.xml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changelog.html b/changelog.html index 0f043364e0..1418ceae28 100644 --- a/changelog.html +++ b/changelog.html @@ -55,7 +55,10 @@ Upcoming changes diff --git a/war/pom.xml b/war/pom.xml index ae1dcef118..4967e0cb31 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -109,7 +109,7 @@ THE SOFTWARE. - + From be03ace384755b785b5d625817a4d8c3de23f308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Sat, 28 May 2011 16:56:31 +0200 Subject: [PATCH 095/113] JENKINS-9791 : Display an error message if the "deploy after build" feature is activated but the "archive artifacts" is disabled --- .../src/main/java/hudson/maven/RedeployPublisher.java | 8 ++++++++ .../resources/hudson/maven/RedeployPublisher/help.html | 4 ++++ .../resources/hudson/maven/RedeployPublisher/help_de.html | 5 +++++ .../resources/hudson/maven/RedeployPublisher/help_fr.html | 4 ++++ .../resources/hudson/maven/RedeployPublisher/help_ja.html | 4 ++++ 5 files changed, 25 insertions(+) diff --git a/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java b/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java index 0e4bebc8dd..8ab914679a 100644 --- a/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java +++ b/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java @@ -122,6 +122,14 @@ public class RedeployPublisher extends Recorder { return true; } + if(build instanceof MavenModuleSetBuild && ((MavenModuleSetBuild)build).getParent().isArchivingDisabled()){ + listener.getLogger().println("[ERROR] You cannot use the \"Deploy artifacts to Maven repository\" feature if you " + + "disabled " + + "automatic artifact archiving"); + build.setResult(Result.FAILURE); + return true; + } + listener.getLogger().println("Deploying artifacts to "+url); try { diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help.html b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help.html index 5e876525b8..5612392b96 100644 --- a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help.html +++ b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help.html @@ -13,4 +13,8 @@ Note that regardless of this configuration, you can always manually come back to Jenkins and deploy any of the past artifacts to any repository of your choice, after the fact. + +

        + To use this feature you shouldn't deactivate the automatic artifact archiving. +

        \ No newline at end of file diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_de.html b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_de.html index a6b2d79f3e..769dd67abf 100644 --- a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_de.html +++ b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_de.html @@ -11,4 +11,9 @@

        Hinweis: Unabhängig von dieser Einstellung können Sie aber auch jederzeit manuell Artefakte aus durchgeführten Builds in beliebige Repositories ausbringen. + +

        + To use this feature you shouldn't deactivate the automatic artifact archiving. +

        + \ No newline at end of file diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_fr.html b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_fr.html index 5e876525b8..5612392b96 100644 --- a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_fr.html +++ b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_fr.html @@ -13,4 +13,8 @@ Note that regardless of this configuration, you can always manually come back to Jenkins and deploy any of the past artifacts to any repository of your choice, after the fact. + +

        + To use this feature you shouldn't deactivate the automatic artifact archiving. +

        \ No newline at end of file diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_ja.html b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_ja.html index 46c4773ea8..7e1586ab08 100644 --- a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_ja.html +++ b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/help_ja.html @@ -9,4 +9,8 @@

        この設定を行っているかによらず、Jenkinsの画面からいつでも過去の成果物を任意のリポジトリにデプロイできます。 + +

        + To use this feature you shouldn't deactivate the automatic artifact archiving. +

        \ No newline at end of file From 84a78d5bac5b1ac45f7f8f957287b1ba4391c263 Mon Sep 17 00:00:00 2001 From: Dimitri BAELI Date: Sat, 28 May 2011 17:44:48 +0200 Subject: [PATCH 096/113] [FIXED JENKINS-9789] display the list of available CLI Commands --- changelog.html | 3 +++ core/src/main/java/hudson/Functions.java | 12 ++++++++++++ .../main/resources/hudson/model/Hudson/_cli.jelly | 6 ++++++ .../resources/hudson/model/Hudson/_cli.properties | 2 +- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index 1418ceae28..ca1c8c0d45 100644 --- a/changelog.html +++ b/changelog.html @@ -59,6 +59,9 @@ Upcoming changes Output correct version from java -jar jenkins.war --version (broken since 1.410)
      • Correct usage text from java -jar jenkins.war --help +
      • + CLI command page now lists all the available commands + (issue 9789) diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index a52968cc64..8e180b24a8 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -24,6 +24,7 @@ */ package hudson; +import hudson.cli.CLICommand; import hudson.console.ConsoleAnnotationDescriptor; import hudson.console.ConsoleAnnotatorFactory; import hudson.model.AbstractProject; @@ -1377,4 +1378,15 @@ public class Functions { public static Object rawHtml(Object o) { return o==null ? null : new RawHtmlArgument(o); } + + public static ArrayList getCLICommands() { + ArrayList all = new ArrayList(CLICommand.all()); + Collections.sort(all, new Comparator() { + public int compare(CLICommand cliCommand, CLICommand cliCommand1) { + return cliCommand.getName().compareTo(cliCommand1.getName()); + } + }); + return all; + } + } diff --git a/core/src/main/resources/hudson/model/Hudson/_cli.jelly b/core/src/main/resources/hudson/model/Hudson/_cli.jelly index 6f9357ec37..b5dd24f4e2 100644 --- a/core/src/main/resources/hudson/model/Hudson/_cli.jelly +++ b/core/src/main/resources/hudson/model/Hudson/_cli.jelly @@ -37,6 +37,12 @@ THE SOFTWARE.
        java -jar jenkins-cli.jar -s ${h.inferHudsonURL(request)} help
        +

        ${%Available Commands}

        +
          + +
        • ${command.getName()}: ${command.getShortDescription()}
        • +
          +
        diff --git a/core/src/main/resources/hudson/model/Hudson/_cli.properties b/core/src/main/resources/hudson/model/Hudson/_cli.properties index 90c13f84f2..d2e768307a 100644 --- a/core/src/main/resources/hudson/model/Hudson/_cli.properties +++ b/core/src/main/resources/hudson/model/Hudson/_cli.properties @@ -1,4 +1,4 @@ +Jenkins\ CLI=Jenkins CLI blurb=You can access various features in Jenkins through a command-line tool. See \ the Wiki for more details of this feature.\ To get started, download jenkins-cli.jar, and run it as follows: - From c9a8fe7671ca9068e29f216f6fec4e376a6d3c17 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 30 May 2011 00:47:42 -0700 Subject: [PATCH 097/113] [JENKINS-9791] add changelog entry --- changelog.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.html b/changelog.html index ca1c8c0d45..19aef3e81f 100644 --- a/changelog.html +++ b/changelog.html @@ -62,6 +62,9 @@ Upcoming changes
      • CLI command page now lists all the available commands (issue 9789) +
      • + Improve the post deployment job to make a clear error if you disabled artifacts archives + (issue 9791) From a2c208868976025ce167e2a76c0cafee6c544689 Mon Sep 17 00:00:00 2001 From: Vojtech Juranek Date: Mon, 30 May 2011 11:29:06 +0200 Subject: [PATCH 098/113] Possible fix for JENKINS-9609 - session destroy call add to ensure that socket is free --- .../java/hudson/os/windows/ManagedWindowsServiceLauncher.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java index ed2bc669f1..44a0c10690 100644 --- a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java +++ b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java @@ -267,6 +267,8 @@ public class ManagedWindowsServiceLauncher extends ComputerLauncher { afterDisconnect(computer,listener); } }); + //destroy session to free the socket + JISession.destroySession(session); } catch (SmbException e) { e.printStackTrace(listener.error(e.getMessage())); } catch (JIException e) { @@ -315,6 +317,8 @@ public class ManagedWindowsServiceLauncher extends ComputerLauncher { listener.getLogger().println(Messages.ManagedWindowsServiceLauncher_StoppingService()); slaveService.StopService(); } + //destroy session to free the socket + JISession.destroySession(session); } catch (UnknownHostException e) { e.printStackTrace(listener.error(e.getMessage())); } catch (JIException e) { From 63893e8a2d3fc8339bce24debcd03c5dd4b811a7 Mon Sep 17 00:00:00 2001 From: Seiji Sogabe Date: Mon, 30 May 2011 19:24:03 +0900 Subject: [PATCH 099/113] fixed typo. --- .../resources/hudson/model/AbstractProject/main_ja.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/model/AbstractProject/main_ja.properties b/core/src/main/resources/hudson/model/AbstractProject/main_ja.properties index 25cc20ec66..81fb8b60fc 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/main_ja.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/main_ja.properties @@ -21,7 +21,7 @@ # THE SOFTWARE. Workspace=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9 -Recent\ Changes=\u5909\u66f4\u5c65\u6b74s +Recent\ Changes=\u5909\u66f4\u5c65\u6b74 Last\ Successful\ Artifacts=\u6700\u65b0\u6210\u529f\u30d3\u30eb\u30c9\u306e\u6210\u679c\u7269 Latest\ Test\ Result=\u6700\u65b0\u306e\u30c6\u30b9\u30c8\u7d50\u679c Latest\ Aggregated\ Test\ Result=\u6700\u65b0\u306e\u96c6\u7d04\u3055\u308c\u305f\u30c6\u30b9\u30c8\u7d50\u679c From a0fb3a8ffb9529b6da419956dc548d57f0bd8578 Mon Sep 17 00:00:00 2001 From: Seiji Sogabe Date: Mon, 30 May 2011 19:39:08 +0900 Subject: [PATCH 100/113] fixed ja. --- .../resources/hudson/maven/MavenModuleSet/index_ja.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_ja.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_ja.properties index 43605f79be..632219b7d3 100644 --- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_ja.properties +++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_ja.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman +# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,7 +21,7 @@ # THE SOFTWARE. Workspace=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9 -Recent\ Changes=\u6700\u65b0\u306e\u5909\u66f4 +Recent\ Changes=\u5909\u66f4\u5c65\u6b74 Latest\ Test\ Result=\u6700\u65b0\u306e\u30c6\u30b9\u30c8\u7d50\u679c Last\ Successful\ Artifacts=\u6700\u65b0\u6210\u529f\u30d3\u30eb\u30c9\u306e\u6210\u679c\u7269 This\ project\ is\ currently\ disabled=\u73fe\u5728\u3001\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u7121\u52b9\u3067\u3059\u3002 From fe30ad88027bdc1b39fceb82a1ed6f1162a3fbdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Tue, 31 May 2011 10:06:18 +0200 Subject: [PATCH 101/113] JENKINS-9786 : Jenkins can read repositories definitions from Maven POMs to use the deploy task after the build. It's no more necessary to set/duplicate this information in the job configuration. --- changelog.html | 3 + .../java/hudson/maven/RedeployPublisher.java | 97 +++++++++---------- .../reporters/MavenArtifactArchiver.java | 47 ++++----- .../maven/reporters/MavenArtifactRecord.java | 80 ++++++++------- .../maven/RedeployPublisher/config.jelly | 6 +- .../RedeployPublisher/config_fr.properties | 5 +- 6 files changed, 124 insertions(+), 114 deletions(-) diff --git a/changelog.html b/changelog.html index 19aef3e81f..955b806bb8 100644 --- a/changelog.html +++ b/changelog.html @@ -65,6 +65,9 @@ Upcoming changes
      • Improve the post deployment job to make a clear error if you disabled artifacts archives (issue 9791) +
      • + Post-build deploy task for Maven jobs : Repositories definitions can now be read from the POMs. + (issue 9786) diff --git a/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java b/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java index 8ab914679a..09a1ad1505 100644 --- a/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java +++ b/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java @@ -28,31 +28,15 @@ import hudson.FilePath; import hudson.Launcher; import hudson.Util; import hudson.maven.reporters.MavenAbstractArtifactRecord; -import hudson.model.AbstractBuild; -import hudson.model.AbstractProject; -import hudson.model.BuildListener; -import hudson.model.Hudson; -import hudson.model.Node; -import hudson.model.Result; -import hudson.model.TaskListener; +import hudson.maven.reporters.MavenArtifactRecord; +import hudson.model.*; import hudson.remoting.Callable; import hudson.tasks.BuildStepDescriptor; import hudson.tasks.BuildStepMonitor; import hudson.tasks.Maven.MavenInstallation; import hudson.tasks.Publisher; import hudson.tasks.Recorder; -import hudson.util.FormValidation; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map.Entry; -import java.util.Properties; - import net.sf.json.JSONObject; - import org.apache.commons.lang.StringUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.deployer.ArtifactDeploymentException; @@ -65,9 +49,13 @@ import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.repository.Proxy; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.Map.Entry; + /** * {@link Publisher} for {@link MavenModuleSetBuild} to deploy artifacts * after a build is fully succeeded. @@ -90,6 +78,7 @@ public class RedeployPublisher extends Recorder { /** * For backward compatibility */ + @Deprecated public RedeployPublisher(String id, String url, boolean uniqueVersion) { this(id, url, uniqueVersion, false); } @@ -105,47 +94,52 @@ public class RedeployPublisher extends Recorder { this.evenIfUnstable = evenIfUnstable; } - public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { - if(build.getResult().isWorseThan(getTreshold())) + public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { + if (build.getResult().isWorseThan(getTreshold())) return true; // build failed. Don't publish - if (url==null) { - listener.getLogger().println("No Repository URL is specified."); + List mavenAbstractArtifactRecords = getActions(build, listener); + if (mavenAbstractArtifactRecords == null || mavenAbstractArtifactRecords.isEmpty()) { + listener.getLogger().println("[ERROR] No artifacts are recorded. Is this a Maven project?"); build.setResult(Result.FAILURE); return true; } - List mars = getActions( build, listener ); - if(mars==null || mars.isEmpty()) { - listener.getLogger().println("No artifacts are recorded. Is this a Maven project?"); - build.setResult(Result.FAILURE); - return true; - } if(build instanceof MavenModuleSetBuild && ((MavenModuleSetBuild)build).getParent().isArchivingDisabled()){ listener.getLogger().println("[ERROR] You cannot use the \"Deploy artifacts to Maven repository\" feature if you " + - "disabled " + - "automatic artifact archiving"); + "disabled automatic artifact archiving"); build.setResult(Result.FAILURE); return true; } - listener.getLogger().println("Deploying artifacts to "+url); + long startupTime = Calendar.getInstance().getTimeInMillis(); + try { - - //MavenEmbedder embedder = MavenUtil.createEmbedder(listener,build); - MavenEmbedder embedder = createEmbedder(listener,build); + MavenEmbedder embedder = createEmbedder(listener, build); ArtifactRepositoryLayout layout = - (ArtifactRepositoryLayout) embedder.lookup( ArtifactRepositoryLayout.ROLE,"default"); + (ArtifactRepositoryLayout) embedder.lookup(ArtifactRepositoryLayout.ROLE, "default"); ArtifactRepositoryFactory factory = - (ArtifactRepositoryFactory) embedder.lookup(ArtifactRepositoryFactory.ROLE); - - final ArtifactRepository repository = factory.createDeploymentArtifactRepository( - id, url, layout, uniqueVersion); - WrappedArtifactRepository repo = new WrappedArtifactRepository(repository,uniqueVersion); - for (MavenAbstractArtifactRecord mar : mars) - mar.deploy(embedder,repo,listener); - + (ArtifactRepositoryFactory) embedder.lookup(ArtifactRepositoryFactory.ROLE); + ArtifactRepository artifactRepository = null; + if (url != null) { + // By default we try to get the repository definition from the job configuration + artifactRepository = getDeploymentRepository(factory, layout, id, url); + } + for (MavenAbstractArtifactRecord mavenAbstractArtifactRecord : mavenAbstractArtifactRecords) { + if (artifactRepository == null && mavenAbstractArtifactRecord instanceof MavenArtifactRecord) { + // If no repository definition is set on the job level we try to take it from the POM + MavenArtifactRecord mavenArtifactRecord = (MavenArtifactRecord) mavenAbstractArtifactRecord; + artifactRepository = getDeploymentRepository(factory, layout, mavenArtifactRecord.repositoryId, mavenArtifactRecord.repositoryUrl); + } + if (artifactRepository == null) { + listener.getLogger().println("[ERROR] No Repository settings defined in the job configuration or distributionManagement of the module."); + build.setResult(Result.FAILURE); + return true; + } + mavenAbstractArtifactRecord.deploy(embedder, artifactRepository, listener); + } + listener.getLogger().println("[INFO] Deployment done in " + Util.getTimeSpanString(Calendar.getInstance().getTimeInMillis() - startupTime)); return true; } catch (MavenEmbedderException e) { e.printStackTrace(listener.error(e.getMessage())); @@ -156,9 +150,17 @@ public class RedeployPublisher extends Recorder { } // failed build.setResult(Result.FAILURE); + listener.getLogger().println("[INFO] Deployment failed after " + Util.getTimeSpanString(Calendar.getInstance().getTimeInMillis() - startupTime)); return true; } + private ArtifactRepository getDeploymentRepository(ArtifactRepositoryFactory factory, ArtifactRepositoryLayout layout, String repositoryId, String repositoryUrl) throws ComponentLookupException { + if (repositoryUrl == null) return null; + final ArtifactRepository repository = factory.createDeploymentArtifactRepository( + repositoryId, repositoryUrl, layout, uniqueVersion); + return new WrappedArtifactRepository(repository, uniqueVersion); + } + /** * * copy from MavenUtil but here we have to ignore localRepo path and setting as thoses paths comes @@ -312,13 +314,6 @@ public class RedeployPublisher extends Recorder { return true; } - public FormValidation doCheckUrl(@QueryParameter String url) { - String fixedUrl = hudson.Util.fixEmptyAndTrim(url); - if (fixedUrl==null) - return FormValidation.error(Messages.RedeployPublisher_RepositoryURL_Mandatory()); - - return FormValidation.ok(); - } } //--------------------------------------------- diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java index 65ea22e006..903a2cab0e 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java @@ -23,29 +23,24 @@ */ package hudson.maven.reporters; -import hudson.maven.MavenBuildProxy; -import hudson.maven.MavenModule; -import hudson.maven.MavenReporter; -import hudson.maven.MavenReporterDescriptor; -import hudson.maven.MojoInfo; -import hudson.maven.MavenBuild; +import hudson.Extension; +import hudson.FilePath; +import hudson.Util; +import hudson.maven.*; import hudson.model.BuildListener; import hudson.util.InvocationInterceptor; -import hudson.FilePath; -import hudson.Extension; -import hudson.Util; import org.apache.maven.artifact.Artifact; import org.apache.maven.project.MavenProject; -import java.io.IOException; import java.io.File; import java.io.FileInputStream; +import java.io.IOException; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.HashSet; -import java.lang.reflect.Method; -import java.lang.reflect.InvocationHandler; /** * Archives artifacts of the build. @@ -99,41 +94,47 @@ public class MavenArtifactArchiver extends MavenReporter { // artifacts that are known to Maven. Set mavenArtifacts = new HashSet(); - if(pom.getFile()!=null) {// goals like 'clean' runs without loading POM, apparently. + if (pom.getFile() != null) {// goals like 'clean' runs without loading POM, apparently. // record POM final MavenArtifact pomArtifact = new MavenArtifact( - pom.getGroupId(), pom.getArtifactId(), pom.getVersion(), null, "pom", pom.getFile().getName(), Util.getDigestOf(new FileInputStream(pom.getFile()))); + pom.getGroupId(), pom.getArtifactId(), pom.getVersion(), null, "pom", pom.getFile().getName(), Util.getDigestOf(new FileInputStream(pom.getFile()))); + + final String repositoryUrl = pom.getDistributionManagementArtifactRepository() == null ? null : Util.fixEmptyAndTrim(pom.getDistributionManagementArtifactRepository().getUrl()); + final String repositoryId = pom.getDistributionManagementArtifactRepository() == null ? null : Util.fixEmptyAndTrim(pom.getDistributionManagementArtifactRepository().getId()); + mavenArtifacts.add(pom.getFile()); - pomArtifact.archive(build,pom.getFile(),listener); + pomArtifact.archive(build, pom.getFile(), listener); // record main artifact (if packaging is POM, this doesn't exist) final MavenArtifact mainArtifact = MavenArtifact.create(pom.getArtifact()); - if(mainArtifact!=null) { + if (mainArtifact != null) { File f = pom.getArtifact().getFile(); mavenArtifacts.add(f); - mainArtifact.archive(build, f,listener); + mainArtifact.archive(build, f, listener); } // record attached artifacts final List attachedArtifacts = new ArrayList(); - for( Artifact a : (List)pom.getAttachedArtifacts() ) { + for (Artifact a : (List) pom.getAttachedArtifacts()) { MavenArtifact ma = MavenArtifact.create(a); - if(ma!=null) { + if (ma != null) { mavenArtifacts.add(a.getFile()); - ma.archive(build,a.getFile(),listener); + ma.archive(build, a.getFile(), listener); attachedArtifacts.add(ma); } } // record the action - build.executeAsync(new MavenBuildProxy.BuildCallable() { + build.executeAsync(new MavenBuildProxy.BuildCallable() { public Void call(MavenBuild build) throws IOException, InterruptedException { // if a build forks lifecycles, this method can be called multiple times List old = Util.filter(build.getActions(), MavenArtifactRecord.class); if (!old.isEmpty()) build.getActions().removeAll(old); - MavenArtifactRecord mar = new MavenArtifactRecord(build,pomArtifact,mainArtifact,attachedArtifacts); + MavenArtifactRecord mar = new MavenArtifactRecord(build, pomArtifact, mainArtifact, attachedArtifacts, + repositoryUrl, + repositoryId); build.addAction(mar); mar.recordFingerprints(); diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java index f2d3bf5106..8c49e56baa 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java @@ -23,23 +23,10 @@ */ package hudson.maven.reporters; -import hudson.maven.AggregatableAction; -import hudson.maven.MavenAggregatedReport; -import hudson.maven.MavenBuild; -import hudson.maven.MavenEmbedder; -import hudson.maven.MavenEmbedderException; -import hudson.maven.MavenModule; -import hudson.maven.MavenModuleSetBuild; -import hudson.maven.MavenUtil; +import hudson.maven.*; import hudson.maven.RedeployPublisher.WrappedArtifactRepository; import hudson.model.Action; import hudson.model.TaskListener; - -import java.io.IOException; -import java.io.PrintStream; -import java.util.List; -import java.util.Map; - import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.deployer.ArtifactDeployer; import org.apache.maven.artifact.deployer.ArtifactDeploymentException; @@ -51,6 +38,11 @@ import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.project.artifact.ProjectArtifactMetadata; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; +import java.io.IOException; +import java.io.PrintStream; +import java.util.List; +import java.util.Map; + /** * {@link Action} that remembers {@link MavenArtifact artifact}s that are built. * @@ -82,16 +74,34 @@ public class MavenArtifactRecord extends MavenAbstractArtifactRecord */ public final List attachedArtifacts; + /** + * The repository identifier (matching maven settings) used for credentials to deploy artifacts + */ + public final String repositoryId; + + /** + * The repository URL used for credentials to deploy artifacts + */ + public final String repositoryUrl; + + @Deprecated public MavenArtifactRecord(MavenBuild parent, MavenArtifact pomArtifact, MavenArtifact mainArtifact, List attachedArtifacts) { - assert parent!=null; - assert pomArtifact!=null; - assert attachedArtifacts!=null; - if(mainArtifact==null) mainArtifact=pomArtifact; + this(parent, pomArtifact, mainArtifact, attachedArtifacts, null, null); + } + + public MavenArtifactRecord(MavenBuild parent, MavenArtifact pomArtifact, MavenArtifact mainArtifact, + List attachedArtifacts, String repositoryUrl, String repositoryId) { + assert parent != null; + assert pomArtifact != null; + assert attachedArtifacts != null; + if (mainArtifact == null) mainArtifact = pomArtifact; this.parent = parent; this.pomArtifact = pomArtifact; this.mainArtifact = mainArtifact; this.attachedArtifacts = attachedArtifacts; + this.repositoryUrl = repositoryUrl; + this.repositoryId = repositoryId; } public MavenBuild getBuild() { @@ -109,38 +119,38 @@ public class MavenArtifactRecord extends MavenAbstractArtifactRecord @Override public void deploy(MavenEmbedder embedder, ArtifactRepository deploymentRepository, TaskListener listener) throws MavenEmbedderException, IOException, ComponentLookupException, ArtifactDeploymentException { ArtifactHandlerManager handlerManager = embedder.lookup(ArtifactHandlerManager.class); - - ArtifactFactory factory = embedder.lookup(ArtifactFactory.class); + + ArtifactFactory artifactFactory = embedder.lookup(ArtifactFactory.class); PrintStream logger = listener.getLogger(); boolean maven3orLater = MavenUtil.maven3orLater(parent.getModuleSetBuild().getMavenVersionUsed()); boolean uniqueVersion = true; if (!deploymentRepository.isUniqueVersion()) { if (maven3orLater) { - logger.println("uniqueVersion == false is not anymore supported in maven 3"); + logger.println("[ERROR] uniqueVersion == false is not anymore supported in maven 3"); } else { - ((WrappedArtifactRepository) deploymentRepository).setUniqueVersion( false ); + ((WrappedArtifactRepository) deploymentRepository).setUniqueVersion(false); uniqueVersion = false; } } else { - ((WrappedArtifactRepository) deploymentRepository).setUniqueVersion( true ); + ((WrappedArtifactRepository) deploymentRepository).setUniqueVersion(true); } - Artifact main = mainArtifact.toArtifact(handlerManager,factory,parent); - if(!isPOM()) - main.addMetadata(new ProjectArtifactMetadata(main,pomArtifact.getFile(parent))); + Artifact main = mainArtifact.toArtifact(handlerManager, artifactFactory, parent); + if (!isPOM()) + main.addMetadata(new ProjectArtifactMetadata(main, pomArtifact.getFile(parent))); + + + ArtifactDeployer deployer = embedder.lookup(ArtifactDeployer.class, uniqueVersion ? "default" : "maven2"); + logger.println( + "[INFO] Deployment in " + deploymentRepository.getUrl() + "(id=" + deploymentRepository.getId() + ", uniqueVersion=" + deploymentRepository.isUniqueVersion()+")"); // deploy the main artifact. This also deploys the POM logger.println(Messages.MavenArtifact_DeployingMainArtifact(main.getFile().getName())); - - ArtifactDeployer deployer = embedder.lookup(ArtifactDeployer.class,uniqueVersion ? "default":"maven2"); - - deployer.deploy( main.getFile(), main, deploymentRepository, embedder.getLocalRepository() ); - - //deployMavenArtifact( main, deploymentRepository, embedder, uniqueVersion ); + deployer.deploy(main.getFile(), main, deploymentRepository, embedder.getLocalRepository()); for (MavenArtifact aa : attachedArtifacts) { - Artifact a = aa.toArtifact(handlerManager,factory, parent); - logger.println(Messages.MavenArtifact_DeployingAttachedArtifact(a.getFile().getName())); - deployer.deploy( a.getFile(), a, deploymentRepository, embedder.getLocalRepository() ); + Artifact a = aa.toArtifact(handlerManager, artifactFactory, parent); + logger.println(Messages.MavenArtifact_DeployingMainArtifact(a.getFile().getName())); + deployer.deploy(a.getFile(), a, deploymentRepository, embedder.getLocalRepository()); } } diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config.jelly b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config.jelly index d3cd0bb9bf..40ad9942bc 100644 --- a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config.jelly +++ b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config.jelly @@ -24,10 +24,10 @@ THE SOFTWARE. - - - + + + diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_fr.properties b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_fr.properties index 14803c54c1..aa7659d8c5 100644 --- a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_fr.properties +++ b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_fr.properties @@ -21,5 +21,6 @@ # THE SOFTWARE. Repository\ URL=URL du repository -Repository\ ID=ID du repository -Assign\ unique\ versions\ to\ snapshots=Affecter des numéros de version uniques aux snapshots +Repository\ ID=Identifiant du repository +Assign\ unique\ versions\ to\ snapshots=Affecter des num\u00e9ros de version uniques aux snapshots +Deploy\ even\ if\ the\ build\ is\ unstable=D\u00e9ploiment\\ m\u00eame si\\ le\\ build est\\ instable. From a84188ec2b1d0d152bea9309b1cc5163721a8dd2 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Sat, 28 May 2011 16:02:22 +0200 Subject: [PATCH 102/113] Fixed JENKINS-9785 : option to run maven in headless mode to avoid boring dock icon to jump and take the focus on OSX --- changelog.html | 3 +++ .../maven/AbstractMavenProcessFactory.java | 19 ++++++++++++---- .../java/hudson/maven/MavenModuleSet.java | 15 +++++++++++++ .../MavenModuleSet/configure-entries.jelly | 4 +++- .../configure-entries_fr.properties | 22 ++++++++++++------- .../src/main/webapp/run-headless.html | 7 ++++++ .../src/main/webapp/run-headless_fr.html | 9 ++++++++ 7 files changed, 66 insertions(+), 13 deletions(-) create mode 100644 maven-plugin/src/main/webapp/run-headless.html create mode 100644 maven-plugin/src/main/webapp/run-headless_fr.html diff --git a/changelog.html b/changelog.html index 955b806bb8..332d057b5b 100644 --- a/changelog.html +++ b/changelog.html @@ -68,6 +68,9 @@ Upcoming changes
      • Post-build deploy task for Maven jobs : Repositories definitions can now be read from the POMs. (issue 9786) +
      • + Run maven jobs as headless process. on OSX this avoid jumping Dock icon to take focus. + (issue 9785) diff --git a/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java b/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java index 42fe2fcde6..8c8c83b57f 100644 --- a/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java +++ b/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java @@ -1,10 +1,12 @@ package hudson.maven; import static hudson.Util.fixNull; + import hudson.AbortException; import hudson.EnvVars; import hudson.FilePath; import hudson.Launcher; +import hudson.Platform; import hudson.Proc; import hudson.maven.ProcessCache.NewProcess; import hudson.model.BuildListener; @@ -24,7 +26,6 @@ import hudson.slaves.Channels; import hudson.tasks.Maven.MavenInstallation; import hudson.tasks._maven.MavenConsoleAnnotator; import hudson.util.ArgumentListBuilder; - import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.IOException; @@ -37,8 +38,6 @@ import java.net.SocketTimeoutException; import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; import java.util.Arrays; - -import org.jenkinsci.plugins.tokenmacro.TokenMacro; import org.kohsuke.stapler.framework.io.IOException2; /* @@ -274,7 +273,19 @@ public abstract class AbstractMavenProcessFactory } } - + + if (mms.runHeadless()) { + // Configure headless process + mavenOpts += " -Djava.awt.headless=true"; + } else { + if (Platform.isDarwin()) { + // Would be cool to replace the generic Java icon with jenkins logo, but requires + // the file absolute path to be available on slave *before* the process run on it :-/ + // Maybe we could enforce this from the DMG installer on OSX + // TODO mavenOpts += " -Xdock:name=Jenkins -Xdock:icon=jenkins.png"; + } + } + return envVars.expand(mavenOpts); } diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index fdd6ac4d02..ec8daec605 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -204,6 +204,12 @@ public final class MavenModuleSet extends AbstractMavenProject - + diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_fr.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_fr.properties index f960dcf7e2..bb43380281 100644 --- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_fr.properties +++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_fr.properties @@ -21,16 +21,22 @@ # THE SOFTWARE. Alternate\ settings\ file=Fichier settings alternatif -Block\ build\ when\ dependency\ building=Bloquer le build pendant la construction des d\u00E9pendances +Block\ build\ when\ dependency\ building=Bloquer le build pendant la construction des d\u00e9pendances Build=Build -Incremental\ build\ -\ only\ build\ changed\ modules=Construction incr\u00E9mentale - ne faire la construction (build) que pour les modules chang\u00E9s +Incremental\ build\ -\ only\ build\ changed\ modules=Construction incr\u00e9mentale - ne faire la construction (build) que pour les modules chang\u00e9s Maven\ Version=Version de Maven Root\ POM=POM Racine -Build\ modules\ in\ parallel=Construire les modules en parallèle +Build\ modules\ in\ parallel=Construire les modules en parall\u00eale Build\ Settings=Configuration du build -Use\ private\ Maven\ repository=Utilise un repository Maven priv\u00E9 -Use\ private\ maven\ repository=Utiliser un repository Maven privé +Use\ private\ Maven\ repository=Utilise un repository Maven priv\u00e9 +Use\ private\ maven\ repository=Utiliser un repository Maven priv\u00e9 Goals\ and\ options=Goals et options -Maven\ Version.error.1=Jenkins a besoin de savoir où Maven2/3 est installé. -Maven\ Version.error.2=Veuillez le faire dans la configuration système. -Build\ whenever\ a\ SNAPSHOT\ dependency\ is\ built=Lance un build à chaque fois qu''une dépendance SNAPSHOT est construite +Maven\ Version.error.1=Jenkins a besoin de savoir o\u00f9 Maven2/3 est install\u00c8. +Maven\ Version.error.2=Veuillez le faire dans la configuration syst\u00cbme. +Build\ whenever\ a\ SNAPSHOT\ dependency\ is\ built=Lance un build \u00e0 chaque fois qu''une d\u00e9pendance SNAPSHOT est construite +Run\ Headless=Ex\u00e9cuter sans environnement graphique +Disable\ automatic\ artifact\ archiving=D\u00e9sactive l'achivage automatique des artefacts +Resolve\ Dependencies\ during\ Pom\ parsing=Effectue la r\u00e9solution de d\u00e9pendances pendant la lecture du POM +Process\ Plugins\ during\ Pom\ parsing=Analyse les plugins pendant la lecture du POM +Maven\ Validation\ Level=Niveau de validation du POM Maven +Goals=Goals diff --git a/maven-plugin/src/main/webapp/run-headless.html b/maven-plugin/src/main/webapp/run-headless.html new file mode 100644 index 0000000000..1bfd81792c --- /dev/null +++ b/maven-plugin/src/main/webapp/run-headless.html @@ -0,0 +1,7 @@ +
        +

        + If build doesn't requires access to desktop (only using command line tools and tests) this option can be checked. +

        + This option allow Jenkins to configure the build process in headless mode. Usefull on OSX to avoid boring Dock icon + to take focus, this option may also in future release be used to select slave adequate instance. +

        \ No newline at end of file diff --git a/maven-plugin/src/main/webapp/run-headless_fr.html b/maven-plugin/src/main/webapp/run-headless_fr.html new file mode 100644 index 0000000000..e95e0904a1 --- /dev/null +++ b/maven-plugin/src/main/webapp/run-headless_fr.html @@ -0,0 +1,9 @@ +
        +

        + Si le build ne né,cessite pas un accè à l'environnement graphique (s'il n'utilise que des outils + en ligne de commande) cette option peut être activŽe. +

        + Cette option permet à Jenkins de lancer le processus de build en mode 'headless'. Ceci est + particulièrement intéressant sur OSX pour éviter qu'une icône Java prenne le focus en sautillant + dans le Dock. Cette option pourrait à l'avenir servir à sélectionner un esclave adapté. +

        \ No newline at end of file From ba711bacddb8d9a00522400928e45840f287de8b Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 31 May 2011 16:03:23 +0200 Subject: [PATCH 103/113] test-harness desactivation tru a sys props --- test/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/pom.xml b/test/pom.xml index 5437c86319..8160118e27 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -182,6 +182,11 @@ THE SOFTWARE. run-test-harness + + + !skip-test-harness + + From b1926cfef088ea46165967fcd553ed221ad9ae6d Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 31 May 2011 16:10:41 +0200 Subject: [PATCH 104/113] add a simple file on how to build jenkins.war --- BUILDING.TXT | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 BUILDING.TXT diff --git a/BUILDING.TXT b/BUILDING.TXT new file mode 100644 index 0000000000..99b41980a3 --- /dev/null +++ b/BUILDING.TXT @@ -0,0 +1,6 @@ +If you want simply to have the jenkins.war as fast as possible (without test execution), just use : +mvn clean install -pl war -am -DskipTests +the war will be in war/target/jenkins.war (you can play with it) +You can desactivate test-harness execution with -Dskip-test-harness +Have Fun !! + From 045468259359b0243085a64ec49b3668fcc15272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Wed, 1 Jun 2011 23:20:15 +0200 Subject: [PATCH 105/113] JENKINS-9786 : Update logs --- .../main/java/hudson/maven/reporters/MavenArtifactRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java index 8c49e56baa..01d5be7862 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java @@ -141,7 +141,7 @@ public class MavenArtifactRecord extends MavenAbstractArtifactRecord ArtifactDeployer deployer = embedder.lookup(ArtifactDeployer.class, uniqueVersion ? "default" : "maven2"); logger.println( - "[INFO] Deployment in " + deploymentRepository.getUrl() + "(id=" + deploymentRepository.getId() + ", uniqueVersion=" + deploymentRepository.isUniqueVersion()+")"); + "[INFO] Deployment in " + deploymentRepository.getUrl() + " (id=" + deploymentRepository.getId() + ",uniqueVersion=" + deploymentRepository.isUniqueVersion()+")"); // deploy the main artifact. This also deploys the POM logger.println(Messages.MavenArtifact_DeployingMainArtifact(main.getFile().getName())); From 16f6c7a3d54cddae756f30ce728703fd1bbd04ec Mon Sep 17 00:00:00 2001 From: Christoph Kutzinski Date: Thu, 2 Jun 2011 12:09:22 +0200 Subject: [PATCH 106/113] added @since tags for version and children fields --- .../src/main/java/hudson/maven/MavenModule.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java index 64ec69329a..24e82156c0 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java @@ -79,11 +79,13 @@ public final class MavenModule extends AbstractMavenProject POM element. * Used to determine parent/child relationship of modules. *

        - * For compatibility reason, this field may be null when loading data from old hudson. + * For compatibility reason, this field may be null when loading data from old hudson. + * + * @since 1.133 */ @CopyOnWrite private volatile List children; @@ -216,7 +220,7 @@ public final class MavenModule extends AbstractMavenProject deps = new HashSet(dependencies.size()); - for (Object d : (Set)dependencies) { + for (Object d : (Set)dependencies) { if (d instanceof ModuleDependency) { deps.add((ModuleDependency) d); } else { @@ -241,9 +245,10 @@ public final class MavenModule extends AbstractMavenProject * This method returns null if this information is not recorded. This happens * for compatibility reason. + * + * @since 1.133 */ public List getChildren() { List l = children; // take a snapshot From c297835ab7371756e092667b3556a957fd2801e2 Mon Sep 17 00:00:00 2001 From: Christoph Kutzinski Date: Thu, 2 Jun 2011 13:31:25 +0200 Subject: [PATCH 107/113] [FIXED JENKINS-9845] reduce memory consumption of dependency graph calculation: include maven dependencies with 'unknown' version only if needed. --- changelog.html | 3 ++ .../main/java/hudson/maven/MavenModule.java | 46 ++++++++++++++++--- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/changelog.html b/changelog.html index 332d057b5b..d57c2dec20 100644 --- a/changelog.html +++ b/changelog.html @@ -71,6 +71,9 @@ Upcoming changes

      • Run maven jobs as headless process. on OSX this avoid jumping Dock icon to take focus. (issue 9785) +
      • + Reduce memory consumption of dependency calculation in maven jobs. + (issue 9845) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java index 24e82156c0..1262bfbd0d 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java @@ -392,22 +392,38 @@ public final class MavenModule extends AbstractMavenProject modules = new HashMap(); - // when we load old data that doesn't record version in dependency, we'd like - // to emulate the old behavior that it tries to identify the upstream by ignoring the version. - // do this by always putting groupId:artifactId:UNKNOWN to the modules list. - for (MavenModule m : Hudson.getInstance().getAllItems(MavenModule.class)) { if(m.isDisabled()) continue; ModuleDependency moduleDependency = m.asDependency(); modules.put(moduleDependency,m); - modules.put(moduleDependency.withUnknownVersion(),m); + if (hasDependenciesWithUnknownVersion) { + modules.put(moduleDependency.withUnknownVersion(),m); + } } data = new MavenDependencyComputationData(modules); + data.withUnknownVersions = hasDependenciesWithUnknownVersion; graph.putComputationalData(MavenDependencyComputationData.class, data); + } else { + if (hasDependenciesWithUnknownVersion && !data.withUnknownVersions) { + // found 'old' MavenModule: add dependencies with unknown versions now + for (MavenModule m : Hudson.getInstance().getAllItems(MavenModule.class)) { + if(m.isDisabled()) continue; + ModuleDependency moduleDependency = m.asDependency().withUnknownVersion(); + data.allModules.put(moduleDependency,m); + } + data.withUnknownVersions = true; + } } // In case two modules with the same name are defined, modules in the same MavenModuleSet @@ -424,7 +440,9 @@ public final class MavenModule extends AbstractMavenProject= 1.207. + */ + private boolean hasDependenciesWithUnknownVersion() { + for (ModuleDependency dep : dependencies) { + if (ModuleDependency.UNKNOWN.equals(dep.version)) { + return true; + } + } + return false; + } + private static class MavenDependencyComputationData { + boolean withUnknownVersions = false; Map allModules; //Map> modulesPerParent = new HashMap>(); From d5b8cf4a28ea41caf84528656f9b931695cb3fb5 Mon Sep 17 00:00:00 2001 From: Christoph Kutzinski Date: Thu, 2 Jun 2011 16:28:31 +0200 Subject: [PATCH 108/113] [FIXED JENKINS-9848] if POM parsing failed, do a full build next time (for incremental builds) --- changelog.html | 3 ++ .../hudson/maven/MavenModuleSetBuild.java | 29 +++++++++++++++---- .../hudson/maven/NeedsFullBuildAction.java | 24 +++++++++++++++ 3 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 maven-plugin/src/main/java/hudson/maven/NeedsFullBuildAction.java diff --git a/changelog.html b/changelog.html index d57c2dec20..e1978fd4ce 100644 --- a/changelog.html +++ b/changelog.html @@ -59,6 +59,9 @@ Upcoming changes Output correct version from java -jar jenkins.war --version (broken since 1.410)
      • Correct usage text from java -jar jenkins.war --help +
      • + Incremental maven jobs: if POM parsing failed, do a full build next time. + (issue 9848)
      • CLI command page now lists all the available commands (issue 9789) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 32c11ab083..e780f88c61 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -374,7 +374,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild getModuleLastBuilds() { @@ -672,6 +672,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild= 0; - if (project.isIncrementalBuild() && maven2_1orLater && !changedModules.isEmpty()) { + boolean needsFullBuild = getPreviousCompletedBuild() != null && + getPreviousCompletedBuild().getAction(NeedsFullBuildAction.class) != null; + if (project.isIncrementalBuild() && !needsFullBuild && maven2_1orLater && !changedModules.isEmpty()) { margs.add("-amd"); margs.add("-pl", Util.join(changedModules, ",")); } @@ -816,12 +823,22 @@ public class MavenModuleSetBuild extends AbstractMavenBuild Date: Fri, 3 Jun 2011 15:34:03 +0100 Subject: [PATCH 109/113] RemoteClassLoader is not honoring the classloader that's passed to the Channel contructor --- remoting/src/main/java/hudson/remoting/Channel.java | 6 ++++++ .../main/java/hudson/remoting/ImportedClassLoaderTable.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/remoting/src/main/java/hudson/remoting/Channel.java b/remoting/src/main/java/hudson/remoting/Channel.java index 4520930b33..c9a42aafa1 100644 --- a/remoting/src/main/java/hudson/remoting/Channel.java +++ b/remoting/src/main/java/hudson/remoting/Channel.java @@ -238,6 +238,11 @@ public class Channel implements VirtualChannel, IChannel { /*package*/ final ExecutorService pipeWriter; + /** + * ClassLaoder that remote classloaders should use as the basis. + */ + /*package*/ final ClassLoader baseClassLoader; + /** * Communication mode. * @since 1.161 @@ -356,6 +361,7 @@ public class Channel implements VirtualChannel, IChannel { if (base==null) base = getClass().getClassLoader(); + this.baseClassLoader = base; if(export(this,false)!=1) throw new AssertionError(); // export number 1 is reserved for the channel itself diff --git a/remoting/src/main/java/hudson/remoting/ImportedClassLoaderTable.java b/remoting/src/main/java/hudson/remoting/ImportedClassLoaderTable.java index c05acf2197..6fd5a38b67 100644 --- a/remoting/src/main/java/hudson/remoting/ImportedClassLoaderTable.java +++ b/remoting/src/main/java/hudson/remoting/ImportedClassLoaderTable.java @@ -54,7 +54,7 @@ final class ImportedClassLoaderTable { if(r==null) { // we need to be able to use the same hudson.remoting classes, hence delegate // to this class loader. - r = RemoteClassLoader.create(getClass().getClassLoader(),classLoaderProxy); + r = RemoteClassLoader.create(channel.baseClassLoader,classLoaderProxy); classLoaders.put(classLoaderProxy,r); } return r; From 902cc4e1dda4fe3f418b4dc47279016e90cbaeec Mon Sep 17 00:00:00 2001 From: Stephen Connolly Date: Fri, 3 Jun 2011 16:10:18 +0100 Subject: [PATCH 110/113] Added an extension point to allow prodding the NodeProvisioner into taking action faster than it might usually. --- changelog.html | 2 ++ .../java/hudson/slaves/NodeProvisioner.java | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/changelog.html b/changelog.html index 5ac34cc3f1..9cef01f641 100644 --- a/changelog.html +++ b/changelog.html @@ -80,6 +80,8 @@ Upcoming changes
      • Strongly encrypt proxy credentials (issue 4002) +
      • + Added an extension point to allow prodding the NodeProvisioner into taking action faster than it might usually. diff --git a/core/src/main/java/hudson/slaves/NodeProvisioner.java b/core/src/main/java/hudson/slaves/NodeProvisioner.java index 26f111be19..c72091a973 100644 --- a/core/src/main/java/hudson/slaves/NodeProvisioner.java +++ b/core/src/main/java/hudson/slaves/NodeProvisioner.java @@ -23,6 +23,7 @@ */ package hudson.slaves; +import hudson.model.Computer; import hudson.model.LoadStatistics; import hudson.model.Node; import hudson.model.Hudson; @@ -41,6 +42,7 @@ import java.util.List; import java.util.Collection; import java.util.ArrayList; import java.util.Iterator; +import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import java.util.logging.Level; import java.io.IOException; @@ -87,6 +89,8 @@ public class NodeProvisioner { private List pendingLaunches = new ArrayList(); + private transient volatile long lastSuggestedReview; + /** * Exponential moving average of the "planned capacity" over time, which is the number of * additional executors being brought up. @@ -113,11 +117,29 @@ public class NodeProvisioner { return new ArrayList(pendingLaunches); } + /** + * Give the {@link NodeProvisioner} a hint that now would be a good time to think about provisioning some nodes. + * The hint will be ignored if subjected to excessive pestering by callers. + * + * @since 1.415 + */ + public void suggestReviewNow() { + if (System.currentTimeMillis() > lastSuggestedReview + TimeUnit.SECONDS.toMillis(1)) { + lastSuggestedReview = System.currentTimeMillis(); + Computer.threadPoolForRemoting.submit(new Runnable() { + public void run() { + update(); + } + }); + } + } + /** * Periodically invoked to keep track of the load. * Launches additional nodes if necessary. */ private synchronized void update() { + lastSuggestedReview = System.currentTimeMillis(); Hudson hudson = Hudson.getInstance(); // clean up the cancelled launch activity, then count the # of executors that we are about to bring up. From bfb7bd4ba442774ea8d7ec5e862c9cb1ccc12837 Mon Sep 17 00:00:00 2001 From: Stephen Connolly Date: Fri, 3 Jun 2011 16:15:24 +0100 Subject: [PATCH 111/113] When there are absolutely no executors for a specific label, there was an unnecessary delay in provisioning the first node for that label --- changelog.html | 5 ++++- .../main/java/hudson/slaves/NodeProvisioner.java | 13 ++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/changelog.html b/changelog.html index 9cef01f641..8d8b5fc982 100644 --- a/changelog.html +++ b/changelog.html @@ -81,7 +81,10 @@ Upcoming changes Strongly encrypt proxy credentials (issue 4002)
      • - Added an extension point to allow prodding the NodeProvisioner into taking action faster than it might usually. + Added an extension point to allow prodding the NodeProvisioner into taking action faster than it might usually. +
      • + When there are absolutely no executors for a specific label, there was an unnecessary delay in provisioning the + first node for that label. diff --git a/core/src/main/java/hudson/slaves/NodeProvisioner.java b/core/src/main/java/hudson/slaves/NodeProvisioner.java index c72091a973..7c6a955958 100644 --- a/core/src/main/java/hudson/slaves/NodeProvisioner.java +++ b/core/src/main/java/hudson/slaves/NodeProvisioner.java @@ -143,7 +143,7 @@ public class NodeProvisioner { Hudson hudson = Hudson.getInstance(); // clean up the cancelled launch activity, then count the # of executors that we are about to bring up. - float plannedCapacity = 0; + int plannedCapacitySnapshot = 0; for (Iterator itr = pendingLaunches.iterator(); itr.hasNext();) { PlannedNode f = itr.next(); if(f.future.isDone()) { @@ -159,8 +159,9 @@ public class NodeProvisioner { } itr.remove(); } else - plannedCapacity += f.numExecutors; + plannedCapacitySnapshot += f.numExecutors; } + float plannedCapacity = plannedCapacitySnapshot; plannedCapacitiesEMA.update(plannedCapacity); /* @@ -197,8 +198,9 @@ public class NodeProvisioner { int idleSnapshot = stat.computeIdleExecutors(); int totalSnapshot = stat.computeTotalExecutors(); + boolean needSomeWhenNoneAtAll = ((totalSnapshot + plannedCapacity) == 0) && (stat.computeQueueLength() > 0); float idle = Math.max(stat.getLatestIdleExecutors(TIME_SCALE), idleSnapshot); - if(idle1-m) {// and there's more work to do... LOGGER.fine("Excess workload "+excessWorkload+" detected. (planned capacity="+plannedCapacity+",Qlen="+qlen+",idle="+idle+"&"+idleSnapshot+",total="+totalSnapshot+"m,="+m+")"); From eb0c005a3b3b44f7abaf61d7235f3f89435e53a5 Mon Sep 17 00:00:00 2001 From: Seiji Sogabe Date: Sat, 4 Jun 2011 02:32:37 +0900 Subject: [PATCH 112/113] Updated ja. --- .../main/resources/hudson/model/Messages_ja.properties | 3 ++- .../hudson/widgets/HistoryWidget/index_ja.properties | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/main/resources/hudson/model/Messages_ja.properties b/core/src/main/resources/hudson/model/Messages_ja.properties index dca1655ec8..d5ee4cc871 100644 --- a/core/src/main/resources/hudson/model/Messages_ja.properties +++ b/core/src/main/resources/hudson/model/Messages_ja.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman +# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -201,6 +201,7 @@ UpdateCenter.PluginCategory.buildwrapper=\u30d3\u30eb\u30c9\u30e9\u30c3\u30d1\u3 UpdateCenter.PluginCategory.cli=\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9 UpdateCenter.PluginCategory.cluster=\u30af\u30e9\u30b9\u30bf\u30fc\u7ba1\u7406/\u5206\u6563\u30d3\u30eb\u30c9 UpdateCenter.PluginCategory.external=\u5916\u90e8\u30b5\u30a4\u30c8/\u30c4\u30fc\u30eb\u3068\u306e\u9023\u643a +UpdateCenter.PluginCategory.listview-column=\u30ea\u30b9\u30c8\u30d3\u30e5\u30fc\u30ab\u30e9\u30e0 UpdateCenter.PluginCategory.maven=Maven UpdateCenter.PluginCategory.misc=\u305d\u306e\u4ed6 UpdateCenter.PluginCategory.notifier=\u30d3\u30eb\u30c9\u901a\u77e5 diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/index_ja.properties b/core/src/main/resources/hudson/widgets/HistoryWidget/index_ja.properties index 021ad93627..37ba0dcc1d 100644 --- a/core/src/main/resources/hudson/widgets/HistoryWidget/index_ja.properties +++ b/core/src/main/resources/hudson/widgets/HistoryWidget/index_ja.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman +# Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -trend=\u50BE\u5411 -for\ all=\u5168\u30D3\u30EB\u30C9 -for\ failures=\u5931\u6557\u30D3\u30EB\u30C9 +trend=\u63a8\u79fb +for\ all=\u5168\u30d3\u30eb\u30c9 +for\ failures=\u5931\u6557\u30d3\u30eb\u30c9 More\ ...=\u3082\u3063\u3068 ... \ No newline at end of file From d24afe997c1ddcc5a0d631428d4735e1d4f9d640 Mon Sep 17 00:00:00 2001 From: Seiji Sogabe Date: Sat, 4 Jun 2011 03:10:16 +0900 Subject: [PATCH 113/113] Updated env_vars.html. jenkins!! --- war/src/main/webapp/env-vars.html | 11 +++++++---- war/src/main/webapp/env-vars_de.html | 11 +++++++---- war/src/main/webapp/env-vars_fr.html | 7 +++++-- war/src/main/webapp/env-vars_ja.html | 18 ++++++++++-------- war/src/main/webapp/env-vars_nl.html | 7 +++++-- war/src/main/webapp/env-vars_tr.html | 9 ++++++--- 6 files changed, 40 insertions(+), 23 deletions(-) diff --git a/war/src/main/webapp/env-vars.html b/war/src/main/webapp/env-vars.html index 3306209609..12452f3635 100644 --- a/war/src/main/webapp/env-vars.html +++ b/war/src/main/webapp/env-vars.html @@ -19,7 +19,7 @@
        Name of the project of this build, such as "foo"
        BUILD_TAG
        -
        String of "hudson-${JOB_NAME}-${BUILD_NUMBER}". Convenient to put into +
        String of "jenkins-${JOB_NAME}-${BUILD_NUMBER}". Convenient to put into a resource file, a jar file, etc for easier identification.
        EXECUTOR_NUMBER
        @@ -45,11 +45,14 @@
        HUDSON_URL
        Full URL of Hudson, like http://server:port/hudson/
        +
        JENKINS_URL
        +
        Full URL of Jenkins, like http://server:port/jenkins/
        +
        BUILD_URL
        -
        Full URL of this build, like http://server:port/hudson/job/foo/15/
        +
        Full URL of this build, like http://server:port/jenkins/job/foo/15/
        JOB_URL
        -
        Full URL of this job, like http://server:port/hudson/job/foo/
        +
        Full URL of this job, like http://server:port/jenkins/job/foo/
        SVN_REVISION
        For Subversion-based projects, this variable contains the revision number of the module.
        @@ -61,7 +64,7 @@

        -To understand how environmental variables provided by Hudson can be utilized by +To understand how environmental variables provided by Jenkins can be utilized by Ant, study the following target:

        Projektname des Builds, z.B. "foo".</dd>
         
             <dt>BUILD_TAG</dt>
        -    <dd>Eine Zeichenkette in der Form "hudson-<i>${JOB_NAME}</i>-<i>${BUILD_NUMBER}</i>".
        +    <dd>Eine Zeichenkette in der Form "jenkins-<i>${JOB_NAME}</i>-<i>${BUILD_NUMBER}</i>".
                 Diese Variable läßt sich sehr bequem zur späteren Identifikation in eine
                 Resource-Datei, JAR-Datei usw. ablegen.
         
        @@ -43,11 +43,14 @@
             <dt>HUDSON_URL</dt>
             <dd>Die absolute URL der Hudson-Instanz, z.B. <tt>http://server:port/hudson/</tt>.</dd>
         
        +    <dt>JENKINS_URL</dt>
        +    <dd>Die absolute URL der Jenkins-Instanz, z.B. <tt>http://server:port/jenkins/</tt>.</dd>
        +
             <dt>BUILD_URL</dt>
        -    <dd>Die absolute URL dieses Builds, z.B. <tt>http://server:port/hudson/job/foo/15/</tt>.</dd>
        +    <dd>Die absolute URL dieses Builds, z.B. <tt>http://server:port/jenkins/job/foo/15/</tt>.</dd>
         
             <dt>JOB_URL</dt>
        -    <dd>Die absolute URL dieses Jobs, z.B. <tt>http://server:port/hudson/job/foo/</tt>.</dd>
        +    <dd>Die absolute URL dieses Jobs, z.B. <tt>http://server:port/jenkins/job/foo/</tt>.</dd>
         
             <dt>SVN_REVISION</dt>
             <dd>Bei Subversion-basierten Projekten enthält diese Variable die Revisionsnummer
        @@ -61,7 +64,7 @@
         
         
         <p>
        -Das folgende Beispiel zeigt, wie von Hudson bereitgestellte Umgebungsvariablen
        +Das folgende Beispiel zeigt, wie von Jenkins bereitgestellte Umgebungsvariablen
         in Ant-Skripten verwendet werden können: 
         
         <pre><xmp
        diff --git a/war/src/main/webapp/env-vars_fr.html b/war/src/main/webapp/env-vars_fr.html
        index 352bf18a26..964d488406 100644
        --- a/war/src/main/webapp/env-vars_fr.html
        +++ b/war/src/main/webapp/env-vars_fr.html
        @@ -19,7 +19,7 @@
             <dd>Nom du projet de ce build, par exemple "foo"</dd>
         
             <dt>BUILD_TAG</dt>
        -    <dd>Le texte "hudson-<i>${JOB_NAME}</i>-<i>${BUILD_NUMBER}</i>", facile à placer dans
        +    <dd>Le texte "jenkins-<i>${JOB_NAME}</i>-<i>${BUILD_NUMBER}</i>", facile à placer dans
             un fichier de ressource, ou un jar, pour identification future.</dd>
         
             <dt>EXECUTOR_NUMBER</dt>
        @@ -40,6 +40,9 @@
             <dt>HUDSON_URL</dt>
             <dd>L'URL complète de Hudson, au format <tt>http://server:port/hudson/</tt></dd>
         
        +    <dt>JENKINS_URL</dt>
        +    <dd>L'URL complète de Jenkins, au format <tt>http://server:port/jenkins/</tt></dd>
        +
             <dt>SVN_REVISION</dt>
             <dd>Pour les projets utilisant Subversion, cette variable contient le numéro de révision du module.</dd>
         
        @@ -51,7 +54,7 @@
         
         
         <p>
        -Pour comprendre comment les variables d'environnement fournies par Hudson peuvent être utilisées
        +Pour comprendre comment les variables d'environnement fournies par Jenkins peuvent être utilisées
         par Ant, consultez le résultat de la target Ant suivante:
         
         <pre><xmp
        diff --git a/war/src/main/webapp/env-vars_ja.html b/war/src/main/webapp/env-vars_ja.html
        index f3172ea560..1ed23f1c86 100644
        --- a/war/src/main/webapp/env-vars_ja.html
        +++ b/war/src/main/webapp/env-vars_ja.html
        @@ -19,13 +19,12 @@
             <dd>ビルドのプロジェクト名。例 "foo"</dd>
         
             <dt>BUILD_TAG</dt>
        -    <dd>文字列 "hudson-<i>${JOB_NAME}</i>-<i>${BUILD_NUMBER}</i>"。
        +    <dd>文字列 "jenkins-<i>${JOB_NAME}</i>-<i>${BUILD_NUMBER}</i>"。
         	    簡易な識別子として、リソースファイルやjarファイルなどに付与するのに便利です。</dd>
         
             <dt>EXECUTOR_NUMBER</dt>
        -    <dd>
        -	    このビルドを実行している現在のエグゼキューターを識別する(同一マシンの中で)ユニークな番号。
        -		"ビルド実行状態"に表示されている数字ですが、1ではなく0から始まる数字です。
        +    <dd>このビルドを実行している現在のエグゼキューターを識別する(同一マシンの中で)ユニークな番号。
        +            "ビルド実行状態"に表示されている数字ですが、1ではなく0から始まる数字です。
         
             <dt>JAVA_HOME</dt>
             <dd>特定のJDKを使用するようにジョブを設定する場合、そのJDKのJAVA_HOMEをこの変数に設定します。
        @@ -37,11 +36,14 @@
             <dt>HUDSON_URL</dt>
             <dd>HudsonのURL。例 <tt>http://server:port/hudson/</tt></dd>
         
        -    <dt>BUILD_URL</dt>
        -    <dd>このビルドのURL。 例 <tt>http://server:port/hudson/job/foo/15/</tt></dd>
        +    <dt>JENKINS_URL</dt>
        +    <dd>JenkinsのURL。例 <tt>http://server:port/jenkins/</tt></dd>
        +
        +<dt>BUILD_URL</dt>
        +    <dd>このビルドのURL。 例 <tt>http://server:port/jenkins/job/foo/15/</tt></dd>
         
             <dt>JOB_URL</dt>
        -    <dd>このジョブのURL。 例 <tt>http://server:port/hudson/job/foo/</tt></dd>
        +    <dd>このジョブのURL。 例 <tt>http://server:port/jenkins/job/foo/</tt></dd>
         
             <dt>SVN_REVISION</dt>
             <dd>Subversionを使用するプロジェクトにおける、モジュールのリビジョン番号。</dd>
        @@ -53,7 +55,7 @@
         
         
         <p>
        -Hudsonが提供する環境変数のAntでの利用方法については、
        +Jenkinsが提供する環境変数のAntでの利用方法については、
         次のtargetを参考にしてください。
         
         <pre><xmp
        diff --git a/war/src/main/webapp/env-vars_nl.html b/war/src/main/webapp/env-vars_nl.html
        index 0ffebe9cdb..a714813edd 100644
        --- a/war/src/main/webapp/env-vars_nl.html
        +++ b/war/src/main/webapp/env-vars_nl.html
        @@ -19,7 +19,7 @@
             <dd>Naam van het project dat gebouwd wordt door deze bouwpoging, v.b. "foo"</dd>
         
             <dt>BUILD_TAG</dt>
        -    <dd>Het label :"hudson-<i>${JOB_NAME}</i>-<i>${BUILD_NUMBER}</i>". Dit label is typisch handig om
        +    <dd>Het label :"jenkins-<i>${JOB_NAME}</i>-<i>${BUILD_NUMBER}</i>". Dit label is typisch handig om
                 ter identificatie op te nemen in een "resource"-bestand, archieven (zoals jar,war,ear,...), ... .
             </dd>
         
        @@ -42,7 +42,10 @@
             <dt>HUDSON_URL</dt>
             <dd>Volledige URL voor Hudson, v.b. <tt>http://server:port/hudson/</tt></dd>
         
        -    <dt>SVN_REVISION</dt>
        +    <dt>JENKINS_URL</dt>
        +    <dd>Volledige URL voor Jenkins, v.b. <tt>http://server:port/jenkins/</tt></dd>
        +
        +<dt>SVN_REVISION</dt>
             <dd>Voor Suversion gebaseerde projecten, bevat deze parameter het versienummer van de module.</dd>
         
             <dt>CVS_BRANCH</dt>
        diff --git a/war/src/main/webapp/env-vars_tr.html b/war/src/main/webapp/env-vars_tr.html
        index 41eb5ecd18..ee625bd07d 100644
        --- a/war/src/main/webapp/env-vars_tr.html
        +++ b/war/src/main/webapp/env-vars_tr.html
        @@ -19,7 +19,7 @@
             <dd>Name of the project of this build, such as "foo"</dd>
         
             <dt>BUILD_TAG</dt>
        -    <dd>String of "hudson-<i>${JOB_NAME}</i>-<i>${BUILD_NUMBER}</i>". Convenient to put into
        +    <dd>String of "jenkins-<i>${JOB_NAME}</i>-<i>${BUILD_NUMBER}</i>". Convenient to put into
                 a resource file, a jar file, etc for easier identification.</dd>
         
             <dt>EXECUTOR_NUMBER</dt>
        @@ -39,7 +39,10 @@
             <dt>HUDSON_URL</dt>
             <dd>Full URL of Hudson, like <tt>http://server:port/hudson/</tt></dd>
         
        -    <dt>SVN_REVISION</dt>
        +    <dt>JENKINS_URL</dt>
        +    <dd>Full URL of Jenkins, like <tt>http://server:port/jenkins/</tt></dd>
        +
        +<dt>SVN_REVISION</dt>
             <dd>For Subversion-based projects, this variable contains the revision number of the module.</dd>
         
             <dt>CVS_BRANCH</dt>
        @@ -49,7 +52,7 @@
         
         
         <p>
        -To understand how environmental variables provided by Hudson can be utilized by
        +To understand how environmental variables provided by Jenkins can be utilized by
         Ant, study the following target:
         
         <pre><xmp
        
      • S ${%Name}${m.columnCaption} ${c.displayName}