From 527eee53e0a97e88ddc709a684cc5ba39f9a611a Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 18 Mar 2009 22:38:09 +0000 Subject: [PATCH 001/220] Cutting a release branch git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16369 71c3de6d-444a-0410-be80-ed276b4c234a From b39a361a13575d92044316b0c90a92303fc12c5b Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 20 Mar 2009 00:10:38 +0000 Subject: [PATCH 002/220] PeriodicWork change broke the tests, because the timer registration wasn't kicking in git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16380 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/WebAppMain.java | 2 -- core/src/main/java/hudson/model/Hudson.java | 2 ++ .../test/java/hudson/slaves/NodeProvisionerTest.java | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java index ef377f4441..4557cc321b 100644 --- a/core/src/main/java/hudson/WebAppMain.java +++ b/core/src/main/java/hudson/WebAppMain.java @@ -192,8 +192,6 @@ public final class WebAppMain implements ServletContextListener { throw new Error(e); } - Trigger.init(); // start running trigger - // trigger the loading of changelogs in the background, // but give the system 10 seconds so that the first page // can be served quickly diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 7a3f061182..254a343c38 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -557,6 +557,8 @@ public final class Hudson extends Node implements ItemGroup, Stapl t.printStackTrace(); } } + + Trigger.init(); // start running trigger } public TcpSlaveAgentListener getTcpSlaveAgentListener() { diff --git a/test/src/test/java/hudson/slaves/NodeProvisionerTest.java b/test/src/test/java/hudson/slaves/NodeProvisionerTest.java index a6f05b7e6c..7744a3d2dc 100644 --- a/test/src/test/java/hudson/slaves/NodeProvisionerTest.java +++ b/test/src/test/java/hudson/slaves/NodeProvisionerTest.java @@ -37,9 +37,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; /** * @author Kohsuke Kawaguchi @@ -197,8 +197,13 @@ public class NodeProvisionerTest extends HudsonTestCase { private void verifySuccessfulCompletion(List> builds) throws Exception { System.out.println("Waiting for a completion"); for (Future f : builds) { - FreeStyleBuild b = f.get();// if it's taking too long, abort. - assertBuildStatus(Result.SUCCESS,b); + try { + assertBuildStatus(Result.SUCCESS, f.get(1, TimeUnit.MINUTES)); + } catch (TimeoutException e) { + // time out so that the automated test won't hang forever, even when we have bugs + System.out.println("Build didn't complete in time"); + throw e; + } } } } From 12f76efe81097c5c1207562a5061f6715471e912 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 20 Mar 2009 00:33:14 +0000 Subject: [PATCH 003/220] fixed a test so that it's no longer timing sensitive git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16381 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/slaves/NodeProvisionerTest.java | 61 ++++++++++++++----- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/test/src/test/java/hudson/slaves/NodeProvisionerTest.java b/test/src/test/java/hudson/slaves/NodeProvisionerTest.java index 7744a3d2dc..0369d84735 100644 --- a/test/src/test/java/hudson/slaves/NodeProvisionerTest.java +++ b/test/src/test/java/hudson/slaves/NodeProvisionerTest.java @@ -24,12 +24,9 @@ package hudson.slaves; import hudson.BulkChange; -import hudson.model.FreeStyleBuild; -import hudson.model.FreeStyleProject; -import hudson.model.LoadStatistics; -import hudson.model.Node; -import hudson.model.Result; -import hudson.model.Label; +import hudson.Launcher; +import hudson.model.*; +import hudson.tasks.Builder; import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.SleepBuilder; @@ -60,6 +57,38 @@ public class NodeProvisionerTest extends HudsonTestCase { LoadStatistics.CLOCK = original; } + /** + * Latch synchronization primitive that waits for N thread to pass the checkpoint. + *

+ * This is used to make sure we get a set of builds that run long enough. + */ + static class Latch { + /** Initial value */ + public final int init; + private int n; + + Latch(int n) { + this.n = init = n; + } + + synchronized void block() throws InterruptedException { + if(--n==0) notifyAll(); // wake up everyone else + else wait(60*1000); // if a test takes t oo long, abort. + } + + /** + * Creates a builder that blocks until the latch opens. + */ + public Builder createBuilder() { + return new Builder() { + public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { + block(); + return true; + } + }; + } + } + /** * Scenario: schedule a build and see if one slave is provisioned. */ @@ -69,7 +98,7 @@ public class NodeProvisionerTest extends HudsonTestCase { DummyCloudImpl cloud = initHudson(10); - FreeStyleProject p = createJob(10); + FreeStyleProject p = createJob(new SleepBuilder(10)); Future f = p.scheduleBuild2(0); f.get(30, TimeUnit.SECONDS); // if it's taking too long, abort. @@ -89,7 +118,7 @@ public class NodeProvisionerTest extends HudsonTestCase { try { DummyCloudImpl cloud = initHudson(0); - verifySuccessfulCompletion(buildAll(create5SlowJobs())); + verifySuccessfulCompletion(buildAll(create5SlowJobs(new Latch(5)))); // the time it takes to complete a job is eternally long compared to the time it takes to launch // a new slave, so in this scenario we end up allocating 5 slaves for 5 jobs. @@ -110,7 +139,7 @@ public class NodeProvisionerTest extends HudsonTestCase { createSlave().toComputer().connect(false).get(); createSlave().toComputer().connect(false).get(); - verifySuccessfulCompletion(buildAll(create5SlowJobs())); + verifySuccessfulCompletion(buildAll(create5SlowJobs(new Latch(5)))); // we should have used two static slaves, thus only 3 slaves should have been provisioned assertEquals(3,cloud.numProvisioned); @@ -131,12 +160,12 @@ public class NodeProvisionerTest extends HudsonTestCase { cloud.label = red; // red jobs - List redJobs = create5SlowJobs(); + List redJobs = create5SlowJobs(new Latch(5)); for (FreeStyleProject p : redJobs) p.setAssignedLabel(red); // blue jobs - List blueJobs = create5SlowJobs(); + List blueJobs = create5SlowJobs(new Latch(5)); for (FreeStyleProject p : blueJobs) p.setAssignedLabel(blue); @@ -156,10 +185,10 @@ public class NodeProvisionerTest extends HudsonTestCase { } - private FreeStyleProject createJob(int delay) throws IOException { + private FreeStyleProject createJob(Builder builder) throws IOException { FreeStyleProject p = createFreeStyleProject(); p.setAssignedLabel(null); // let it roam free, or else it ties itself to the master since we have no slaves - p.getBuildersList().add(new SleepBuilder(delay)); + p.getBuildersList().add(builder); return p; } @@ -174,12 +203,12 @@ public class NodeProvisionerTest extends HudsonTestCase { return cloud; } - private List create5SlowJobs() throws IOException { + private List create5SlowJobs(Latch l) throws IOException { List jobs = new ArrayList(); - for( int i=0; i<5; i++) + for( int i=0; i Date: Sat, 21 Mar 2009 01:35:55 +0000 Subject: [PATCH 004/220] [maven-release-plugin] prepare release hudson-1_293 git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16433 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index b49162c330..c392f4eb22 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.293-SNAPSHOT + 1.293 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 5217afc10c..ce052dac2a 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.293-SNAPSHOT + 1.293 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index f4b17ce6cd..7630c8ce33 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.293-SNAPSHOT + 1.293 ../pom.xml diff --git a/pom.xml b/pom.xml index 54ea0905a3..2ce5b0a1f5 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.293-SNAPSHOT + 1.293 pom Hudson main module @@ -49,9 +49,9 @@ THE SOFTWARE. - scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ - scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ - https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main + scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_293 + scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_293 + https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_293 diff --git a/remoting/pom.xml b/remoting/pom.xml index 40fc29d771..c3ebae0ac2 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.293-SNAPSHOT + 1.293 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index ba8aa73c65..db2e0dbad0 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.293-SNAPSHOT + 1.293 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 74fd95ae5f..1dea01914d 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.293-SNAPSHOT + 1.293 ../pom.xml From 277b8d81199c974c2a9e8b278a6772e093b5d36f Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 21 Mar 2009 01:36:21 +0000 Subject: [PATCH 005/220] [maven-release-plugin] prepare for next development iteration git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16435 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index c392f4eb22..780806a8ec 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.293 + 1.294-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index ce052dac2a..2dabe6195d 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.293 + 1.294-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 7630c8ce33..5d984e4bf9 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.293 + 1.294-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 2ce5b0a1f5..6bbf6be837 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.293 + 1.294-SNAPSHOT pom Hudson main module @@ -49,9 +49,9 @@ THE SOFTWARE. - scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_293 - scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_293 - https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_293 + scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ + scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ + https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main diff --git a/remoting/pom.xml b/remoting/pom.xml index c3ebae0ac2..89bfafabc6 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.293 + 1.294-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index db2e0dbad0..69a22a7bc1 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.293 + 1.294-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 1dea01914d..d686eb2acc 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.293 + 1.294-SNAPSHOT ../pom.xml From 8297f1e5fdcc715f2b8a9d3fc9d97d272bf8a875 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 21 Mar 2009 02:10:29 +0000 Subject: [PATCH 006/220] updated changelog as a part of the release git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16438 71c3de6d-444a-0410-be80-ed276b4c234a --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 99681cd98f..08eb9ff70c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.293) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 20 Mar 2009 19:11:14 -0700 + hudson (1.292) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. From 04a2d31ca955c92c3604ca75f79507829f5c5a7a Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 26 Mar 2009 16:47:01 +0000 Subject: [PATCH 007/220] fixed a test failure. legacy descriptors and extensions weren't cleaned up at the end of a test. git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16577 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/DescriptorExtensionList.java | 7 +++++ core/src/main/java/hudson/ExtensionList.java | 7 +++++ .../org/jvnet/hudson/test/HudsonTestCase.java | 30 ++++++++----------- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/core/src/main/java/hudson/DescriptorExtensionList.java b/core/src/main/java/hudson/DescriptorExtensionList.java index 3a570dc023..d4bc87db21 100644 --- a/core/src/main/java/hudson/DescriptorExtensionList.java +++ b/core/src/main/java/hudson/DescriptorExtensionList.java @@ -164,5 +164,12 @@ public class DescriptorExtensionList, D extends Descrip }; } + /** + * Exposed just for the test harness. Clear legacy instances. + */ + public static void clearLegacyInstances() { + legacyDescriptors.clear(); + } + private static final Logger LOGGER = Logger.getLogger(DescriptorExtensionList.class.getName()); } diff --git a/core/src/main/java/hudson/ExtensionList.java b/core/src/main/java/hudson/ExtensionList.java index 06b412d0c6..65355cf7f7 100644 --- a/core/src/main/java/hudson/ExtensionList.java +++ b/core/src/main/java/hudson/ExtensionList.java @@ -229,4 +229,11 @@ public class ExtensionList extends AbstractList { return new CopyOnWriteArrayList(); } }; + + /** + * Exposed for the test harness to clear all legacy extension instances. + */ + public static void clearLegacyInstances() { + staticLegacyInstances.clear(); + } } 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 2752f7dc69..eae0243534 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -28,6 +28,8 @@ import hudson.FilePath; import hudson.Functions; import hudson.WebAppMain; import hudson.EnvVars; +import hudson.ExtensionList; +import hudson.DescriptorExtensionList; import hudson.Launcher.LocalLauncher; import hudson.matrix.MatrixProject; import hudson.matrix.MatrixBuild; @@ -214,23 +216,8 @@ public abstract class HudsonTestCase extends TestCase { hudson.cleanUp(); env.dispose(); - } - - private void cleanUpDescriptors(Iterable cont) { - ClassLoader base = getClass().getClassLoader(); - for (Iterator itr = cont.iterator(); itr.hasNext();) { - Descriptor d = itr.next(); - ClassLoader cl = d.getClass().getClassLoader(); - if(cl==base) continue; - - while(cl!=null) { - cl = cl.getParent(); - if(cl==base) { - itr.remove(); - break; - } - } - } + ExtensionList.clearLegacyInstances(); + DescriptorExtensionList.clearLegacyInstances(); } protected void runTest() throws Throwable { @@ -445,6 +432,15 @@ public abstract class HudsonTestCase extends TestCase { } } + /** + * Blocks until the ENTER key is hit. + * This is useful during debugging a test so that one can inspect the state of Hudson through the web browser. + */ + public void interactiveBreak() throws Exception { + System.out.println("Hudson is running at localhost:"+localPort); + new BufferedReader(new InputStreamReader(System.in)).readLine(); + } + /** * Returns the last item in the list. */ From bf37d29a81ac4478afb5d5a3aaea4e9aed733dbf Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 28 Mar 2009 02:13:03 +0000 Subject: [PATCH 008/220] [maven-release-plugin] prepare release hudson-1_294 git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16638 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 40bb462dcd..f33582d2db 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.294-SNAPSHOT + 1.294 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 2dabe6195d..825d7cec60 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.294-SNAPSHOT + 1.294 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 5d984e4bf9..7348899a8c 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.294-SNAPSHOT + 1.294 ../pom.xml diff --git a/pom.xml b/pom.xml index 5f3dfcf5af..f7723c5253 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.294-SNAPSHOT + 1.294 pom Hudson main module @@ -49,9 +49,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ - scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ - https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main + scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_294 + scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_294 + https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_294 diff --git a/remoting/pom.xml b/remoting/pom.xml index 89bfafabc6..6079441581 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.294-SNAPSHOT + 1.294 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 24967da794..7706c3d751 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.294-SNAPSHOT + 1.294 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index d686eb2acc..360f11f0a8 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.294-SNAPSHOT + 1.294 ../pom.xml From f4226e59c7b3a233ca4ae2bc1dc1a8da88ed0984 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 28 Mar 2009 14:32:33 +0000 Subject: [PATCH 009/220] [maven-release-plugin] prepare for next development iteration git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16644 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index f33582d2db..393f49aa9b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.294 + 1.295-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 825d7cec60..6901946901 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.294 + 1.295-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 7348899a8c..caaeb02734 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.294 + 1.295-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index f7723c5253..35cd5c1271 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.294 + 1.295-SNAPSHOT pom Hudson main module @@ -49,9 +49,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_294 - scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_294 - https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_294 + scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ + scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ + https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main diff --git a/remoting/pom.xml b/remoting/pom.xml index 6079441581..96ff77bbf9 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.294 + 1.295-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 7706c3d751..69c8bad318 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.294 + 1.295-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 360f11f0a8..6022c9fede 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.294 + 1.295-SNAPSHOT ../pom.xml From 33ae00ec46e50c0039faae42d2aa281fb0b2998d Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 28 Mar 2009 21:42:44 +0000 Subject: [PATCH 010/220] updated changelog as a part of the release git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16652 71c3de6d-444a-0410-be80-ed276b4c234a --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 08eb9ff70c..fc08d1fecc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.294) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Sat, 28 Mar 2009 14:43:37 -0700 + hudson (1.293) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. From 3a99dfe8b1079facff3565267e65818c1d1928e5 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 2 Apr 2009 03:26:34 +0000 Subject: [PATCH 011/220] failure to load plugins may be reported as NoClassDefError, for example if the dependency classes fail to load git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16791 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/ClassicPluginStrategy.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index 694a127c6e..5a4cea63a8 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -202,6 +202,8 @@ public class ClassicPluginStrategy implements PluginStrategy { throw new IOException(className+" doesn't extend from hudson.Plugin"); } wrapper.setPlugin((Plugin) o); + } catch (LinkageError e) { + throw new IOException2("Unable to load " + className + " from " + wrapper.getShortName(),e); } catch (ClassNotFoundException e) { throw new IOException2("Unable to load " + className + " from " + wrapper.getShortName(),e); } catch (IllegalAccessException e) { From a9b39be0274e6c87b9d26d9127a547b3c5b312cd Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 2 Apr 2009 03:40:22 +0000 Subject: [PATCH 012/220] up to date check was horribly broken. git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16792 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/PluginManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index 54b5a62d63..2a1e272569 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -180,7 +180,7 @@ public final class PluginManager extends AbstractModelObject { URL url = context.getResource(path); long lastModified = url.openConnection().getLastModified(); File file = new File(rootDir, fileName); - if (file.exists() && file.lastModified() != lastModified) { + if (!file.exists() || file.lastModified() != lastModified) { FileUtils.copyURLToFile(url, file); file.setLastModified(url.openConnection().getLastModified()); // lastModified is set for two reasons: From 6a6d7da39d5a4d2a30114f786d9bf44ded2d0eeb Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 4 Apr 2009 01:45:42 +0000 Subject: [PATCH 013/220] [maven-release-plugin] prepare release hudson-1_296 git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16845 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 5 ++--- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index c2a8954a28..c157f8c34c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.296-SNAPSHOT + 1.296 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index f8bb91ae33..5b0efa19fe 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.296-SNAPSHOT + 1.296 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 0b56a6672c..1b635ac053 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.296-SNAPSHOT + 1.296 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 19958f2c4d..2f2dd23a4e 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.296-SNAPSHOT + 1.296 maven-plugin diff --git a/pom.xml b/pom.xml index 9a6fe972a5..18f6fe0749 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.296-SNAPSHOT + 1.296 pom Hudson main module @@ -50,9 +50,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ - scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ - https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main + scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_296 + scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_296 + https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_296 diff --git a/remoting/pom.xml b/remoting/pom.xml index 95946ed718..d6d1769be2 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.296-SNAPSHOT + 1.296 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 6fa3c43f41..2574e316c8 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.296-SNAPSHOT + 1.296 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 2501cbbc6c..63eb49b875 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.296-SNAPSHOT + 1.296 ../pom.xml @@ -109,8 +109,7 @@ THE SOFTWARE. - + From add79ce371f3b1ce46ac899f38bb2a13d1bb5c36 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 4 Apr 2009 01:56:39 +0000 Subject: [PATCH 014/220] [maven-release-plugin] prepare for next development iteration git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16847 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index c157f8c34c..493a11af48 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.296 + 1.297-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 5b0efa19fe..4ec4350220 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.296 + 1.297-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 1b635ac053..47e262771f 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.296 + 1.297-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 2f2dd23a4e..05500ff258 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.296 + 1.297-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 18f6fe0749..1979812d7e 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.296 + 1.297-SNAPSHOT pom Hudson main module @@ -50,9 +50,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_296 - scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_296 - https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_296 + scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ + scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ + https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main diff --git a/remoting/pom.xml b/remoting/pom.xml index d6d1769be2..8344b158cf 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.296 + 1.297-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 2574e316c8..186904dc97 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.296 + 1.297-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 63eb49b875..e811df7981 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.296 + 1.297-SNAPSHOT ../pom.xml From 5708b97bf9f9e41c545ab4ea2a93283fa5ee876f Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 4 Apr 2009 02:32:33 +0000 Subject: [PATCH 015/220] updated changelog as a part of the release git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16850 71c3de6d-444a-0410-be80-ed276b4c234a --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 25512d315f..b271db419d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.296) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 03 Apr 2009 19:33:32 -0700 + hudson (1.295) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. From 7f6a3c0b1ed996c940f7b745d16ef7fb86513d6b Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 6 Apr 2009 23:00:37 +0000 Subject: [PATCH 016/220] [FIXED HUDSON-3436] dependency classloader wasn't seeing the optional dependencies. git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16880 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/ClassicPluginStrategy.java | 2 +- core/src/main/java/hudson/Util.java | 13 ++++++++++++ .../test/java/hudson/PluginManagerTest.java | 21 +++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index 5a4cea63a8..3bbc6b3e08 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -167,7 +167,7 @@ public class ClassicPluginStrategy implements PluginStrategy { } ClassLoader dependencyLoader = new DependencyClassLoader(getClass() - .getClassLoader(), dependencies); + .getClassLoader(), Util.join(dependencies,optionalDependencies)); ClassLoader classLoader = new URLClassLoader(paths.toArray(new URL[paths.size()]), dependencyLoader); diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java index f1cd1a828b..e6fffb75cb 100644 --- a/core/src/main/java/hudson/Util.java +++ b/core/src/main/java/hudson/Util.java @@ -779,6 +779,19 @@ public class Util { return buf.toString(); } + /** + * Combines all the given collections into a single list. + */ + public static List join(Collection... items) { + int size = 0; + for (Collection item : items) + size += item.size(); + List r = new ArrayList(size); + for (Collection item : items) + r.addAll(item); + return r; + } + /** * Creates Ant {@link FileSet} with the base dir and include pattern. * diff --git a/test/src/test/java/hudson/PluginManagerTest.java b/test/src/test/java/hudson/PluginManagerTest.java index f3075fcbfd..1e77d3ecd4 100644 --- a/test/src/test/java/hudson/PluginManagerTest.java +++ b/test/src/test/java/hudson/PluginManagerTest.java @@ -57,4 +57,25 @@ public class PluginManagerTest extends HudsonTestCase { public void testWithRecipe() throws Exception { assertNotNull(hudson.getPlugin("tasks")); } + + /** + * Makes sure that plugins can see Maven2 plugin that's refactored out in 1.296. + */ + @WithPlugin("tasks.hpi") + public void testOptionalMavenDependency() throws Exception { + PluginWrapper.Dependency m2=null; + PluginWrapper tasks = hudson.getPluginManager().getPlugin("tasks"); + for( PluginWrapper.Dependency d : tasks.getOptionalDependencies() ) { + if(d.shortName.equals("maven-plugin")) { + assertNull(m2); + m2 = d; + } + } + assertNotNull(m2); + + // this actually doesn't really test what we need, though, because + // I thought test harness is loading the maven classes by itself. + // TODO: write a separate test that tests the optional dependency loading + tasks.classLoader.loadClass(hudson.maven.agent.AbortException.class.getName()); + } } From 608c69fc20a5399230da62560ba5cfe6149ad0c7 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 6 Apr 2009 23:10:41 +0000 Subject: [PATCH 017/220] [FIXED HUDSON-3436] dependency classloader wasn't seeing the optional dependencies. git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16881 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/ClassicPluginStrategy.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index 3bbc6b3e08..a6aee7a3eb 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -162,7 +162,8 @@ public class ClassicPluginStrategy implements PluginStrategy { String hudsonVersion = manifest.getMainAttributes().getValue("Hudson-Version"); String shortName = manifest.getMainAttributes().getValue("Short-Name"); if (!"maven-plugin".equals(shortName) && - (hudsonVersion == null || hudsonVersion.compareTo("1.296") <= 0)) { + // some earlier versions of maven-hpi-plugin apparently puts "null" as a literal here. Watch out for those. + (hudsonVersion == null || hudsonVersion.equals("null") || hudsonVersion.compareTo("1.296") <= 0)) { optionalDependencies.add(new PluginWrapper.Dependency("maven-plugin:" + Hudson.VERSION)); } From 133b77dbd9c67453fb300055b78de0fa17268b74 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 6 Apr 2009 23:37:16 +0000 Subject: [PATCH 018/220] [maven-release-plugin] prepare release hudson-1_297 git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16887 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 493a11af48..d4e50c6b9f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.297-SNAPSHOT + 1.297 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 4ec4350220..8049889fa5 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.297-SNAPSHOT + 1.297 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 47e262771f..fa50db21ee 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.297-SNAPSHOT + 1.297 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 05500ff258..0c64736511 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.297-SNAPSHOT + 1.297 maven-plugin diff --git a/pom.xml b/pom.xml index 1979812d7e..e4b77672c3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.297-SNAPSHOT + 1.297 pom Hudson main module @@ -50,9 +50,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ - scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ - https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main + scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_297 + scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_297 + https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_297 diff --git a/remoting/pom.xml b/remoting/pom.xml index 8344b158cf..3598d1b110 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.297-SNAPSHOT + 1.297 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 186904dc97..1742ca840d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.297-SNAPSHOT + 1.297 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index e811df7981..3d1c07f88d 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.297-SNAPSHOT + 1.297 ../pom.xml From 96088dcf9cb7c4a278d7a0bfd9bbe5ca69788645 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 6 Apr 2009 23:37:41 +0000 Subject: [PATCH 019/220] [maven-release-plugin] prepare for next development iteration git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16889 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index d4e50c6b9f..c37a9dc627 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.297 + 1.298-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 8049889fa5..171380b388 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.297 + 1.298-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index fa50db21ee..d642ef0bc6 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.297 + 1.298-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 0c64736511..91dbe6b985 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.297 + 1.298-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index e4b77672c3..d6abe6b183 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.297 + 1.298-SNAPSHOT pom Hudson main module @@ -50,9 +50,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_297 - scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_297 - https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_297 + scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ + scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ + https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main diff --git a/remoting/pom.xml b/remoting/pom.xml index 3598d1b110..1aadcb49b4 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.297 + 1.298-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 1742ca840d..29c0d8e5eb 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.297 + 1.298-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 3d1c07f88d..2618d2f0d8 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.297 + 1.298-SNAPSHOT ../pom.xml From d38f7a81bf4bf7ccad89702312b8bcea76e6ae39 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 7 Apr 2009 00:46:32 +0000 Subject: [PATCH 020/220] updated changelog as a part of the release git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16898 71c3de6d-444a-0410-be80-ed276b4c234a --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index b271db419d..43927d7cd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.297) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Mon, 06 Apr 2009 17:47:31 -0700 + hudson (1.296) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. From 2041d40da7788983a54d8f8977fae93b5edb9b44 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 8 Apr 2009 15:53:52 +0000 Subject: [PATCH 021/220] merge failure git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@16926 71c3de6d-444a-0410-be80-ed276b4c234a --- .../test/java/hudson/maven/MavenProjectTest.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/test/src/test/java/hudson/maven/MavenProjectTest.java b/test/src/test/java/hudson/maven/MavenProjectTest.java index 468e24a996..fd1d661930 100755 --- a/test/src/test/java/hudson/maven/MavenProjectTest.java +++ b/test/src/test/java/hudson/maven/MavenProjectTest.java @@ -73,19 +73,6 @@ public class MavenProjectTest extends HudsonTestCase { assertTrue(page.getWebResponse().getContentAsString().contains(hudson.getDescriptorByType(RedeployPublisher.DescriptorImpl.class).getDisplayName())); } - /** - * Makes sure that {@link ArtifactArchiver} doesn't show up in the m2 job type config screen. - * This is to make sure that the exclusion in {@link MavenModuleSet.DescriptorImpl#isApplicable(Descriptor)} - * is working. - */ - public void testExclusion() throws Exception { - MavenModuleSet p = createMavenProject(); - HtmlPage page = new WebClient().getPage(p, "configure"); - assertFalse(page.getWebResponse().getContentAsString().contains(hudson.getDescriptorByType(ArtifactArchiver.DescriptorImpl.class).getDisplayName())); - // but this should exist. This verifies that the approach of the test is sane (and for example, to make sure getContentAsString()!="") - assertTrue(page.getWebResponse().getContentAsString().contains(hudson.getDescriptorByType(RedeployPublisher.DescriptorImpl.class).getDisplayName())); - } - /** * Attempt to reproduce #2154, but this appears to work. */ From 38d64d9bfe6f3dae88b1bd5f76426a6276591a1e Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 10 Apr 2009 22:22:13 +0000 Subject: [PATCH 022/220] [maven-release-plugin] prepare release hudson-1_298 git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17033 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index c37a9dc627..1941e7b0f6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.298-SNAPSHOT + 1.298 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 171380b388..68a635b13a 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.298-SNAPSHOT + 1.298 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index d642ef0bc6..04fb5db70d 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.298-SNAPSHOT + 1.298 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 91dbe6b985..1596e974e3 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.298-SNAPSHOT + 1.298 maven-plugin diff --git a/pom.xml b/pom.xml index d6abe6b183..41d00f8cd4 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.298-SNAPSHOT + 1.298 pom Hudson main module @@ -50,9 +50,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ - scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ - https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main + scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_298 + scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_298 + https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_298 diff --git a/remoting/pom.xml b/remoting/pom.xml index 1aadcb49b4..37888b42f2 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.298-SNAPSHOT + 1.298 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 29c0d8e5eb..53e3dfef0e 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.298-SNAPSHOT + 1.298 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 2618d2f0d8..2041951bae 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.298-SNAPSHOT + 1.298 ../pom.xml From eff4659fc687f1c295dc1ef346df883bd0259b35 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 10 Apr 2009 22:22:42 +0000 Subject: [PATCH 023/220] [maven-release-plugin] prepare for next development iteration git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17035 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 1941e7b0f6..5bdfdbaa06 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.298 + 1.299-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 68a635b13a..669e15dafd 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.298 + 1.299-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 04fb5db70d..1a1ae7de5e 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.298 + 1.299-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 1596e974e3..95940b0169 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.298 + 1.299-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 41d00f8cd4..ef53d961c2 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.298 + 1.299-SNAPSHOT pom Hudson main module @@ -50,9 +50,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_298 - scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_298 - https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_298 + scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ + scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ + https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main diff --git a/remoting/pom.xml b/remoting/pom.xml index 37888b42f2..1186472cf2 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.298 + 1.299-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 53e3dfef0e..cbb952b7e0 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.298 + 1.299-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 2041951bae..5983f5ed71 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.298 + 1.299-SNAPSHOT ../pom.xml From 635cd657c1d90348e6392728b3dda08220f510a5 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 11 Apr 2009 00:52:13 +0000 Subject: [PATCH 024/220] remove JDK6 dependency git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17036 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/ChoiceParameterDefinition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java index cac7a93030..44e34b2d37 100755 --- a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java +++ b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java @@ -20,7 +20,7 @@ public class ChoiceParameterDefinition extends ParameterDefinition { public ChoiceParameterDefinition(String name, String choices, String description) { super(name, description); this.choices = Arrays.asList(choices.split("\\r?\\n")); - if (choices.isEmpty()) { + if (choices.length()==0) { throw new IllegalArgumentException("No choices found"); } } From 765cee1deb99ce9b886d97ca6ef7b14aa6eeaa82 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 11 Apr 2009 01:21:37 +0000 Subject: [PATCH 025/220] [maven-release-plugin] prepare release hudson-1_299 git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17037 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 5bdfdbaa06..b6a8c0c9a8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.299-SNAPSHOT + 1.299 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 669e15dafd..4d07a62ccd 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.299-SNAPSHOT + 1.299 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 1a1ae7de5e..76bb190c2f 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.299-SNAPSHOT + 1.299 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 95940b0169..7ed75e2256 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.299-SNAPSHOT + 1.299 maven-plugin diff --git a/pom.xml b/pom.xml index ef53d961c2..2159ad3a67 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.299-SNAPSHOT + 1.299 pom Hudson main module @@ -50,9 +50,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ - scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ - https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main + scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_299 + scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_299 + https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_299 diff --git a/remoting/pom.xml b/remoting/pom.xml index 1186472cf2..bcde9debf6 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.299-SNAPSHOT + 1.299 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index cbb952b7e0..72664ae5d7 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.299-SNAPSHOT + 1.299 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 5983f5ed71..c317eec363 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.299-SNAPSHOT + 1.299 ../pom.xml From 8f8087b4288a6f5c378e8e563a3f93d48e25701b Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 11 Apr 2009 01:27:36 +0000 Subject: [PATCH 026/220] [maven-release-plugin] prepare for next development iteration git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17039 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index b6a8c0c9a8..04a07ce06f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.299 + 1.300-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 4d07a62ccd..14966de851 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.299 + 1.300-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 76bb190c2f..17315a5d5f 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.299 + 1.300-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 7ed75e2256..cca717d4e5 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.299 + 1.300-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 2159ad3a67..c4fea424db 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.299 + 1.300-SNAPSHOT pom Hudson main module @@ -50,9 +50,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_299 - scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_299 - https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_299 + scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ + scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ + https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main diff --git a/remoting/pom.xml b/remoting/pom.xml index bcde9debf6..a009a8f150 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.299 + 1.300-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 72664ae5d7..705f6292e9 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.299 + 1.300-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index c317eec363..055866a6ff 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.299 + 1.300-SNAPSHOT ../pom.xml From ab7b9c506c94b0d866e4f74f218d5f9eafca1163 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 11 Apr 2009 02:14:19 +0000 Subject: [PATCH 027/220] updated changelog as a part of the release git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17041 71c3de6d-444a-0410-be80-ed276b4c234a --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 43927d7cd3..7e80f0e739 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.299) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 10 Apr 2009 19:15:13 -0700 + hudson (1.297) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. From 899a87f702a8dc1c81fdd30234f05595f066049b Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 17 Apr 2009 23:14:36 +0000 Subject: [PATCH 028/220] [maven-release-plugin] prepare release hudson-1_300 git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17249 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 7cc0b89132..83c664bae1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.300-SNAPSHOT + 1.300 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 14966de851..452a74e4d5 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.300-SNAPSHOT + 1.300 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 17315a5d5f..177231c9e3 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.300-SNAPSHOT + 1.300 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index cca717d4e5..64ec9b4c65 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.300-SNAPSHOT + 1.300 maven-plugin diff --git a/pom.xml b/pom.xml index c4fea424db..ccbb8cfc41 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.300-SNAPSHOT + 1.300 pom Hudson main module @@ -50,9 +50,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ - scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ - https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main + scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_300 + scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_300 + https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_300 diff --git a/remoting/pom.xml b/remoting/pom.xml index a009a8f150..bd2538c0cb 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.300-SNAPSHOT + 1.300 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 705f6292e9..43d1c8e9fb 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.300-SNAPSHOT + 1.300 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 055866a6ff..9e018a199d 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.300-SNAPSHOT + 1.300 ../pom.xml From 379fe6bdba10cb66d723431d9a3f0bfd8c10ac33 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 17 Apr 2009 23:15:01 +0000 Subject: [PATCH 029/220] [maven-release-plugin] prepare for next development iteration git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17251 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 83c664bae1..409cdf7193 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.300 + 1.301-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 452a74e4d5..46fc143434 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.300 + 1.301-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 177231c9e3..a82df90395 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.300 + 1.301-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 64ec9b4c65..399d0444d9 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.300 + 1.301-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index ccbb8cfc41..de130c5013 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.300 + 1.301-SNAPSHOT pom Hudson main module @@ -50,9 +50,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_300 - scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_300 - https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_300 + scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ + scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ + https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main diff --git a/remoting/pom.xml b/remoting/pom.xml index bd2538c0cb..1d61dcf1f1 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.300 + 1.301-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 43d1c8e9fb..bc070b738c 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.300 + 1.301-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 9e018a199d..5a0dda44fa 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.300 + 1.301-SNAPSHOT ../pom.xml From d3244f01405c244196572e3513ee77dfdc0fcd8e Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 18 Apr 2009 00:48:04 +0000 Subject: [PATCH 030/220] updated changelog as a part of the release git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17254 71c3de6d-444a-0410-be80-ed276b4c234a --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7e80f0e739..cb63af1de7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +hudson (1.300) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 17 Apr 2009 17:48:57 -0700 + +hudson (1.300) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 17 Apr 2009 16:54:46 -0700 + hudson (1.299) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. From 5da7122693f960ecfa536a261847edbe6fd66bb1 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 23 Apr 2009 18:16:10 +0000 Subject: [PATCH 031/220] bug fix for the auto upgrade handling for HUDSON-2324. git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17436 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/security/GlobalMatrixAuthorizationStrategy.java | 2 +- core/src/main/java/hudson/util/VersionNumber.java | 3 +-- core/src/test/java/hudson/util/VersionNumberTest.java | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java b/core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java index 3f49a5776b..960f9a2208 100644 --- a/core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java @@ -122,7 +122,7 @@ public class GlobalMatrixAuthorizationStrategy extends AuthorizationStrategy { * @param grantedPermissions */ /*package*/ static void migrateHudson2324(Map> grantedPermissions) { - if(Hudson.getInstance().isUpgradedFromBefore(new VersionNumber("1.301"))) { + if(Hudson.getInstance().isUpgradedFromBefore(new VersionNumber("1.300.*"))) { Set f = grantedPermissions.get(Hudson.READ); if(f!=null) { Set t = grantedPermissions.get(Item.READ); diff --git a/core/src/main/java/hudson/util/VersionNumber.java b/core/src/main/java/hudson/util/VersionNumber.java index f9c7558287..cbca0a70ba 100644 --- a/core/src/main/java/hudson/util/VersionNumber.java +++ b/core/src/main/java/hudson/util/VersionNumber.java @@ -83,8 +83,7 @@ public class VersionNumber implements Comparable { digits[i++] = 1000; } else if(token.startsWith("snapshot")) { - digits[i-1]--; - digits[i++] = 1000; + digits[i++] = -1000; // treat like EA break; } else if(token.startsWith("ea")) { diff --git a/core/src/test/java/hudson/util/VersionNumberTest.java b/core/src/test/java/hudson/util/VersionNumberTest.java index 3322136cb1..44a03d544c 100644 --- a/core/src/test/java/hudson/util/VersionNumberTest.java +++ b/core/src/test/java/hudson/util/VersionNumberTest.java @@ -48,5 +48,6 @@ public class VersionNumberTest extends TestCase { public void testSnapshots() { assertTrue(new VersionNumber("1.12").isNewerThan(new VersionNumber("1.12-SNAPSHOT (private-08/24/2008 12:13-hudson)"))); assertTrue(new VersionNumber("1.12-SNAPSHOT (private-08/24/2008 12:13-hudson)").isNewerThan(new VersionNumber("1.11"))); + assertTrue(new VersionNumber("1.12-SNAPSHOT").isNewerThan(new VersionNumber("1.11.*"))); } } From 349b2d8d3ffb9255ffdc480723264b124b53071d Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 23 Apr 2009 18:31:35 +0000 Subject: [PATCH 032/220] bug fix for the auto upgrade handling for HUDSON-2324. git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17437 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Hudson.java | 34 ++++++++++++------- .../main/java/hudson/util/VersionNumber.java | 3 +- .../java/hudson/util/VersionNumberTest.java | 3 +- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index f2bcf88df6..e55bc926b5 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -202,6 +202,20 @@ public final class Hudson extends Node implements ItemGroup, Stapl */ private transient final Map computers = new CopyOnWriteMap.Hash(); + /** + * We update this field to the current version of Hudson whenever we save {@code config.xml}. + * This can be used to detect when an upgrade happens from one version to next. + * + *

+ * Since this field is introduced starting 1.301, "1.0" is used to represent every version + * up to 1.300. This value may also include non-standard versions like "1.301-SNAPSHOT" or + * "?", etc., so parsing needs to be done with a care. + * + * @since 1.301 + */ + // this field needs to be at the very top so that other components can look at this value even during unmarshalling + private String version = "1.0"; + /** * Number of executors of the master node. */ @@ -254,19 +268,6 @@ public final class Hudson extends Node implements ItemGroup, Stapl */ private String systemMessage; - /** - * We update this field to the current version of Hudson whenever we save {@code config.xml}. - * This can be used to detect when an upgrade happens from one version to next. - * - *

- * Since this field is introduced starting 1.301, "1.0" is used to represent every version - * up to 1.300. This value may also include non-standard versions like "1.301-SNAPSHOT" or - * "?", etc., so parsing needs to be done with a care. - * - * @since 1.301 - */ - private String version = "1.0"; - /** * Root directory of the system. */ @@ -1149,6 +1150,13 @@ public final class Hudson extends Node implements ItemGroup, Stapl *

* This method continues to return true until the system configuration is saved, at which point * {@link #version} will be overwritten and Hudson forgets the upgrade history. + * + *

+ * To handle SNAPSHOTS correctly, pass in "1.N.*" to test if it's upgrading from the version + * equal or younger than N. So say if you implement a feature in 1.301 and you want to check + * if the installation upgraded from pre-1.301, pass in "1.300.*" + * + * @since 1.301 */ public boolean isUpgradedFromBefore(VersionNumber v) { try { diff --git a/core/src/main/java/hudson/util/VersionNumber.java b/core/src/main/java/hudson/util/VersionNumber.java index cbca0a70ba..f9c7558287 100644 --- a/core/src/main/java/hudson/util/VersionNumber.java +++ b/core/src/main/java/hudson/util/VersionNumber.java @@ -83,7 +83,8 @@ public class VersionNumber implements Comparable { digits[i++] = 1000; } else if(token.startsWith("snapshot")) { - digits[i++] = -1000; // treat like EA + digits[i-1]--; + digits[i++] = 1000; break; } else if(token.startsWith("ea")) { diff --git a/core/src/test/java/hudson/util/VersionNumberTest.java b/core/src/test/java/hudson/util/VersionNumberTest.java index 44a03d544c..39555a032a 100644 --- a/core/src/test/java/hudson/util/VersionNumberTest.java +++ b/core/src/test/java/hudson/util/VersionNumberTest.java @@ -48,6 +48,7 @@ public class VersionNumberTest extends TestCase { public void testSnapshots() { assertTrue(new VersionNumber("1.12").isNewerThan(new VersionNumber("1.12-SNAPSHOT (private-08/24/2008 12:13-hudson)"))); assertTrue(new VersionNumber("1.12-SNAPSHOT (private-08/24/2008 12:13-hudson)").isNewerThan(new VersionNumber("1.11"))); - assertTrue(new VersionNumber("1.12-SNAPSHOT").isNewerThan(new VersionNumber("1.11.*"))); + assertTrue(new VersionNumber("1.12-SNAPSHOT").equals(new VersionNumber("1.11.*"))); + assertTrue(new VersionNumber("1.11.*").isNewerThan(new VersionNumber("1.11.9"))); } } From 67fd5650fbf2aafc072e908b87332e49ffae7e90 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 25 Apr 2009 02:31:56 +0000 Subject: [PATCH 033/220] [maven-release-plugin] prepare release hudson-1_301 git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17497 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 11 ++++------- 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 123d3bd15c..29d00a2ac4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301-SNAPSHOT + 1.301 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 46fc143434..bbac74d6e7 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301-SNAPSHOT + 1.301 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index a82df90395..6cd96fa3dc 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301-SNAPSHOT + 1.301 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 399d0444d9..c0b608044d 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301-SNAPSHOT + 1.301 maven-plugin diff --git a/pom.xml b/pom.xml index b63eb6c065..6480e112d1 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301-SNAPSHOT + 1.301 pom Hudson main module @@ -50,9 +50,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ - scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ - https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main + scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_301 + scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_301 + https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_301 diff --git a/remoting/pom.xml b/remoting/pom.xml index e00e22e1f5..266d7d8066 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301-SNAPSHOT + 1.301 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index bc070b738c..3af50ec99d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.301-SNAPSHOT + 1.301 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 7a22e606a7..1e18e51d16 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301-SNAPSHOT + 1.301 ../pom.xml @@ -106,14 +106,11 @@ THE SOFTWARE. - + - - + + From 3d6ce1bc066c8d5d859377e3d927815ddb119735 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 25 Apr 2009 02:32:05 +0000 Subject: [PATCH 034/220] [maven-release-plugin] prepare for next development iteration git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17499 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 29d00a2ac4..44a74ada7e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301 + 1.302-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index bbac74d6e7..f721f576a8 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301 + 1.302-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 6cd96fa3dc..115abb1eda 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301 + 1.302-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index c0b608044d..5ef7637c83 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301 + 1.302-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 6480e112d1..b8fe035398 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301 + 1.302-SNAPSHOT pom Hudson main module @@ -50,9 +50,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_301 - scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_301 - https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_301 + scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ + scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ + https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main diff --git a/remoting/pom.xml b/remoting/pom.xml index 266d7d8066..dabbdb4323 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301 + 1.302-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 3af50ec99d..848fd108ab 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.301 + 1.302-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 1e18e51d16..97d9a5bbdf 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301 + 1.302-SNAPSHOT ../pom.xml From 8afadd3bc75fbeeddcec40524957c6459430b1ed Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 25 Apr 2009 06:55:10 +0000 Subject: [PATCH 035/220] adding an error check for releasing SNAPSHOT git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17502 71c3de6d-444a-0410-be80-ed276b4c234a --- release.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/release.sh b/release.sh index e455d9e42f..6a9a28b97e 100755 --- a/release.sh +++ b/release.sh @@ -34,11 +34,17 @@ rm hudson.war || true tag=hudson-$(show-pom-version pom.xml | sed -e "s/-SNAPSHOT//g" -e "s/\\./_/g") export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=256m" mvn -B -Dtag=$tag release:prepare || mvn -B -Dtag=$tag install release:prepare || true -svn up -r head -mvn -B -Dtag=$tag -Dresume release:prepare +#svn up -r head +#mvn -B -Dtag=$tag -Dresume release:prepare mvn release:perform id=$(show-pom-version target/checkout/pom.xml) +case $id in +*-SNAPSHOT) + echo Trying to release a SNAPSHOT + exit 1 + ;; +esac #./publish-javadoc.sh javanettasks uploadFile hudson /releases/$id "`date +"%Y/%m/%d"` release" Stable target/checkout/war/target/hudson.war | tee target/war-upload.log warUrl=$(cat target/war-upload.log | grep "^Posted" | sed -e "s/Posted //g") @@ -86,4 +92,4 @@ cat war/target/hudson-war-$id.ipstgz | ssh wsinterop.sun.com "cd ips/repository; ssh wsinterop.sun.com "cd ips; ./start.sh" cd $WWW -svn commit -m "Hudson $id released" changelog.html hudson.jnlp \ No newline at end of file +svn commit -m "Hudson $id released" changelog.html hudson.jnlp From 3e47829ae0f945a096c62568da935905b67251d3 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 25 Apr 2009 07:00:02 +0000 Subject: [PATCH 036/220] rolling back botched 1.301 release git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17505 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- debian/changelog | 6 ++++++ maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 11 +++++++---- 9 files changed, 20 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 44a74ada7e..123d3bd15c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302-SNAPSHOT + 1.301-SNAPSHOT ../pom.xml diff --git a/debian/changelog b/debian/changelog index cb63af1de7..16fa960ead 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.301-SNAPSHOT) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 24 Apr 2009 23:28:48 -0700 + hudson (1.300) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index f721f576a8..46fc143434 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302-SNAPSHOT + 1.301-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 115abb1eda..a82df90395 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302-SNAPSHOT + 1.301-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 5ef7637c83..399d0444d9 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302-SNAPSHOT + 1.301-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index b8fe035398..b63eb6c065 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302-SNAPSHOT + 1.301-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index dabbdb4323..e00e22e1f5 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302-SNAPSHOT + 1.301-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 848fd108ab..bc070b738c 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.302-SNAPSHOT + 1.301-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 97d9a5bbdf..7a22e606a7 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302-SNAPSHOT + 1.301-SNAPSHOT ../pom.xml @@ -106,11 +106,14 @@ THE SOFTWARE. - + - - + + From 60dcfc580278b5a31ed2b291ef76a864f8cc5424 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 25 Apr 2009 07:23:28 +0000 Subject: [PATCH 037/220] [maven-release-plugin] prepare release hudson-1_301 git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17506 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 11 ++++------- 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 123d3bd15c..29d00a2ac4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301-SNAPSHOT + 1.301 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 46fc143434..bbac74d6e7 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301-SNAPSHOT + 1.301 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index a82df90395..6cd96fa3dc 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301-SNAPSHOT + 1.301 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 399d0444d9..c0b608044d 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301-SNAPSHOT + 1.301 maven-plugin diff --git a/pom.xml b/pom.xml index b63eb6c065..6480e112d1 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301-SNAPSHOT + 1.301 pom Hudson main module @@ -50,9 +50,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ - scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ - https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main + scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_301 + scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_301 + https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_301 diff --git a/remoting/pom.xml b/remoting/pom.xml index e00e22e1f5..266d7d8066 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301-SNAPSHOT + 1.301 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index bc070b738c..3af50ec99d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.301-SNAPSHOT + 1.301 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 7a22e606a7..1e18e51d16 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301-SNAPSHOT + 1.301 ../pom.xml @@ -106,14 +106,11 @@ THE SOFTWARE. - + - - + + From da2628e9fb089723c6a2050d067ab46fa033fbcc Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 25 Apr 2009 07:23:42 +0000 Subject: [PATCH 038/220] [maven-release-plugin] prepare for next development iteration git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17508 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 29d00a2ac4..44a74ada7e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301 + 1.302-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index bbac74d6e7..f721f576a8 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301 + 1.302-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 6cd96fa3dc..115abb1eda 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301 + 1.302-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index c0b608044d..5ef7637c83 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301 + 1.302-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 6480e112d1..b8fe035398 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301 + 1.302-SNAPSHOT pom Hudson main module @@ -50,9 +50,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_301 - scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_301 - https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_301 + scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ + scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ + https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main diff --git a/remoting/pom.xml b/remoting/pom.xml index 266d7d8066..dabbdb4323 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301 + 1.302-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 3af50ec99d..848fd108ab 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.301 + 1.302-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 1e18e51d16..97d9a5bbdf 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.301 + 1.302-SNAPSHOT ../pom.xml From 3f9a6308eeade6548b1765794e69bc24fe2764b0 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 25 Apr 2009 09:24:08 +0000 Subject: [PATCH 039/220] updated changelog as a part of the release git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17515 71c3de6d-444a-0410-be80-ed276b4c234a --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 16fa960ead..02614db212 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.301) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Sat, 25 Apr 2009 02:25:17 -0700 + hudson (1.301-SNAPSHOT) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. From 44a97d5a1f3323b807e12551bff4c9b73528d4dc Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 1 May 2009 01:33:18 +0000 Subject: [PATCH 040/220] [FIXED HUDSON-2154] Applied a patch. Thanks for the great detective workpaste | patch -p1 git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17646 71c3de6d-444a-0410-be80-ed276b4c234a --- remoting/src/main/java/hudson/remoting/Pipe.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/remoting/src/main/java/hudson/remoting/Pipe.java b/remoting/src/main/java/hudson/remoting/Pipe.java index 019ffc8eaf..a6d184b54c 100644 --- a/remoting/src/main/java/hudson/remoting/Pipe.java +++ b/remoting/src/main/java/hudson/remoting/Pipe.java @@ -153,13 +153,14 @@ public final class Pipe implements Serializable { // we want 'oidRos' to send data to this PipedOutputStream PipedOutputStream pos = new PipedOutputStream(); + PipedInputStream pis = new PipedInputStream(pos); final int oidPos = channel.export(pos); // tell 'ros' to connect to our 'pos'. channel.send(new ConnectCommand(oidRos, oidPos)); out = null; - in = new PipedInputStream(pos); + in = pis; } } From f3b1920f3039787552540ea4e5b1d01a3ba940df Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 2 May 2009 01:24:24 +0000 Subject: [PATCH 041/220] multiple test exuections slow down a release. Let's do it just once during release:perform and be done with it git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17673 71c3de6d-444a-0410-be80-ed276b4c234a --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index 6a9a28b97e..5ae191c331 100755 --- a/release.sh +++ b/release.sh @@ -33,7 +33,7 @@ rm hudson.war || true tag=hudson-$(show-pom-version pom.xml | sed -e "s/-SNAPSHOT//g" -e "s/\\./_/g") export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=256m" -mvn -B -Dtag=$tag release:prepare || mvn -B -Dtag=$tag install release:prepare || true +mvn -B -Dtag=$tag -DskipTests release:prepare || mvn -B -Dtag=$tag -DskipTests install release:prepare || true #svn up -r head #mvn -B -Dtag=$tag -Dresume release:prepare mvn release:perform From f7b16543aaa35ab422dcacb3942c743eb93f5767 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 2 May 2009 01:25:37 +0000 Subject: [PATCH 042/220] this causes JVM crash on Ubuntu, preventing a reliable release git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17674 71c3de6d-444a-0410-be80-ed276b4c234a --- test/src/test/java/hudson/slaves/JNLPLauncherTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/src/test/java/hudson/slaves/JNLPLauncherTest.java b/test/src/test/java/hudson/slaves/JNLPLauncherTest.java index 9f9dcd5bad..d49747bf20 100644 --- a/test/src/test/java/hudson/slaves/JNLPLauncherTest.java +++ b/test/src/test/java/hudson/slaves/JNLPLauncherTest.java @@ -51,9 +51,7 @@ public class JNLPLauncherTest extends HudsonTestCase { * Starts a JNLP slave agent and makes sure it successfully connects to Hudson. */ public void testLaunch() throws Exception { - try { - GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(); - } catch (HeadlessException e) { + if(GraphicsEnvironment.isHeadless()) { System.err.println("Skipping JNLPLauncherTest.testLaunch because we are running headless"); return; } From 57c2e93da321c922e73d0d0317554360be600b6d Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 2 May 2009 01:27:09 +0000 Subject: [PATCH 043/220] releases come from the RC branch now git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17675 71c3de6d-444a-0410-be80-ed276b4c234a --- pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b2ecf3cced..d7a0eb48d0 100644 --- a/pom.xml +++ b/pom.xml @@ -51,9 +51,10 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/ - scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/ - https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main + + scm:svn:https://guest@svn.dev.java.net/svn/hudson/branches/rc/ + scm:svn:https://svn.dev.java.net/svn/hudson/branches/rc/ + https://hudson.dev.java.net/source/browse/hudson/branches/rc/ @@ -102,7 +103,7 @@ THE SOFTWARE. also run assembly during the release. http://www.nabble.com/Release-Plugin%3A-Include-assemblies-for-deploying-tf2642295s177.html#a7377938 --> - install javadoc:javadoc animal-sniffer:check assembly:attached deploy + -DskipTests install javadoc:javadoc animal-sniffer:check assembly:attached deploy true From 12137452abdcb29dd502a1f92f30f3fa5b5e61b1 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 2 May 2009 01:46:39 +0000 Subject: [PATCH 044/220] [maven-release-plugin] prepare release hudson-1_302 git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17676 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 4 ++-- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 6 ++---- 9 files changed, 14 insertions(+), 16 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 8e0e4f3d3d..8b089679b1 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -1,10 +1,10 @@ - + 4.0.0 pom org.jvnet.hudson.main - 1.302-SNAPSHOT + 1.302 cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 4cad5c4d42..0b045eef29 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302-SNAPSHOT + 1.302 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index f721f576a8..dbbf88e8ec 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302-SNAPSHOT + 1.302 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 115abb1eda..fa883a6ff4 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302-SNAPSHOT + 1.302 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 5ef7637c83..1d37f2f031 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302-SNAPSHOT + 1.302 maven-plugin diff --git a/pom.xml b/pom.xml index d7a0eb48d0..15afd123a6 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302-SNAPSHOT + 1.302 pom Hudson main module @@ -52,9 +52,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/branches/rc/ - scm:svn:https://svn.dev.java.net/svn/hudson/branches/rc/ - https://hudson.dev.java.net/source/browse/hudson/branches/rc/ + scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_302 + scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_302 + https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_302 diff --git a/remoting/pom.xml b/remoting/pom.xml index dabbdb4323..d4c15d7ccd 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302-SNAPSHOT + 1.302 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 848fd108ab..bdd4d3066b 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.302-SNAPSHOT + 1.302 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 63c1de8dcb..4c7bea6e10 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302-SNAPSHOT + 1.302 ../pom.xml @@ -106,9 +106,7 @@ THE SOFTWARE. - + From 90462d655140435c64bb1f3e99e38de5eadab1a8 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 2 May 2009 01:46:47 +0000 Subject: [PATCH 045/220] [maven-release-plugin] prepare for next development iteration git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17678 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 8b089679b1..f604a0bc74 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.302 + 1.303-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 0b045eef29..b7d834e3e0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302 + 1.303-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index dbbf88e8ec..57d41f0a8f 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302 + 1.303-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index fa883a6ff4..47e4ec02fe 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302 + 1.303-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 1d37f2f031..61f0b48518 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302 + 1.303-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 15afd123a6..3d9c35001b 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302 + 1.303-SNAPSHOT pom Hudson main module @@ -52,9 +52,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_302 - scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_302 - https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_302 + scm:svn:https://guest@svn.dev.java.net/svn/hudson/branches/rc/ + scm:svn:https://svn.dev.java.net/svn/hudson/branches/rc/ + https://hudson.dev.java.net/source/browse/hudson/branches/rc/ diff --git a/remoting/pom.xml b/remoting/pom.xml index d4c15d7ccd..f182213f8f 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302 + 1.303-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index bdd4d3066b..fa1ab10a49 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.302 + 1.303-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 4c7bea6e10..380a067385 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.302 + 1.303-SNAPSHOT ../pom.xml From 28783c77126e4360833ced584317b579b84318d3 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 2 May 2009 02:14:17 +0000 Subject: [PATCH 046/220] updated changelog as a part of the release git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17681 71c3de6d-444a-0410-be80-ed276b4c234a --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 02614db212..7c070f3048 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.302) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 01 May 2009 19:15:31 -0700 + hudson (1.301) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. From 76af1ff4290a2a5a17f4dd942ceb84ac360cd891 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sun, 3 May 2009 21:52:38 +0000 Subject: [PATCH 047/220] Initialized merge tracking via "svnmerge" with revisions "1-17626" from https://www.dev.java.net/svn/hudson/trunk/hudson/main git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17689 71c3de6d-444a-0410-be80-ed276b4c234a From d8c5be9b83e2df4d1fe18d60bcb091a0911e446c Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sun, 3 May 2009 21:54:06 +0000 Subject: [PATCH 048/220] Merged revisions 17687 via svnmerge from https://www.dev.java.net/svn/hudson/trunk/hudson/main ........ r17687 | mdonohue | 2009-05-02 12:40:20 -0700 (Sat, 02 May 2009) | 3 lines readd the AbstractBuild constructor for UpstreamCause to maintain bytecode compatibility ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17690 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Cause.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/main/java/hudson/model/Cause.java b/core/src/main/java/hudson/model/Cause.java index aecdbf3f9d..cfd6c1a532 100644 --- a/core/src/main/java/hudson/model/Cause.java +++ b/core/src/main/java/hudson/model/Cause.java @@ -61,6 +61,11 @@ public abstract class Cause { private transient Cause upstreamCause; private List upstreamCauses = new ArrayList(); + // for backward bytecode compatibility + public UpstreamCause(AbstractBuild up) { + this((Run)up); + } + public UpstreamCause(Run up) { upstreamBuild = up.getNumber(); upstreamProject = up.getParent().getName(); From 16495710b8704f1baee1aaba1370b7724ba98b04 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sun, 3 May 2009 22:12:22 +0000 Subject: [PATCH 049/220] needs to redirect "println" to CLI git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17691 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/cli/GroovyshCommand.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/src/main/java/hudson/cli/GroovyshCommand.java b/core/src/main/java/hudson/cli/GroovyshCommand.java index e8d7e09384..6672fcf5aa 100644 --- a/core/src/main/java/hudson/cli/GroovyshCommand.java +++ b/core/src/main/java/hudson/cli/GroovyshCommand.java @@ -9,6 +9,7 @@ import java.util.List; import java.io.PrintStream; import java.io.InputStream; import java.io.BufferedInputStream; +import java.io.PrintWriter; import jline.UnsupportedTerminal; import jline.Terminal; @@ -35,6 +36,8 @@ public class GroovyshCommand extends CLICommand { Terminal.resetTerminal(); Groovysh shell = new Groovysh(new IO(new BufferedInputStream(stdin),stdout,stderr)); + // redirect "println" to the CLI + shell.getInterp().getContext().setProperty("out",new PrintWriter(stdout,true)); return shell.run(args.toArray(new String[args.size()])); } From d5d05d08aadbef360a9aec5a02f52845b2bc81db Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sun, 3 May 2009 22:22:53 +0000 Subject: [PATCH 050/220] [maven-release-plugin] prepare release hudson-1_303 git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17693 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index f604a0bc74..cb26632962 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.303-SNAPSHOT + 1.303 cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index b7d834e3e0..8c8e5641ba 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.303-SNAPSHOT + 1.303 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 57d41f0a8f..dd26322aa7 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.303-SNAPSHOT + 1.303 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 47e4ec02fe..032e31e017 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.303-SNAPSHOT + 1.303 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 61f0b48518..454598d90f 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.303-SNAPSHOT + 1.303 maven-plugin diff --git a/pom.xml b/pom.xml index 3d9c35001b..fd6fcc5bb6 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.303-SNAPSHOT + 1.303 pom Hudson main module @@ -52,9 +52,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/branches/rc/ - scm:svn:https://svn.dev.java.net/svn/hudson/branches/rc/ - https://hudson.dev.java.net/source/browse/hudson/branches/rc/ + scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_303 + scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_303 + https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_303 diff --git a/remoting/pom.xml b/remoting/pom.xml index f182213f8f..841653630d 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.303-SNAPSHOT + 1.303 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index fa1ab10a49..ca189e91d2 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.303-SNAPSHOT + 1.303 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 380a067385..ca4288c940 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.303-SNAPSHOT + 1.303 ../pom.xml From a802e2a77183601fe1920347fdf2339e1ac9dba3 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sun, 3 May 2009 22:23:01 +0000 Subject: [PATCH 051/220] [maven-release-plugin] prepare for next development iteration git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17695 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index cb26632962..d183e8c7dc 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.303 + 1.304-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 8c8e5641ba..3f1739cee8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.303 + 1.304-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index dd26322aa7..6cf8c01993 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.303 + 1.304-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 032e31e017..ce87c2f53a 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.303 + 1.304-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 454598d90f..f8b2a85734 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.303 + 1.304-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index fd6fcc5bb6..d9a6b3a85d 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.303 + 1.304-SNAPSHOT pom Hudson main module @@ -52,9 +52,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_303 - scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_303 - https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_303 + scm:svn:https://guest@svn.dev.java.net/svn/hudson/branches/rc/ + scm:svn:https://svn.dev.java.net/svn/hudson/branches/rc/ + https://hudson.dev.java.net/source/browse/hudson/branches/rc/ diff --git a/remoting/pom.xml b/remoting/pom.xml index 841653630d..1e54dad4ab 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.303 + 1.304-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index ca189e91d2..49d41eb286 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.303 + 1.304-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index ca4288c940..e2f7bc6a12 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.303 + 1.304-SNAPSHOT ../pom.xml From 44788965111d25e294e4f318d3fb5e98502578c5 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sun, 3 May 2009 22:47:23 +0000 Subject: [PATCH 052/220] updated changelog as a part of the release git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17698 71c3de6d-444a-0410-be80-ed276b4c234a --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7c070f3048..368b82265f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.303) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Sun, 03 May 2009 15:48:44 -0700 + hudson (1.302) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. From 70525d3cc87bf55173bc6105a8ccada9a5a8349a Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 7 May 2009 16:07:06 +0000 Subject: [PATCH 053/220] rolling back to 0.4 to get a clean stable build until we receive 0.5.1 in an hour or so git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17827 71c3de6d-444a-0410-be80-ed276b4c234a --- war/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/war/pom.xml b/war/pom.xml index d24557719e..e3b958296d 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -111,7 +111,7 @@ THE SOFTWARE. - + From 39e442a1b610d14370fb013feaa19e8a9b914a8b Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 8 May 2009 22:32:34 +0000 Subject: [PATCH 054/220] Initialized merge tracking via "svnmerge" with revisions "1-17816" from https://www.dev.java.net/svn/hudson/trunk/hudson/main git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17881 71c3de6d-444a-0410-be80-ed276b4c234a From c1f2b83e16a91c70152e0c4dc6920d21b5639604 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 8 May 2009 22:33:22 +0000 Subject: [PATCH 055/220] Merged revisions 17876 via svnmerge from https://www.dev.java.net/svn/hudson/trunk/hudson/main ........ r17876 | kaxelson | 2009-05-08 14:19:59 -0700 (Fri, 08 May 2009) | 3 lines HUDSON-3580: Rolled back changes merge -r17550:17549 ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17882 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/scm/SubversionSCM.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/scm/SubversionSCM.java b/core/src/main/java/hudson/scm/SubversionSCM.java index 1071f00d53..073272e593 100644 --- a/core/src/main/java/hudson/scm/SubversionSCM.java +++ b/core/src/main/java/hudson/scm/SubversionSCM.java @@ -530,6 +530,8 @@ public class SubversionSCM extends SCM implements Serializable { } } } else { + Util.deleteContentsRecursive(ws); + // buffer the output by a separate thread so that the update operation // won't be blocked by the remoting of the data PipedOutputStream pos = new PipedOutputStream(); @@ -541,7 +543,6 @@ public class SubversionSCM extends SCM implements Serializable { listener.getLogger().println("Checking out "+l.remote); File local = new File(ws, l.local); - Util.deleteContentsRecursive(local); svnuc.setEventHandler(new SubversionUpdateEventHandler(new PrintStream(pos), externals, local, l.local)); svnuc.doCheckout(l.getSVNURL(), local.getCanonicalFile(), SVNRevision.HEAD, l.getRevision(revision), true); } catch (SVNException e) { @@ -827,7 +828,7 @@ public class SubversionSCM extends SCM implements Serializable { File module = new File(ws,moduleName).getCanonicalFile(); // canonicalize to remove ".." and ".". See #474 if(!module.exists()) { - listener.getLogger().println("Doing a fresh checkout because "+module+" doesn't exist"); + listener.getLogger().println("Checking out a fresh workspace because "+module+" doesn't exist"); return false; } @@ -837,11 +838,11 @@ public class SubversionSCM extends SCM implements Serializable { String url = l.getURL(); if(!svnInfo.url.equals(url)) { - listener.getLogger().println("Doing a fresh checkout because the checkout location is not "+url); + listener.getLogger().println("Checking out a fresh workspace because the workspace is not "+url); return false; } } catch (SVNException e) { - listener.getLogger().println("Doing a fresh checkout because Hudson failed to detect the current checkout location "+module); + listener.getLogger().println("Checking out a fresh workspace because Hudson failed to detect the current workspace "+module); e.printStackTrace(listener.error(e.getMessage())); return false; } From bc7e99403745a806fc088825566d7e67b9546259 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 9 May 2009 00:48:39 +0000 Subject: [PATCH 056/220] [maven-release-plugin] prepare release hudson-1_304 git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17887 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index d183e8c7dc..414a56aa9d 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.304-SNAPSHOT + 1.304 cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 3f1739cee8..c8f4f0c4d6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.304-SNAPSHOT + 1.304 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 6cf8c01993..b3d0905f2f 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.304-SNAPSHOT + 1.304 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index ce87c2f53a..a5316388be 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.304-SNAPSHOT + 1.304 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index f8b2a85734..baeeaeb79e 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.304-SNAPSHOT + 1.304 maven-plugin diff --git a/pom.xml b/pom.xml index d9a6b3a85d..fadd789aef 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.304-SNAPSHOT + 1.304 pom Hudson main module @@ -52,9 +52,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/branches/rc/ - scm:svn:https://svn.dev.java.net/svn/hudson/branches/rc/ - https://hudson.dev.java.net/source/browse/hudson/branches/rc/ + scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_304 + scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_304 + https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_304 diff --git a/remoting/pom.xml b/remoting/pom.xml index 1e54dad4ab..14e00d41c2 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.304-SNAPSHOT + 1.304 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 49d41eb286..a573c0d3fe 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.304-SNAPSHOT + 1.304 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index e3b958296d..07e2960554 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.304-SNAPSHOT + 1.304 ../pom.xml From 16d8b383e59f88a27962b787ca0db25462befb34 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 9 May 2009 00:48:57 +0000 Subject: [PATCH 057/220] [maven-release-plugin] prepare for next development iteration git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17889 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 414a56aa9d..d1b6aaa8e2 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.304 + 1.305-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index c8f4f0c4d6..67ac1a8070 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.304 + 1.305-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index b3d0905f2f..2b37facda6 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.304 + 1.305-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index a5316388be..1e937abe76 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.304 + 1.305-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index baeeaeb79e..8acfb7df03 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.304 + 1.305-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index fadd789aef..ffb72448f1 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.304 + 1.305-SNAPSHOT pom Hudson main module @@ -52,9 +52,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_304 - scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_304 - https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_304 + scm:svn:https://guest@svn.dev.java.net/svn/hudson/branches/rc/ + scm:svn:https://svn.dev.java.net/svn/hudson/branches/rc/ + https://hudson.dev.java.net/source/browse/hudson/branches/rc/ diff --git a/remoting/pom.xml b/remoting/pom.xml index 14e00d41c2..9ee8ba0097 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.304 + 1.305-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index a573c0d3fe..245e4c3778 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.304 + 1.305-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 07e2960554..e06ceb8a05 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.304 + 1.305-SNAPSHOT ../pom.xml From ba87adfc3728f42f674b552224298dba4a3d2d6f Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 9 May 2009 01:16:53 +0000 Subject: [PATCH 058/220] updated changelog as a part of the release git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@17893 71c3de6d-444a-0410-be80-ed276b4c234a --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 368b82265f..f603d7651c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.304) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 08 May 2009 18:18:06 -0700 + hudson (1.303) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. From eedfe7c5c27257462ad22ac3c0c1b9312d3b6a78 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 14 May 2009 02:17:29 +0000 Subject: [PATCH 059/220] Initialized merge tracking via "svnmerge" with revisions "1-18069" from https://www.dev.java.net/svn/hudson/trunk/hudson/main git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@18078 71c3de6d-444a-0410-be80-ed276b4c234a From c4ea15b07f072f1ec336bca46edaa174b5ae9733 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 14 May 2009 02:18:52 +0000 Subject: [PATCH 060/220] Merged revisions 18077 via svnmerge from https://www.dev.java.net/svn/hudson/trunk/hudson/main ........ r18077 | kohsuke | 2009-05-13 19:10:11 -0700 (Wed, 13 May 2009) | 1 line [FIXED HUDSON-3497] Maven generated site results in 404 because Stapler didn't recognize doDynamic(void) ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@18079 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 11 +---------- .../java/hudson/maven/MavenProjectTest.java | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 4009b10483..1ec896118b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -331,7 +331,7 @@ THE SOFTWARE. org.kohsuke.stapler stapler-jelly - 1.103 + 1.104 dom4j @@ -345,17 +345,8 @@ THE SOFTWARE. commons-jexl commons-jexl - - org.kohsuke.stapler - json-lib - - - org.kohsuke.stapler - json-lib - 2.1-rev2 - args4j args4j diff --git a/test/src/test/java/hudson/maven/MavenProjectTest.java b/test/src/test/java/hudson/maven/MavenProjectTest.java index fd1d661930..e991fede69 100755 --- a/test/src/test/java/hudson/maven/MavenProjectTest.java +++ b/test/src/test/java/hudson/maven/MavenProjectTest.java @@ -24,12 +24,16 @@ package hudson.maven; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import hudson.model.Descriptor; import hudson.tasks.ArtifactArchiver; import hudson.tasks.Maven.MavenInstallation; import org.jvnet.hudson.test.ExtractResourceSCM; import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.Bug; +import org.xml.sax.SAXException; + +import java.io.IOException; /** * @author huybrechts @@ -74,13 +78,23 @@ public class MavenProjectTest extends HudsonTestCase { } /** - * Attempt to reproduce #2154, but this appears to work. + * Check if the generated site is linked correctly. */ - @Bug(2154) + @Bug(3497) public void testSiteBuild() throws Exception { MavenModuleSet project = createSimpleProject(); project.setGoals("site"); assertBuildStatusSuccess(project.scheduleBuild2(0).get()); + + // this should succeed + HudsonTestCase.WebClient wc = new WebClient(); + wc.getPage(project,"site"); + try { + wc.getPage(project,"site/no-such-file"); + fail("should have resulted in 404"); + } catch (FailingHttpStatusCodeException e) { + assertEquals(404,e.getStatusCode()); + } } } From a98365d33143f2ba8042bd15e28dbecc08604d03 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 14 May 2009 17:05:16 +0000 Subject: [PATCH 061/220] [HUDSON-3684] In 1.305 I improved error diagnostics to show why the loading of Winp failed, so please try that and report back the new error message you get. git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@18093 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/util/ProcessTreeKiller.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/util/ProcessTreeKiller.java b/core/src/main/java/hudson/util/ProcessTreeKiller.java index 264883ce23..2db7d74994 100644 --- a/core/src/main/java/hudson/util/ProcessTreeKiller.java +++ b/core/src/main/java/hudson/util/ProcessTreeKiller.java @@ -128,17 +128,17 @@ public abstract class ProcessTreeKiller { try { if(File.pathSeparatorChar==';') - return new Windows(); + return new Windows(); String os = Util.fixNull(System.getProperty("os.name")); if(os.equals("Linux")) - return new Linux(); + return new Linux(); if(os.equals("SunOS")) - return new Solaris(); + return new Solaris(); if(os.equals("Mac OS X")) return new Darwin(); } catch (LinkageError e) { - LOGGER.warning("Failed to load winp. Reverting to the default"); + LOGGER.log(Level.WARNING,"Failed to load winp. Reverting to the default",e); enabled = false; } From b91ce827d557bfb39500f9d699f606963ec98c95 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 14 May 2009 17:28:33 +0000 Subject: [PATCH 062/220] fixed a typo as pointed out by Jesse, so that this change can make it into 1.305. git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@18094 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/slaves/NodeDescriptor.java | 6 +++--- core/src/main/resources/hudson/model/ComputerSet/new.jelly | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/slaves/NodeDescriptor.java b/core/src/main/java/hudson/slaves/NodeDescriptor.java index 76d10ededa..2489a32a9c 100644 --- a/core/src/main/java/hudson/slaves/NodeDescriptor.java +++ b/core/src/main/java/hudson/slaves/NodeDescriptor.java @@ -63,7 +63,7 @@ public abstract class NodeDescriptor extends Descriptor { * * Return false if it only makes sense for programs to create it, not through the "new node" UI. */ - public boolean isInstanciable() { + public boolean isInstantiable() { return true; } @@ -97,10 +97,10 @@ public abstract class NodeDescriptor extends Descriptor { */ public static final DescriptorList ALL = new DescriptorList(Node.class); - public static List allInstanciable() { + public static List allInstantiable() { List r = new ArrayList(); for (NodeDescriptor d : all()) - if(d.isInstanciable()) + if(d.isInstantiable()) r.add(d); return r; } diff --git a/core/src/main/resources/hudson/model/ComputerSet/new.jelly b/core/src/main/resources/hudson/model/ComputerSet/new.jelly index 7150ce49e6..a90c38af8f 100644 --- a/core/src/main/resources/hudson/model/ComputerSet/new.jelly +++ b/core/src/main/resources/hudson/model/ComputerSet/new.jelly @@ -33,7 +33,7 @@ THE SOFTWARE. - + From 3ba9958c80bd990c2b165f61732157142ca3e788 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 15 May 2009 21:16:59 +0000 Subject: [PATCH 063/220] marking the file for interception only git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@18125 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/resources/META-INF/plexus/components.xml.interception | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 maven-interceptor/src/main/resources/META-INF/plexus/components.xml.interception diff --git a/maven-interceptor/src/main/resources/META-INF/plexus/components.xml.interception b/maven-interceptor/src/main/resources/META-INF/plexus/components.xml.interception new file mode 100644 index 0000000000..d240bb1afa --- /dev/null +++ b/maven-interceptor/src/main/resources/META-INF/plexus/components.xml.interception @@ -0,0 +1,2 @@ +This file marks components.xml as "interceptor only", so that +Maven embedder won't pick it up. \ No newline at end of file From e7e3697148e6dd12acfa88eeb9817db89a4f5282 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 15 May 2009 21:23:03 +0000 Subject: [PATCH 064/220] Investigation of the test failures of Hudson on Hudson revealed that the plxus/components.xml of maven-interceptor and maven2.1-interceptor are picked up in the MavenEmbedder while parsing POM, which breaks Maven 2.0.7 (that is, I needed to run the tests on Maven 2.0.7 to reproduce the problem.) So I'm adding the marker file so that our MaskedClassLoader can hide them from Plexus when we start MavenEmbedder. I hate making this kind of change in the RC branch, and this problem doesn't appear to affect my RC deployment so far (so maybe this only reproduces when we run Hudson inside Maven), but OTOH this should be a fairly low risk change. git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@18126 71c3de6d-444a-0410-be80-ed276b4c234a --- maven-plugin/pom.xml | 2 +- .../src/main/java/hudson/maven/MavenUtil.java | 31 +++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 91886589f7..e5e50fd691 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -58,7 +58,7 @@ THE SOFTWARE. org.jvnet.hudson maven2.1-interceptor - 1.0 + 1.1 org.apache.maven diff --git a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java index 26032892ae..6117ed6eb3 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java @@ -33,6 +33,7 @@ import org.apache.maven.embedder.MavenEmbedderException; import org.apache.maven.embedder.MavenEmbedderLogger; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingException; +import org.apache.commons.io.IOUtils; import java.io.File; import java.io.IOException; @@ -42,6 +43,7 @@ import java.util.Enumeration; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.logging.Logger; /** * @author Kohsuke Kawaguchi @@ -49,7 +51,7 @@ import java.util.Properties; public class MavenUtil { /** * @deprecated - * Use {@link MavenInstallation#createEmbedder(BuildListener, String, Properties)} + * Use {@link #createEmbedder(TaskListener, File, String, Properties)} * or other overloaded versions that infers maven home. */ public static MavenEmbedder createEmbedder(TaskListener listener, String profiles) throws MavenEmbedderException, IOException { @@ -95,6 +97,13 @@ public class MavenUtil { if(debugMavenEmbedder) logger.setThreshold(MavenEmbedderLogger.LEVEL_DEBUG); maven.setLogger(logger); + { + Enumeration e = cl.getResources("META-INF/plexus/components.xml"); + while (e.hasMoreElements()) { + URL url = e.nextElement(); + LOGGER.fine("components.xml from "+url); + } + } // make sure ~/.m2 exists to avoid http://www.nabble.com/BUG-Report-tf3401736.html File m2Home = new File(MavenEmbedder.userHome, ".m2"); m2Home.mkdirs(); @@ -188,10 +197,26 @@ public class MavenUtil { private void fetch() { while(next==null && e.hasMoreElements()) { next = e.nextElement(); - if(next.toExternalForm().contains("maven-plugin-tools-api")) + if(shouldBeIgnored(next)) next = null; } } + + private boolean shouldBeIgnored(URL url) { + String s = url.toExternalForm(); + if(s.contains("maven-plugin-tools-api")) + return true; + if(s.endsWith("plexus/components.xml")) { + try { + // is this designated for interception purpose? If so, don't load them in the MavenEmbedder + IOUtils.closeQuietly(new URL(s + ".interception").openStream()); + return true; + } catch (IOException _) { + // no such resource exists + } + } + return false; + } }; } } @@ -200,4 +225,6 @@ public class MavenUtil { * If set to true, maximize the logging level of Maven embedder. */ public static boolean debugMavenEmbedder = false; + + private static final Logger LOGGER = Logger.getLogger(MavenUtil.class.getName()); } From bff51eef807995a37b197cce40809e03b5625e24 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 16 May 2009 01:00:34 +0000 Subject: [PATCH 065/220] documenting what this is git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@18134 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/DownloadService.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java index 5aa247ab9e..a67f914344 100644 --- a/core/src/main/java/hudson/model/DownloadService.java +++ b/core/src/main/java/hudson/model/DownloadService.java @@ -66,6 +66,15 @@ public class DownloadService extends PageDecorator { return null; } + /** + * Represents a periodically updated JSON data file obtained from a remote URL. + * + *

+ * This meachanism is one of the basis of the update center, which involves in fetching + * up-to-date data file. + * + * @since 1.305 + */ public static abstract class Downloadable implements ExtensionPoint { private final String id; private final String url; From ed1195af2a757c220c29e95092e2a4253b44c64c Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 16 May 2009 01:11:34 +0000 Subject: [PATCH 066/220] [maven-release-plugin] prepare release hudson-1_305 git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@18137 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index d1b6aaa8e2..9b18b70659 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.305-SNAPSHOT + 1.305 cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 1ec896118b..85d85991f3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305-SNAPSHOT + 1.305 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 2b37facda6..1ca10ede74 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305-SNAPSHOT + 1.305 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 1e937abe76..2bf7425512 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305-SNAPSHOT + 1.305 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index e5e50fd691..1b0192bae0 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305-SNAPSHOT + 1.305 maven-plugin diff --git a/pom.xml b/pom.xml index ffb72448f1..c2ed8816dd 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305-SNAPSHOT + 1.305 pom Hudson main module @@ -52,9 +52,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/branches/rc/ - scm:svn:https://svn.dev.java.net/svn/hudson/branches/rc/ - https://hudson.dev.java.net/source/browse/hudson/branches/rc/ + scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_305 + scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_305 + https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_305 diff --git a/remoting/pom.xml b/remoting/pom.xml index 9ee8ba0097..cb42bbe9d6 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305-SNAPSHOT + 1.305 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 1111d20d41..b253dd6b10 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.305-SNAPSHOT + 1.305 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 0b89b0e567..5451ba90e6 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305-SNAPSHOT + 1.305 ../pom.xml From 2d670b4913fc9bbec24a3b9b4810fe11adc9a217 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 16 May 2009 01:11:54 +0000 Subject: [PATCH 067/220] [maven-release-plugin] prepare for next development iteration git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@18139 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 9b18b70659..181de72335 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.305 + 1.306-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 85d85991f3..8ee9bcc0dc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305 + 1.306-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 1ca10ede74..deaba98b98 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305 + 1.306-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 2bf7425512..a84f6f9cd3 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305 + 1.306-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 1b0192bae0..37987189b3 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305 + 1.306-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index c2ed8816dd..07de79d1f2 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305 + 1.306-SNAPSHOT pom Hudson main module @@ -52,9 +52,9 @@ THE SOFTWARE. - scm:svn:https://guest@svn.dev.java.net/svn/hudson/tags/hudson-1_305 - scm:svn:https://svn.dev.java.net/svn/hudson/tags/hudson-1_305 - https://hudson.dev.java.net/source/browse/hudson/tags/hudson-1_305 + scm:svn:https://guest@svn.dev.java.net/svn/hudson/branches/rc/ + scm:svn:https://svn.dev.java.net/svn/hudson/branches/rc/ + https://hudson.dev.java.net/source/browse/hudson/branches/rc/ diff --git a/remoting/pom.xml b/remoting/pom.xml index cb42bbe9d6..535211d19a 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305 + 1.306-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index b253dd6b10..29c642fd64 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.305 + 1.306-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 5451ba90e6..32101e0641 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305 + 1.306-SNAPSHOT ../pom.xml From 7da580e86ea89308603754d517ce0e2b95ee96ca Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 16 May 2009 01:31:07 +0000 Subject: [PATCH 068/220] making the code work with JDK1.5, too. git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@18141 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/tools/ZipExtractionInstaller.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/tools/ZipExtractionInstaller.java b/core/src/main/java/hudson/tools/ZipExtractionInstaller.java index b2dbd58d85..e40a1d16b5 100644 --- a/core/src/main/java/hudson/tools/ZipExtractionInstaller.java +++ b/core/src/main/java/hudson/tools/ZipExtractionInstaller.java @@ -28,10 +28,14 @@ import hudson.Extension; import hudson.FilePath; import hudson.FilePath.FileCallable; import hudson.Util; +import hudson.Functions; import hudson.model.Node; import hudson.model.TaskListener; +import hudson.model.Hudson; import hudson.remoting.VirtualChannel; import hudson.util.FormValidation; +import hudson.util.jna.GNUCLibrary; + import java.io.File; import java.io.IOException; import java.net.HttpURLConnection; @@ -40,6 +44,7 @@ import java.net.URL; import java.net.URLConnection; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.QueryParameter; +import org.jvnet.animal_sniffer.IgnoreJRERequirement; /** * Installs a tool into the Hudson working area by downloading and unpacking a ZIP file. @@ -116,12 +121,17 @@ public class ZipExtractionInstaller extends ToolInstaller { private static class ChmodRecAPlusX implements FileCallable { private static final long serialVersionUID = 1L; public Void invoke(File d, VirtualChannel channel) throws IOException { - process(d); + if(!Hudson.isWindows()) + process(d); return null; } + @IgnoreJRERequirement private void process(File f) { if (f.isFile()) { - f.setExecutable(true, false); // XXX JDK 6-specific + if(Functions.isMustangOrAbove()) + f.setExecutable(true, false); + else + GNUCLibrary.LIBC.chmod(f.getAbsolutePath(),0755); } else { File[] kids = f.listFiles(); if (kids != null) { From f866fbeac0f90fbfdeed3746e06f42a860c2561d Mon Sep 17 00:00:00 2001 From: Tom Huybrechts Date: Tue, 23 Feb 2010 21:46:58 +0100 Subject: [PATCH 069/220] add node name to exception logs --- core/src/main/java/hudson/TcpSlaveAgentListener.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/TcpSlaveAgentListener.java b/core/src/main/java/hudson/TcpSlaveAgentListener.java index f526f4c262..c991ddd331 100644 --- a/core/src/main/java/hudson/TcpSlaveAgentListener.java +++ b/core/src/main/java/hudson/TcpSlaveAgentListener.java @@ -212,7 +212,7 @@ public final class TcpSlaveAgentListener extends Thread { return; } - String nodeName = in.readUTF(); + final String nodeName = in.readUTF(); SlaveComputer computer = (SlaveComputer) Hudson.getInstance().getComputer(nodeName); if(computer==null) { error(out, "No such slave: "+nodeName); @@ -241,7 +241,7 @@ public final class TcpSlaveAgentListener extends Thread { e.printStackTrace(); } if(cause!=null) - LOGGER.log(Level.WARNING, "Connection #"+id+" terminated",cause); + LOGGER.log(Level.WARNING, "Connection #"+id+" for + " + nodeName + " terminated",cause); try { ConnectionHandler.this.s.close(); } catch (IOException e) { @@ -254,7 +254,7 @@ public final class TcpSlaveAgentListener extends Thread { logw.println("Failed to establish the connection with the slave"); throw e; } catch (IOException e) { - logw.println("Failed to establish the connection with the slave"); + logw.println("Failed to establish the connection with the slave " + nodeName); e.printStackTrace(logw); throw e; } From 86df064f052e50cfc94a0915c3c8db9e7639850f Mon Sep 17 00:00:00 2001 From: Tom Huybrechts Date: Tue, 23 Feb 2010 21:48:06 +0100 Subject: [PATCH 070/220] use display name instead of ID for cause --- core/src/main/java/hudson/model/Cause.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/Cause.java b/core/src/main/java/hudson/model/Cause.java index d296f27dff..eb5f85461a 100644 --- a/core/src/main/java/hudson/model/Cause.java +++ b/core/src/main/java/hudson/model/Cause.java @@ -190,7 +190,8 @@ public abstract class Cause { @Exported(visibility=3) public String getUserName() { - return authenticationName; + User u = User.get(authenticationName, false); + return u != null ? u.getDisplayName() : authenticationName; } @Override From 97ba4831b6237e5f078a8e7bac4ae2163143a2ae Mon Sep 17 00:00:00 2001 From: Tom Huybrechts Date: Tue, 23 Feb 2010 21:48:36 +0100 Subject: [PATCH 071/220] add node name to logs --- remoting/src/main/java/hudson/remoting/Channel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/remoting/src/main/java/hudson/remoting/Channel.java b/remoting/src/main/java/hudson/remoting/Channel.java index bffbe25c44..08130aeda8 100644 --- a/remoting/src/main/java/hudson/remoting/Channel.java +++ b/remoting/src/main/java/hudson/remoting/Channel.java @@ -955,14 +955,14 @@ public class Channel implements VirtualChannel, IChannel { ioe.initCause(e); throw ioe; } catch (ClassNotFoundException e) { - logger.log(Level.SEVERE, "Unable to read a command",e); + logger.log(Level.SEVERE, "Unable to read a command (channel " + name + ")",e); } if(logger.isLoggable(Level.FINE)) logger.fine("Received "+cmd); try { cmd.execute(Channel.this); } catch (Throwable t) { - logger.log(Level.SEVERE, "Failed to execute command "+cmd,t); + logger.log(Level.SEVERE, "Failed to execute command "+cmd+ " (channel " + name + ")",t); logger.log(Level.SEVERE, "This command is created here",cmd.createdAt); } } From 9512e68c67347d5666a72ac8076513a482212941 Mon Sep 17 00:00:00 2001 From: Tom Huybrechts Date: Tue, 23 Feb 2010 21:50:43 +0100 Subject: [PATCH 072/220] increase search box size --- war/src/main/webapp/css/style.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/war/src/main/webapp/css/style.css b/war/src/main/webapp/css/style.css index 18bd642dca..e349668dad 100644 --- a/war/src/main/webapp/css/style.css +++ b/war/src/main/webapp/css/style.css @@ -800,7 +800,7 @@ DIV.yahooTree td { #search-box { background: white url(../images/16x16/search.gif) no-repeat 2px center; padding-left: 20px; - width: 10em; + width: 15em; position: static; } @@ -810,14 +810,14 @@ DIV.yahooTree td { #search-box-completion { text-align: left; - width:10em; + width:25em; position: absolute; z-index: 999; } #search-box-completion .yui-ac-content { border: 1px solid black; - width:10em; + width:25em; background-color: white; overflow: hidden; } @@ -838,7 +838,7 @@ DIV.yahooTree td { #search-box-minWidth { position:absolute; visibility: hidden; - width:5em; + width:15em; } #search-box-sizer { @@ -846,6 +846,7 @@ DIV.yahooTree td { visibility: hidden; } + /* ========================= resizable text area ========================= */ TEXTAREA { From 6aa6b171d634064c975e016326e0e08ea2e0664b Mon Sep 17 00:00:00 2001 From: Tom Huybrechts Date: Mon, 8 Mar 2010 21:40:48 +0100 Subject: [PATCH 073/220] SetBuildDescription command --- .../cli/SetBuildDescriptionCommand.java | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java diff --git a/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java b/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java new file mode 100644 index 0000000000..8429fe73f1 --- /dev/null +++ b/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java @@ -0,0 +1,48 @@ +package hudson.cli; + +import hudson.Extension; +import hudson.model.AbstractProject; +import hudson.model.Run; +import hudson.remoting.Callable; + +import java.io.IOException; +import java.io.Serializable; + +import org.apache.commons.io.IOUtils; +import org.kohsuke.args4j.Argument; + +@Extension +public class SetBuildDescriptionCommand extends CLICommand implements Serializable { + + @Override + public String getShortDescription() { + return "Sets the description of a build"; + } + + @Argument(metaVar="JOB",usage="Name of the job to build",required=true,index=0) + public transient AbstractProject job; + + @Argument(metaVar="BUILD#",usage="Number of the build",required=true,index=1) + public int number; + + @Argument(metaVar="DESCRIPTION",required=true,usage="Description to be set. '=' to read from stdin.", index=2) + public String description; + + protected int run() throws Exception { + Run run = job.getBuildByNumber(number); + run.checkPermission(Run.UPDATE); + + if ("=".equals(description)) { + description = channel.call(new Callable() { + public String call() throws IOException { + return IOUtils.toString(System.in); + } + }); + } + + run.setDescription(description); + + return 0; + } + +} From 39cb6f709d6ae9beab59fd875da0c4ad6a5920a2 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 25 Apr 2010 16:08:01 +0200 Subject: [PATCH 074/220] [HUDSON-4621] limit amount of history shown for junit results --- .../main/java/hudson/tasks/junit/History.java | 71 ++++++++++++++----- .../hudson/tasks/junit/CaseResult/list.jelly | 2 +- .../hudson/tasks/junit/ClassResult/list.jelly | 2 +- .../hudson/tasks/junit/History/index.jelly | 23 ++++-- .../tasks/test/MetaTabulatedResult/list.jelly | 2 +- 5 files changed, 73 insertions(+), 27 deletions(-) diff --git a/core/src/main/java/hudson/tasks/junit/History.java b/core/src/main/java/hudson/tasks/junit/History.java index 58430e4158..29e00f73b2 100644 --- a/core/src/main/java/hudson/tasks/junit/History.java +++ b/core/src/main/java/hudson/tasks/junit/History.java @@ -25,9 +25,20 @@ package hudson.tasks.junit; import hudson.model.AbstractBuild; import hudson.model.Hudson; -import hudson.tasks.test.TestResult; import hudson.tasks.test.TestObject; -import hudson.util.*; +import hudson.tasks.test.TestResult; +import hudson.util.ChartUtil; +import hudson.util.ColorPalette; +import hudson.util.DataSetBuilder; +import hudson.util.Graph; +import hudson.util.ShiftedCategoryAxis; +import hudson.util.StackedAreaRenderer2; + +import java.awt.Color; +import java.awt.Paint; +import java.util.ArrayList; +import java.util.List; + import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; @@ -38,10 +49,8 @@ import org.jfree.chart.plot.PlotOrientation; import org.jfree.chart.renderer.category.StackedAreaRenderer; import org.jfree.data.category.CategoryDataset; import org.jfree.ui.RectangleInsets; - -import java.awt.*; -import java.util.ArrayList; -import java.util.List; +import org.kohsuke.stapler.Stapler; +import org.kohsuke.stapler.StaplerRequest; /** * History of {@link hudson.tasks.test.TestObject} over time. @@ -66,16 +75,21 @@ public class History { return false; } + public List getList(int start, int end) { + List list = new ArrayList(); + end = Math.min(end, testObject.getOwner().getParent().getBuilds().size()); + for (AbstractBuild b: testObject.getOwner().getParent().getBuilds().subList(start, end)) { + if (b.isBuilding()) continue; + TestResult o = testObject.getResultInBuild(b); + if (o != null) { + list.add(o); + } + } + return list; + } + public List getList() { - List list = new ArrayList(); - for (AbstractBuild b: testObject.getOwner().getParent().getBuilds()) { - if (b.isBuilding()) continue; - TestResult o = testObject.getResultInBuild(b); - if (o != null) { - list.add(o); - } - } - return list; + return getList(0, testObject.getOwner().getParent().getBuilds().size()); } /** @@ -83,9 +97,20 @@ public class History { */ public Graph getDurationGraph() { return new GraphImpl("seconds") { + protected DataSetBuilder createDataSet() { DataSetBuilder data = new DataSetBuilder(); - for (hudson.tasks.test.TestResult o: getList()) { + + List list; + try { + list = getList( + Integer.parseInt(Stapler.getCurrentRequest().getParameter("start")), + Integer.parseInt(Stapler.getCurrentRequest().getParameter("end"))); + } catch (NumberFormatException e) { + list = getList(); + } + + for (hudson.tasks.test.TestResult o: list) { data.add(((double) o.getDuration()) / (1000), "", new ChartLabel(o) { @Override public Color getColor() { @@ -100,6 +125,7 @@ public class History { } return data; } + }; } @@ -111,7 +137,16 @@ public class History { protected DataSetBuilder createDataSet() { DataSetBuilder data = new DataSetBuilder(); - for (TestResult o: getList()) { + List list; + try { + list = getList( + Integer.parseInt(Stapler.getCurrentRequest().getParameter("start")), + Integer.parseInt(Stapler.getCurrentRequest().getParameter("end"))); + } catch (NumberFormatException e) { + list = getList(); + } + + for (TestResult o: list) { data.add(o.getPassCount(), "2Passed", new ChartLabel(o)); data.add(o.getFailCount(), "1Failed", new ChartLabel(o)); data.add(o.getSkipCount(), "0Skipped", new ChartLabel(o)); @@ -125,7 +160,7 @@ public class History { private final String yLabel; protected GraphImpl(String yLabel) { - super(testObject.getOwner().getTimestamp(),600,300); + super(-1,600,300); // cannot use timestamp, since ranges may change this.yLabel = yLabel; } diff --git a/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly b/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly index d70f52078c..61a7ca127a 100644 --- a/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly +++ b/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly @@ -35,7 +35,7 @@ THE SOFTWARE. ${%Test Result} - + diff --git a/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly b/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly index 5c161fd595..85fea87f98 100644 --- a/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly +++ b/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly @@ -34,7 +34,7 @@ THE SOFTWARE. ${%Total} - + diff --git a/core/src/main/resources/hudson/tasks/junit/History/index.jelly b/core/src/main/resources/hudson/tasks/junit/History/index.jelly index 85ab8bbfb8..16a6386d0e 100644 --- a/core/src/main/resources/hudson/tasks/junit/History/index.jelly +++ b/core/src/main/resources/hudson/tasks/junit/History/index.jelly @@ -25,18 +25,20 @@ THE SOFTWARE. - + + + + + +

Legend: + + major RFEmajor enhancement RFEenhancement + major bugmajor bug fix bugbug fix + xxxxx +
+ + + + + +Upcoming changes +Community ratings + + + + + + +

What's new in 1.386 (2010/11/19)

+
    +
  • + Support CSRF protection when submitting results of an external job. + (issue 7961) +
  • + Allow build to start when polling interval is shorter than quiet period and + we need a workspace for polling. + (issue 8007) +
  • + Fix escaping of some special characters when passing properties to Ant on Windows. + (issue 7657) +
  • + Check poll_scm_threads. +
  • + "Retain long standard output/error" option could not be checked when + configuring a job. + (issue 7562) +
  • + Build number in Build History status was off-by-one. + (issue 7973) +
  • + Check whether the name of ToolInstlation is not null. + (issue 8088) +
  • + Prevent AbstractMethodError because of new method in Queue.Executor interface. + (issue 8033) +
  • + View "Delete" permission was not checked properly for showing link. + (issue 7605) +
  • + Fix javascript error in IE for some UI elements, such as one used by copyartifact plugin. + (issue 6756) +
  • + Fix serialization of array containing null elements. + (issue 8006) +
  • + Update bundled subversion plugin to version 1.20 and ssh-slaves to version 0.14. +
+

What's new in 1.385 (2010/11/15)

+
    +
  • Oops, same as 1.384 +
+

What's new in 1.384 (2010/11/05)

+
    +
  • + JDK download for auto installation was not honoring the proxy setting. + (issue 7327) +
  • + Fixed the "Not in GZIP format" error when archiving site / copying files / etc. + (issue 7745) +
  • + Fixed garbled node description. + (Hudson-ja) +
  • + Fixed 404 Not Found error when downgrade buttons are clicked. + (issue 7988) +
  • + Label expression textbox for "Restrict where this project can be run" now + provides autocompletion suggestions. +
+

What's new in 1.383 (2010/10/29)

+
    +
  • + Fix security issue where a user with job configure permission could obtain + admin permission for their session. + (issue 7256) +
  • + Build wrappers can now decorate the launcher or logger for matrix builds. + (issue 7868) +
  • + Fixed a bug where non-existent optional dependencies can result in a cascading load failure. +
  • + Added extension point to allow plugins to add global filters to console + log streams. +
  • + Calculate "Estimated remaining time" for incremental Maven builds based on + the modules which are actually being build. + (issue 6544) +
+

What's new in 1.382 (2010/10/24)

+
    +
  • + Recognize initialization tasks from plugins. + (issue 5427) +
  • + Hudson was failing to report error messages in several situations during a build. +
  • + UI for tying jobs to labels wasn't shown in some situations. +
+

What's new in 1.381 (2010/10/16)

+ +

What's new in 1.380 (2010/10/09)

+
    +
  • + Safe restart was not working since 1.376 +
  • + Don't let help icons get keyboard focus. This improves the keyboard navigability of the configuration page. +
  • + Debug message crept into the production code in 1.379. + (issue 7662) +
  • + Fixed an AbstractMethodError in the UI with plugins (such as batch task.) + (issue 7546) +
  • + Add "proxy compatible" option to default crumb issuing algoritm + (issue 7518) +
+

What's new in 1.379 (2010/10/02)

+
    +
  • + Fixed a pipe clogging problem that can result in a hanging build. + (issue 5977, + issue 7572) +
  • + Fixed a possible NPE in computing dependency changes. +
  • + Fixed the malformed HTTP request error recovery behavior in Winstone. + (issue 7201) +
  • + When checking module descendant relationships, SCM changelog paths were using system file separators while module paths were always using /s. + (issue 7611) +
  • + Hudson was creating multiple instances of PageDecorators, resulting in data consistency problem. + (report) +
  • + Fixed a possible AbstractMethodError + (issue 7546) +
  • + Supported failsafe reports for the Maven2 job type. + (issue 4229) +
+

What's new in 1.378 (2010/09/25)

+
    +
  • + Improving the master/slave communication to avoid pipe clogging problem. + (issue 5977) +
  • + Rolling back to Ant 1.8.0 due to bug in Ant 1.8.1 file copy with large files. + (issue 7013) +
  • + Multiple fingerprints and "redeploy artifacts" links are added to M2 builds when multiple forked lifecycles are invovled. +
  • + Computation of the module build time in the m2 job was incorrect when multiple forked lifecycles are involved. +
  • + Standardized logic for determining alternate settings file location in Maven projects for POM parsing and actual Maven execution. + (issue 4963) +
  • + Side effect from earlier fix of issue 7300 - some help files were linking to a now-moved file in SVN directly. Those are all changed to relative paths now. +
  • + BuildWrapper teardowns could not get result of build for Maven2 projects. + (issue 6033) +
  • + Properly handle incremental builds of Maven projects using relative paths to modules. + (issue 5357) +
  • + Setting of MAXOPENFILES was not reflected in the debian init script. + (issue 5721) +
  • + Do not expose static resources under WEB-INF to clients + (issue 7457) +
  • + Console annotations are added to highlight warnings/errors in Maven +
  • + If a polling initiated a build, capture its log to the build. +
  • + Added a new extension point to prolong the quiet down period programmatically. +
  • + Added a new extension point to make the ping behaviour customizable. + (issue 5249) +
  • + Added a new classloader ("a la" child first for plugin) + (issue 5360) +
+

What's new in 1.377 (2010/09/19)

+
    +
  • + Moved nulling out of buildEnvironments to cleanUp, so that node variables are available in Publishers. + (issue 5925) +
  • + Fixed a persistence problem in the label properties. + (issue 7378) +
  • + Fixed a problem in saving configuration for matrix projects with multiple label axes. + (issue 7281) +
  • + Fixed French localization problem. + (issue 6003, + issue 7404) +
  • + Matrix project now supports custom workspace. + (issue 5077) +
  • + Queue/execution model is extended to allow jobs that consume multiple executors on different nodes. +
+

What's new in 1.376 (2010/09/11)

+
    +
  • + Error in some remote API requests since 1.373. + (issue 7299) +
  • + Fixed RSS of each user's "last builds only" are not found. + (issue 7384) +
  • + Handle initialization problem more gracefully + (issue 7380) +
  • + A matrix build configuration page with multiple nodes/labels was broken since 1.373. + (issue 7281) +
  • + Added downgrade support for the core and plugins. +
+

What's new in 1.375 (2010/09/07)

+
    +
  • + CLI login did not work for about half of the CLI commands (those defined via @CLIMethod annotation). + (issue 6628) +
  • + Add escaping for comma character for Ant properties on Windows. + (issue 2149) +
  • + Small update to empty Ant properties on Windows fix from 1.374, now also working for two consecutive empty properties. + (issue 7204) +
  • + Fixed a possible race condition during Hudson start up. +
  • + Improved the memory consumption when used with LDAP. +
  • + Improved console annotations for Ant. +
  • + (Internal) ConsoleNotes can now inject its associated CSS. +
+

What's new in 1.374 (2010/08/27)

+
    +
  • + Unable to add empty Ant properties on Windows since 1.370. + (issue 7204) +
  • + Maven2 projects now pick up Flexmojo test results automatically. + (issue 6893) +
  • + Auto-completion can be now easily added to text boxes by plugins. +
  • + Non build modules in incremental Maven builds are now set to NOT_BUILD at the beginning of the build, already. +
  • + Plugins can now transform the console output. + (issue 7112) +
  • + Administrator can unpin plugins that are pinned. +
  • + Memory footprint reduction with fingerprints. +
  • + Added "This build is disabled" on Matrix project when it disabled. + (issue 7266) +
+

What's new in 1.373 (2010/08/23)

+
    +
  • + Fixed a config page regression in the matrix project. + (issue 7213) +
  • + Ant target annotation should allow colon in the target name. + (issue 7026) +
  • + Fixed a 1.372 regression in handling whitespace and other characters in label names. + (issue 7216) +
  • + Allow use of username/password parameters for CLI when using LDAP authentication. + (issue 6628) +
  • + Axes in multi-configuration projects are now extensible. +
  • + Multi-configuration projects now allow multiple label/node axes. +
  • + Improved the layout algorithm of the matrix project visualization. + (patch) +
  • + JUnit report archiving now captures stdout of tests run in Surefire. + (issue 4158) +
  • + Updated bundled ssh-slaves plugin to version 0.13. +
+

What's new in 1.372 (2010/08/13)

+
    +
  • + Persist matrix-based security settings in a consistent order + (issue 7138) +
  • + Jobs can now use boolean expression over labels to control where they run. +
+

What's new in 1.371 (2010/08/09)

+
    +
  • + A security hole in CLI command implementations enable unauthorized users + from executing commands. + (SECURITY-5) +
+

What's new in 1.370 (2010/08/07)

+
    +
  • + Added escaping of special characters when passing properties to Ant on Windows. + (issue 7108) +
  • + Workaround issue in IBM JVM causing intermittent ClassNotFoundExceptions. + (issue 5141) +
  • + Fixed a memory leak in Winstone + (issue 5119) +
  • + Updated bundled cvs plugin to version 1.2. +
  • + Incorporated community contributed translations in Korean and Dutch. +
+

What's new in 1.369 (2010/07/30)

+
    +
  • + X-Hudson header not being sent in 1.368. + (issue 7100) +
  • + NPE on build after incremental Maven builds are aborted. + (issue 6429) +
  • + On-demand slaves would launch even when "only for tied jobs" is set. + (issue 7054) +
  • + Fix links to ant targets in console output view that were added in 1.367. + (issue 7041) +
  • + Avoid error with invalid or null primary view, such as in upgrade from older Hudson. + (issue 6938) +
  • + Support LogRotator deletion of old artifacts in multiconfiguration projects. + (issue 6925) +
  • + Build queue was not saved in safeRestart or safeExit. + (issue 6804) +
  • + CLI can now work with a reverse proxy that requires BASIC auth. + (issue 3796) +
+

What's new in 1.368 (2010/07/26)

+
    +
  • + Make /buildWithParameters support remote cause and user supplied cause text + for build via authentication token, just as /build does. + (issue 7004) +
  • + Auto install of JDK when master/slave are different platforms would fail. + (issue 6880) +
  • + Modified to work with Tomcat 7. + (issue 6738) +
+

What's new in 1.367 (2010/07/16)

+
    +
  • + Safe restart made Hudson unresponsive until all running jobs complete, since 1.361. + (issue 6649) +
  • + Plugins with dependencies show wrong description on installed plugins page. + (issue 6966) +
  • + Fix redirect after login when return URL has characters that need encoding. + (issue 6960) +
  • + <input type='hidden'> field shouldn't be getting the plain text password value. +
  • + Added a mechanism to register CLI option handler as an extension point. +
  • + Added a CLI command 'set-build-result' that can be used from inside a build to set the build status. +
  • + Show outline structure for Ant execution in the console output view. +
  • + Remote API now supports the 'tree' filter query parameter which is more efficient and easier to use. + (issue 5940) +
+

What's new in 1.366 (2010/07/09)

+
    +
  • + Fixed a possible security issue where a malicious user with the project + configuration access can trick Hudson into leaking the proxy password, + if Hudson is configured with a proxy with username/password. + (SECURITY-3) +
  • + Delete contained module builds when a maven project build is deleted, to avoid + orphaned builds which can then affect the displayed result of a prior build. + (issue 6779) +
  • + Hide some sidepanel links that should not be shown in user-private views. + (issue 6832) +
  • + Fix for file parameters that are copied to a subdirectory of the workspace. + (issue 6889) +
  • + File parameters uploaded via the CLI are now displayed correctly on the build Parameters page. + (issue 6896) +
  • + Allowed file parameters to be downloaded even when the name contains URL-unfriendly characters. + (issue 6897) +
  • + Fixed a garbage in the raw console plain text output. + (issue 6034) +
  • + "Hudson is loading" page didn't take the user back to the same page. +
  • + Hudson can now remotely install JDK on Windows slaves when connecting via the + "Let Hudson control this Windows slave as a Windows service" mode. +
  • + The "Let Hudson control this Windows slave as a Windows service" mode now allows the same Windows slave + to be used by multiple Hudson masters. +
+

What's new in 1.365 (2010/07/05)

+
    +
  • + Fixed a critical security problem. See the advisory for more details. +
+

What's new in 1.364 (2010/06/25)

+
    +
  • + Fixed a race condition where a queued build may get executed multiple times. + (issue 6819) +
  • + Some UI labels related to JUnit results were shown in the wrong locale. + (issue 6824) +
  • + BuildWrappers can now contribute build variables. + (issue 6497) +
+

What's new in 1.363 (2010/06/18)

+
    +
  • + Fix queue handling to close locking gap between removing job from queue and starting build, + to prevent unintended concurrent builds (refactor of change first made in 1.360). + (report) +
  • + Allow multiple dependencies between same two projects, as they may trigger under + different conditions and with different parameters. + (issue 5708) +
  • + Timeline on build trend page should use server timezone instead of always GMT. + (issue 6692) +
  • + Don't mask the cause of the checkout related exception. +
  • + "who am I?" page should be visible to everyone. +
  • + Avoid pointless and harmful redirection when downloading slave.jar. + (issue 5752) +
  • + Cache downloaded JDKs. +
  • + Reinstall a JDK when a different version is selected. + (issue 5551) +
  • + Integrated community-contributed translations (Germany, Greek, Spanish, Finnish, Hungarian, Italian, Japanese, French, + Russian, Slovenian, Dutch, Traditional Chinese, Swedish, Ukrainian, and Portuguese.) +
  • + Upgraded bundled Ant to version 1.8.1. + (issue 6562) +
+

What's new in 1.362 (2010/06/11)

+
    +
  • + Restored optional container-based authentication for CLI. + (issue 6587) +
  • + Fix javascript error when a plugin uses an empty dropdownList, resulting in LOADING overlay being left up. + (issue 6542) +
  • + Add setting so job views may show only enabled or disabled jobs. + (issue 6673) +
  • + File parameters can now be downloaded from the build Parameters page. + (issue 6719) +
  • + Added an ability to point to different update sites. +
  • + Added a new extension point to plug in custom utility to kill processes. +
  • + Added a proactive error diagnostics to look for a broken reverse proxy setup. + (report) +
+

What's new in 1.361 (2010/06/04)

+
    +
  • + Fixed a bug where IE shows empty client cert dialog when connecting to HTTPS site run by Winstone. + (report) +
  • + "java -jar hudson.war" with AJP was broken. + (issue 5753) +
  • + Safe restart stopped working on protected Hudson since 1.359. + (issue 6667) +
  • + Parameterized jobs did not use configured quiet period. + (issue 6660) +
  • + Fix form data conflict when fingerprinting is used with Promoted Builds plugin. + (issue 6642) +
  • + Avoid possible exception at startup when some plugins have optional dependencies. + (issue 6435) +
  • + Add autocomplete="off" for LDAP managerDN and managerPassword fields. + (issue 3586) +
  • + Set a TCP timeout when slaves connect to the master. + (issue 6262) +
  • + File parameter builds started with the CLI command no longer throw an NPE. + (issue 4296) +
  • + Workaround for bug in Glassfish Enterprise. + (issue 6459) +
  • + Ensure nested f:repeatable content does not inherit outer list when inner list is null. + (issue 6679) +
  • + Add two new permalinks to job pages: "Last unstable build" and "Last unsuccessful build". +
  • + Allow the build number to be set so long as it's still bigger than the last build. + (issue 4930) +
  • + Copied jobs are now disabled until configuration is saved, so they don't start building before ready. + (issue 2494) +
  • + Reduced logging from jmDNS. +
+

What's new in 1.360 (2010/05/28)

+
    +
  • + A Java6 dependency had crept in in 1.359. + (issue 6653) +
  • + Workaround for bug in Glassfish Enterprise. + (issue 6459) +
  • + Added an extension point to control the assignment of tasks to nodes. + (issue 6598) +
+

What's new in 1.359 (2010/05/21)

+
    +
  • + Accept latest JRockit JVM release as a compatible JVM. + (issue 6556) +
  • + Hudson now broadcasts itself in DNS multicast at "_hudson._tcp.local" to facilitate auto-discovery from other tools +
  • + Added the "-block" option to the "quiet-down" CLI command so that the command will block until the system really quiets down. +
+

What's new in 1.358 (2010/05/14)

+
    +
  • + Too much memory used by stdout/stderr from test results. + (issue 6516) +
  • + Fixed a memory leak in Winstone sessions. + (issue 5119) +
  • + Fix to handle usernames with colon character on Windows. + (issue 6476) +
  • + Fixed the port number handling problem in debian init script. + (issue 6474) +
  • + Fix FilePath.getParent() handling of edge cases. + (issue 6494) +
  • + Fix css conflict introduced in 1.357 that caused missing data display in analysis plugins. + (issue 6496) +
  • + Support "optional=true" parameter for @Extension. +
  • + Supported OpenSSL-style certificate/key file format with "java -jar hudson.war" +
  • + If --httpsPort option is given without the certificate, run with a one-time self-signed certificate. +
  • + Hudson shouldn't show a login error page unless the user really failed to login (think about when the user presses a back button.) +
+

What's new in 1.357 (2010/05/07)

+
    +
  • + Maven builds abort unexpectedly due to a SocketTimeoutException on machine with poor resources. + (issue 3273) +
  • + Fix incorrect handling of ".." in paths with mix of / and \ separators since 1.349. + (issue 5951) +
  • + Javadoc publishing should not fail build if javadoc is already current. + (issue 6332) +
  • + Fix download of files/artifacts larger than 2GB. + (issue 6351) +
  • + Build page may not list all of the artifacts since 1.348. + (issue 6371) +
  • + Add workaround for Opera 10.52/53 bug causing error in saving job configuration. + (issue 6424) +
  • + Fix createSymlink problem on *nix systems that do not use GNUCLibrary since 1.356. + (issue 6437) +
  • + Hide add/edit description link on test result pages when user does not have + permission to submit a description. +
  • + Changed permission required to set description on test result pages + from Build Job to Update Run. +
  • + Add "LOADING" overlay on global and job config pages until form is ready for use. +
  • + Email recipient lists now support build parameters. + (issue 6394) +
  • + Make it easier to see the latest update jobs on the Update Center page. + (issue 4255) +
  • + Allow plugins to use forms with an onsubmit handler, and fix "no-json" handling. + (issue 5927) +
  • + Updated bundled subversion plugin to version 1.17. +
+

What's new in 1.356 (2010/05/03)

+
    +
  • + Fix StringIndexOutOfBoundsException in console log from UrlAnnotator. + (issue 6252) +
  • + Fixed potential deadlock between saving project config and getting project page. + (issue 6269) +
  • + Fixed timeline display on build time trend page. + (issue 6439) +
  • + Fixed garbled response of XML API if xpath is specified. + (ja@hudson.dev.javanet) +
  • + Fix broken links for stopping jobs in executor list on pages for slave nodes or filtered views. +
  • + Fixed NoSuchMethodError with Maven and Ivy plugins. + (issue 6311) +
  • + Extension points can be now sorted. +
+

What's new in 1.355 (2010/04/16)

+
    +
  • + Colored ball image at top of build pages was broken for Hudson in some web + containers (fixed by removing workaround for a Firefox bug fixed since 3.0.5/Dec2008). + (issue 2341) +
  • + Console page while build is running did not wrap lines when viewed in IE. + (issue 5869) +
  • + Fixed build history to indicate test failure for MavenBuild and MavenModuleSetBuild. +
  • + Make dropdownList work in repeatable content, such as a build step. +
  • + Fixed a bug where a job created via XML didn't properly receive upstream/downstream computation. + (report) +
  • + Argument masking wasn't working correctly for commands run on slaves + (report) +
  • + Added the slave retention strategy based on a schedule. +
  • + Added to configure charset option of Mailer. +
+

What's new in 1.354 (2010/04/12)

+
    +
  • + POM parsing was still using the module root as the base for relative paths for alternate settings files. + (issue 6080) +
  • + Fix dynamic updates of build history table when CSRF protection is turned on. + (issue 6072) +
  • + Improved the error reporting mechanism in LDAP setting. +
  • + Raw console output contains garbage. + (issue 6034) +
  • + Fixed a file handle leak in the slave connection. + (issue 6137) +
  • + Quiet period wasn't taking effect properly when doing parameterized builds. +
+

What's new in 1.353 (2010/03/29)

+
    +
  • + Tagging a repository can result in NPE. +
  • + Fix possible form submission error when using multiple combobox elements. + (issue 6025) +
  • + Better escaping of test case names in test results pages. + (issue 5982) +
  • + Make radio buttons work in repeatable content, such as a build step. + (issue 5028) +
  • + Fixed the handling of verifying that the POM path entered for Maven projects exists. + (issue 4693) +
  • + Added link to builds in buildTimeTrend + (issue 3993) +
+

What's new in 1.352 (2010/03/19)

+
    +
  • + Fixed a file handle leak when a copy fails. + (issue 5899) +
  • + Replace '>' with '_' in username, as already done for '<'. + (issue 5833) +
  • + Fix editableComboBox to select item when mouse click takes more than 100ms. + (issue 2722) +
  • + Fixed NPE when configuring a view without "Regular expression". +
  • + Page shouldn't scroll up when the user opens/closes a stack trace in the test failure report. +
  • + Fixed a bug where Hudson can put a wrong help file link. + (report) +
  • + Fixed Maven site goal archiving from slaves. + (issue 5943) +
  • + Fixed a regression with NetBeans Hudson plugin progressive console output. + (issue 5941) +
  • + Fixed a situation where a failure in plugin start up can prevent massive number of job loss. +
  • + Supported JBoss EAP 5.0.0 GA. + (issue 5922) +
  • + CLI commands on protected Hudson now asks a password interactively, if run on Java6. +
  • + Added CLI 'login' and 'logout' commands so that you don't have to specify a credential + for individual CLI invocation. +
  • + URLs in the console output are now hyperlinks. +
  • + Improved the URL annotation logic. +
  • + Add drag&drop support for f:repeatable lists and use this for + the JDK/Ant/Maven installations in global config so these can be reordered. +
  • + Integrated a new round of community-contributed localizations (ca, es, fi, fr, hi_IN, it, nl, ru, and sv_SE locales.) +
+

What's new in 1.351 (2010/03/15)

+
    +
  • + Regression in 1.350 that can delete old build artifacts. + (report) +
+

What's new in 1.350 (2010/03/12)

+
    +
  • + Fix handling of relative paths in alternate settings.xml path for Maven projects. + (issue 4693) +
  • + Alternate settings, private repository, profiles, etc were not used in embedded Maven for + deploy publisher. + (issue 4939) +
  • + Make editableComboBox work in repeatable content, such as a build step. +
  • + If content is captured using <j:set var="..">..content..</j:set>, + fixed this to use proper HTML rendering when appropriate. +
  • + '<' and '&' in the console output was not escaped since 1.349 + (issue 5852) +
  • + Fixed an AbstractMethodError in SCM polling under some circumstances. + (issue 5756) +
  • + Fixed a ClassCastException in the Subversion plugin - now using Subversion plugin 1.13. + (issue 5827) +
  • + The Maven Integration plugin link in the Update Center was going to a dead location. + (issue 4811) +
  • + On RPM/DEB/etc installation, don't offer the self upgrade. It should be done by the native package manager. + (report) +
  • + Fixed a possible lock up of slaves. +
  • + Added advanced option to LogRotator to allow for removing artifacts from old builds + without removing the logs, history, etc. + (issue 834) +
  • + Authentication support in Hudson CLI. + (issue 3796) +
  • + Added console annotation support to SCM polling logs. +
+

What's new in 1.349 (2010/03/05)

+
    +
  • + Fix deserialization problem with fields containing double underscore. + (issue 5768) +
  • + Fix deserialization problem for Exception objects where the XML has bad/old data. + (issue 5769) +
  • + Fix serialization problem with empty CopyOnWriteMap.Tree. + (issue 5776) +
  • + Fixed a bug that can cause 404 in the form validation check. +
  • + Remote build result submission shouldn't hang forever even if Hudson goes down. +
  • + Added a monitor for old or unreadable data in XML files and a manage screen to assist + in updating files to the current data format and/or removing unreadable data from plugins + that are no longer active. "Manage Hudson" page will show a link if any old/unreadable + data was detected. +
  • + Added a mechanism to bundle init.groovy inside the war for OEM. + (report) +
  • + Added an extension point to annotate console output. + (issue 2137) +
+

What's new in 1.348 (2010/02/26)

+
    +
  • + Fixed a performance problem of the job/build top page when there are too many artifacts. +
  • + Improved /etc/shadow permission checks. +
+

What's new in 1.347 (2010/02/19)

+
    +
  • + Fix javascript problem showing test failure detail for test name with a quote character. + (issue 1544) +
  • + Hudson can incorrectly configure labels for the master when bleeding edge EC2 plugin is used. +
  • + Fixed the regression wrt the whitespace trimming caused by 1.346. + (issue 5633) +
  • + Under some circumstances, Hudson can incorrectly delete the temporary directory itself. + (issue 5642) +
  • + Newlines in MAVEN_OPTS environment variable can cause problems in other contexts. + (issue 5651) +
  • + Improved the form validation mechanism to support multiple controls. + (issue 5610) +
  • + Added message to slave log when it has successfully come online. + (issue 5630) +
+

What's new in 1.346 (2010/02/12)

+
    +
  • + Maven modules should not be buildable when the parent project is disabled. + (issue 1375) +
  • + Fixed the broken quiet period implementation when polling interval is shorter than + the quiet period. (Changes in SCM impls are needed for this to take effect.) + (issue 2180) +
  • + Escape username in URLs in case it contains special characters such as "#". + (issue 2610) +
  • + Fix sidepanel link for People to be visible and show view-specific info when appropriate. + (issue 5443) +
  • + Improved HTML rendering, not using closing tags that do not exist in HTML. + (issue 5458) +
  • + Show better error message for missing view type selection when creating a view. + (issue 5469) +
  • + Hudson wasn't properly streaming a large external build submission, + which can result in OOME and unresponsiveness. +
  • + Use fixed-width font in text area for shell/batch build steps. + (issue 5471) +
  • + Use user selected icon size on People page. + (issue 5447) +
  • + Speed/footprint improvement in the HTML rendering. +
+

What's new in 1.345 (2010/02/08)

+
    +
  • + Update center retrieval, "build now" link, and real-time console update was broken in 1.344. + (issue 5536) +
  • + Fixed the backward incompatibility introduced in HUDSON-5391 fix in 1.344. + (issue 5391) +
+

What's new in 1.344 (2010/02/05)

+
    +
  • + Removed the forced upper casing in parameterized builds. + (issue 5391) +
  • + Password parameter on the disk should be encrypted. + (issue 5420) +
  • + Duplicate entries on Upstream/Downstream project with "Build modules in parallel". + (issue 5293) +
  • + "Projects tied on" should be "Projects tied to". + (issue 5451) +
  • + Fixed the bug that prevents update center metadata retrieval in Jetty. + (issue 5210) +
  • + Show which plugins have already been upgraded in Plugin Manager. + (issue 2313) +
  • + Show Hudson upgrade status on manage page instead of offering same upgrade again. + (issue 3055) +
  • + Make badges in build history line up. + (report) +
+

What's new in 1.343 (2010/01/29)

+
    +
  • + Don't report a computer as idle if it running the parent job for a matrix project. + (issue 5049) +
  • + Improve error message for a name conflict when renaming a job. + (issue 1916) +
  • + Job description set via the remote API was not saved. + (issue 5351) +
  • + Work around a JVM bug on Windows that causes the "Access denied" error + while creating a temp file. + (issue 5313) +
  • + Fixed a NPE in the update center with the container authentication mode. + (issue 5382) +
  • + Global MAVEN_OPTS for Maven projects wasn't getting loaded properly for configuration. + (issue 5405) +
  • + Fix for parameterized project with choice parameter value that has < or > character. + (report) +
  • + Build queue was showing some of the items in the wrong order — it should show new ones first and + old ones later. +
  • + Move form to adjust logging levels to its own page and include table of configured levels. + (issue 2210) +
  • + Allow the administrator to control the host names via a system property "host.name" per slave, + in case auto-detection fails. + (issue 5373) +
  • + Introduced a new extension point for test result parsers. + (discussion) +
  • + Data loading is made more robust in the face of linkage failures. + (issue 5383) +
  • + Auto-detect if Hudson is run in Solaris SMF + and provide restart capability. + (report) +
  • + Formalized an extension point to control priority among builds in the queue. + (issue 833) +
+

What's new in 1.342 (2010/01/22)

+
    +
  • + Commands run on slaves (such as SCM operations) were not printed to the log + the way they would be when run on master. + (issue 5296) +
  • + Downstream jobs could fail to trigger when using per-project read permissions. + (issue 5265) +
  • + Update lastStable/lastSuccessful symlinks on filesystem later in build process to avoid + incorrectly updating links when build fails in post-build actions, and links briefly + pointing to a build that is not yet complete. + (issue 2543) +
  • + Debian package no longer changes the permissions and owner of the jobs and .ssh directory. + This is to improve upgrade speed and so that ssh works properly after upgrading. + (issue 4047 and + issue 5112) +
  • + Automatic tool installation wasn't honoring proxy setting. + (issue 5271) +
  • + Fixed a bug that induces a NPE during list view column construction. + (issue 5061) +
  • + Fixed a bug that can cause Hudson to fail to encode non-ASCII characters in URL. + (issue 5155) +
  • + Added "process-test-classes" phase to Maven intercepter. + (issue 2226) +
  • + Fixed a regression in the remote API in 1.341. + (report) +
  • + Improved error diagnostics when failing to auto install Maven/Ant. + (issue 5272) +
  • + Infer the default e-mail address more smartly with user IDs like "DOMAIN\user" (often seen in Windows) + (issue 5164) +
  • + The hudson.model.Run.ArtifactList.treeCutoff property should not limit the number + of artifacts shown by the API. + (issue 5247) +
  • + Spanish translation made a great progress. +
+

What's new in 1.341 (2010/01/15)

+
    +
  • + Completed fix started in 1.325 for updating bundled plugins, now working when security is enabled. + (issue 3662) +
  • + TemporarySpaceMonitor and DiskSpaceMonitor fail to instantiate on fresh systems. + (issue 5162) +
  • + /tmp space monitoring didn't work if /tmp is filled up completely. +
  • + Plugins can now control how builds are triggered when they declare downstream jobs. + (issue 5236) +
  • + Hudson now detects a cyclic dependencies among plugins and report the error gracefully. +
  • + Extension points can now contribute multiple actions. +
  • + Responses to remote API calls now honor the "Accept-Encoding" header. + (report) +
  • + Link to project changes summary instead of this build's changes for "still unstable" email. + (issue 3283) +
  • + SCM retry count and "Block build when upstream project is building" is now available on matrix projects. + (report) +
+

What's new in 1.340 (2010/01/11)

+
    +
  • + Non ASCII chars get mangled when a new user is created. + (issue 2026) +
  • + Fixed garbled mail text when default encoding is not UTF-8. + (issue 1811) +
  • + Fixed a bug in the log rotation setting of RPM packages. + (report) +
  • + Added a new CLI command to obtain list of changes by specifying builds. +
  • + Improved memory/swap monitoring on Solaris systems that doesn't have the 'top' command. + (report) +
  • + User IDs in Hudson are now case preserving but case insensitive. + (issue 4354) +
  • + CVS support is separated into a plugin, although it's still bundled by default for compatibility. + (issue 3101) +
+

What's new in 1.339 (2009/12/24)

+
    +
  • + slave.jar incorrectly shipped with a version number indicating a private build. + (issue 5138) +
  • + Global MAVEN_OPTS weren't saving due to TopLevelItemDescriptors not being configured in global configuration. + (issue 5142) +
  • + Make maven project more resilient to exceptions from plugins. + (issue 3279) +
  • + Add the ability to configure low-disk space thresholds. + (issue 2552) +
  • + Allow BuildWrapper tearDown code to detect when the build has failed. + (issue 2485) +
  • + Add help regarding "Auto" repository browser selection and add support + for this in Subversion plugin. + (issue 2082) +
  • + Introduced a mechanism so that writing XSS-free code is easier. + (discussion) +
+

What's new in 1.338 (2009/12/18)

+
    +
  • + Maven projects will now use per-project MAVEN_OPTS if defined first, then global MAVEN_OPTS if defined, and finally + as fallback, MAVEN_OPTS environment variable on executor. + (issue 2932) +
  • + Expose upstream cause details via remote API. + (issue 5074) +
+

What's new in 1.337 (2009/12/11)

+
    +
  • + Matrix parent build shouldn't consume an executor. + (issue 936) +
  • + Exceptions in one publisher shouldn't block all other publishers from running. + (issue 5023) +
  • + Fixed OutOfMemoryError in JNLP slaves that are running for too long. + (issue 3406) +
  • + Auto installer for Maven couldn't be configured after the fact. +
  • + Fixed a bug that the form field validation couldn't handle <select> box. + (report) +
  • + Fixed a possible "XYZ is missing its descriptor" storm. + (issue 5067) +
  • + Group available plugins in Plugin Manager by category. + (issue 1836) +
  • + Add sorting and link to directory browser for artifact list and tree display. + (issue 4976) +
  • + Make links in build history for a view stay under that view. + (issue 5021) +
  • + Automatically install dependent plugins. + (issue 4983) +
  • + Implemented a proper serialization of multi-classloader object graph. + (issue 5048) +
+

What's new in 1.336 (2009/11/28)

+
    +
  • + Update or remove lastSuccessful/lastStable symlinks on filesystem as appropriate + when a build is deleted. + (issue 1986) +
  • + In-demand strategy could not relaunch slave nodes since 1.302. + (issue 3890) +
  • + Actual cause for slave going offline was always masked by channel-terminated cause. +
  • + Improved display of why a slave is offline (don't incorrectly say "failed to launch"). +
  • + Improved the error diagnostics on the failure to establish connection with JNLP slaves early on. +
  • + Fix so configure-slave permission actually allows configuration of slaves. +
  • + User pages showed add/edit description link to users without permission to edit, + and guests were allowed to edit the user profile for anonymous user. +
  • + Debian package now demands full JRE, not just a headless JRE. + (issue 4879) +
  • + Avoid exception if a plugin provides null for a dynamic node label. + (issue 4924) +
  • + If restart is not supported, explain why. + (issue 4876) +
  • + Matrix configuration builds should continue even when Hudson is about to shut down. + (issue 4873) +
  • + Send build status email to valid addresses rather than aborting for one invalid address. + (issue 4927) +
  • + Smart JDK/Maven/Ant auto installers aren't available for existing tool configurations. +
  • + Hudson can now run gracefully (albeit bit slowly) where JNA is not available. + (issue 4820) +
  • + Add ability to delete users from Hudson. + (issue 1867) +
  • + Gracefully detect the double loading of JNA instead of failing later with NoClassDefFoundError + (detail) +
  • + Introduced a structure around the initialization process for better reporting and etc. +
  • + Debian packages creates Hudson user with /bin/bash to accomodate some tools that want a valid shell. + (issue 4830) +
+

What's new in 1.335 (2009/11/20)

+
    +
  • + Space in axis value for matrix type project was lost on reconfiguration. + (issue 2360) +
  • + Remember me did not work with unix authentication. + (issue 3057) +
  • + Node variables not passed through to Maven jobs. + (issue 4030) +
  • + Fix handling of non-ASCII characters in external job submission. + (issue 4877) +
  • + Job assigned to label that no longer has any nodes generates exception since 1.330. + (issue 4878) +
  • + Custom workspace on Windows with just a drive letter or using forward slashes in path + failed to build in 1.334. + (issue 4894) +
  • + Core version number in plugin manager warning message was missing in 1.334. +
  • + Matrix build wasn't showing their full name in the executor list on the left. +
  • + Hudson's UDP broadcast/discovery now supports IP multicast. +
+

What's new in 1.334 (2009/11/16)

+
    +
  • + Fixed a possible exception in submitting forms and obtaining update center metadata with Winstone in 1.333. + (issue 4804) +
  • + Remoting layer was unable to kill remote processes. Prevented Mercurial plugin from implementing poll timeout on slaves. + (issue 4611) +
  • + Display of console output as plain text did not work in browsers since 1.323. + (issue 4557) +
  • + Show "Latest Test Results" link even when a new build is running. + (issue 4580) +
  • + Fix broken links for failed tests on build page for a matrix type project. + (issue 4765) +
  • + "Enable project-based security" always comes up unchecked on configure pages in 1.333, + so project permissions are lost if not rechecked before clicking Save. + (issue 4826) +
  • + Project read permission was not enforced via /jobCaseInsensitive/jobname path. +
  • + Project configuration could be modified via POST to /job/jobname/config.xml with only + "Extended Read" permission but not configure permission. +
  • + Fixed the over zealous escaping in the inlined unit test failure report. +
  • + Fixed OutOfMemoryError in Winp + (issue 4058) +
  • + Write log message and ignore unrecognized permissions when loading XML. + (issue 4573) +
  • + Fix in stapler so we don't redirect to "." which causes problem in some containers. + (issue 4787) +
  • + List counts for duplicate cause entries for a build rather than listing many times. + (issue 4831) +
  • + Plugin manager now shows warning for upgrade/install of plugins into a Hudson that + is older than the plugin was built for. + (issue 541) +
  • + CLI "build" command now supports passing parameters. +
  • + Job should provide doDescription to allow easy manipulation over http + (issue 4802) +
  • + Improvement in the caching of the view templates. +
  • + Added new SaveableListener to be called when objects implementing Saveable are saved. +
+

What's new in 1.333 (2009/11/09)

+
    +
  • + Fixed a performance problem in the file upload with Winstone. + (report) +
  • + Allow non-absolute URLs in sidebar links that do not end with slash character. + (issue 4720) +
  • + Build other projects "even when unstable" option was not working with Maven projects. + (issue 4739) +
  • + When renaming a log recorder, check new name uses valid characters, remove config file for + old name and redirect to new name after save. +
  • + Fixed ArrayIndexOutOfBoundsException in my view. + (report) +
  • + Fixed a race condition in interrupting pending remote calls. +
  • + Retry shouldn't kick in if the build is aborted during checkout. +
  • + Hudson now sends "Accept-Ranges" header where it's supported. + (report) +
  • + Hudson is internally capable of supporting multiple update sites. +
  • + Added a new "safe-restart" CLI command, also accessible at "/safeRestart", and used for post-upgrade/plugin install restart. + (issue 4553) +
  • + Added "delete-builds" CLI command for bulk build record deletion. +
  • + Supported a relative path in the custom workspace directory, which resolves from FS root of the slave. +
  • + Fixed another NotExportableException when making a remote API call on a project. + Broke NetBeans integration and possibly others. + (issue 4760) +
+

What's new in 1.332 (2009/11/02)

+
    +
  • + Fixed a regression in 1.331 where previously disabled plugins and their artifacts in build.xml can cause build records to fail to load. + (issue 4752) +
  • + Fixed NotExportableException when making a remote API call on a project. + (report) +
  • + Fixed IllegalArgumentException: name + (report) +
+

What's new in 1.331 (2009/10/30)

+
    +
  • + Fixed a memory leak problem with the groovysh Hudson CLI command. + (issue 4618) +
  • + CVS changelog reports were incorrect if built from tags. + (issue 1816) +
  • + Upstream projects list was lost when saving matrix type project. + (issue 3607) +
  • + slave.jar now supports HTTP BASIC auth. + (issue 4071) +
  • + Fixed a problem where taglibs defined in plugins cannot be seen from other plugins. + (report) +
  • + Improved the UI of taking a node offline. +
  • + Added improved logging for exceptions encountered when attempting to invoke Maven in Maven projects. + (issue 3273) +
  • + Automated tool downloads are made more robust by using HTTP download retries. +
  • + SCM information is now exposed via the remote API. +
  • + Added the "install-plugin" command to install plugins from CLI. + (report) +
+

What's new in 1.330 (2009/10/23)

+
    +
  • + Fixed NoSuchMethodError error during error recovery with Maven 2.1. + (issue 2373) +
  • + RemoteClassLoader does not persist retrieved classes with package structure + (issue 4657) +
  • + Update center switched over from https://hudson.dev.java.net/ to http://hudson-ci.org/ +
  • + Use tree view to show 17-40 build artifacts on build/project pages. + (issue 2280) +
  • + When showing why a build is pending, Hudson now puts hyperlinks to node/label/project names. +
  • + Custom workspace is now subject to the variable expansion. + (issue 3997) +
+

What's new in 1.329 (2009/10/16)

+
    +
  • + Fixed UI selector (hetero-list) to handle nested selectors (resolves conflict between + Promoted Builds and Parameterized Trigger plugins). + (issue 4414) +
  • + Fixed incremental Maven build behavior to properly handle new modules without hitting NPE. + (issue 4624) +
  • + Added the "build" CLI command that can not only schedule a new build, but also wait until its completion. +
  • + Made visibility rules of test result remote API consistent with those for individual test cases. +
  • + Fixed a bug in the HTTP Range header handling. + (report) +
  • + Fixed a bug in .cvspass form field persistence. + (issue 4456) +
+

What's new in 1.328 (2009/10/09)

+
    +
  • + Overview of all SCM polling activity was never showing any entries. + (issue 4609) +
  • + Fixed a bogus IOException in the termination of CLI. +
  • + Fixed a bug in the form submission logic of the SMTP authentation configuration. + (report) +
  • + Hudson shouldn't store SMTP auth password in a clear text. + (report) +
  • + Improved the form validation in global e-mail configurations. + (report) +
+

What's new in 1.327 (2009/10/02)

+
    +
  • + Worked around a possible Windows slave hang on start up. + (details) +
  • + Inability to access hudson.dev.java.net shouldn't prevent Hudson from working. + (issue 4590) +
  • + Added a CLI command install-tool to invoke a tool auto-installation from Hudson CLI. + (report) +
  • + Added column on plugin updates page showing currently installed version. +
  • + Build page now shows where the build was done. +
  • + Job-enabling API should reject GET requests + (issue 3721) +
  • + Added an extension point for inserting actions across all projects without configuration. + (report) +
  • + stdout, stderr, error details and the stack trace can be filtered out of the remote API + representation of a test case with the depth parameter. + (discussion) +
+

What's new in 1.326 (2009/09/28)

+
    +
  • + Hudson fails to update a plugin due to a bug in the up-to-date check logic. + (issue 4353) +
+

What's new in 1.325 (2009/09/25)

+
    +
  • + Self restart was not working on Solaris 64bit JVM. +
  • + Fixed a possible NoSuchElementException in Hudson start up. +
  • + "Redeploy Maven artifacts" GUI causes NPE. +
  • + Permission check was missing for file mask validators. +
  • + Fixed a problem regarding SCM plugin evolution and SCM browser settings, as observed in the Mercurial plugin. + (issue 4514) +
  • + Update center wasn't capable of updating bundled plugins, such as subversion. +
  • + Fixed a problem in the up-to-date check of the plugin extraction. + (issue 4353) +
  • + Fixed a bug in the Debian package init script. + (issue 4304) +
  • + Fixed an NPE in MavenBuild$RunnerImpl.decideWorkspace + (issue 4226) +
  • + "Test e-mail" feature in the system configuration page wasn't taking most of the parameters from the current values of the form. + (issue 3983) +
  • + If a Maven project is built with "-N" or "--non-recursive" in the goals, it will not attempt to + load and parse the POMs for any modules defined in the root POM. + (issue 4491) +
  • + Update center will create *.bak files to make it easier for manual roll back of botched upgrades. +
  • + Vastly improved the default MIME type table of the built-in servlet container. +
  • + Javadoc location is now subject to the variable expansions. + (issue 3942) +
  • + JNLP clients now report the reason when the connection is rejected by the master. + (issue 3889) +
+

What's new in 1.324 (2009/09/18)

+
    +
  • + Added call to MailSender in RunnerImpl.cleanUp so that mail gets sent for top-level Maven project as well as individual modules. This means mail will be sent if there are POM parsing errors, etc. + (issue 1066) +
  • + Default value for password parameter in a parameterized project was not saved. + (issue 4333) +
  • + Run sequentially option for Matrix project was not visible unless Axes was checked. + (issue 4366) +
  • + Fix launching Windows slave for slave name with space or other characters needed encoding. + (issue 4392) +
  • + Support authentication when running java -jar hudson-core-*.jar using username/password + included in HUDSON_HOME URL; also removed dependency on winstone.jar. + (issue 4400) +
  • + Fixed links on age values in JUnit test reports. + (issue 4402) +
  • + Maven project POM parser now ignores empty modules or modules only containing whitespace, + matching Maven's behavior. + (issue 4442) +
  • + Fixed setting of "blockBuildWhenUpstreamBuilding" for AbstractProject - wasn't being set at all, or displayed. + (issue 4423) +
  • + Handling of URLs with encoded character at end of a path component did not work in 1.323. + (issue 4454) +
  • + Fixed some field validators to work for values including + character. +
  • + Fixed the charset encoding handling when different encodings are involved between the master and slaves. + (patch) +
  • + Fixed a bug in the workspace archive support. + (issue 4039) +
  • + Added client-side validator for required fields and used this to replace some AJAX calls. +
  • + JNLP clients perform periodic ping to detect terminated connections and recover automatically. + (report) +
+

What's new in 1.323 (2009/09/04)

+
    +
  • + Creation of symlinks failed (or created in wrong location) since 1.320. + (issue 4301) +
  • + Fixed a NoClassDefFoundError problem that happens in remoting+maven+3rd plugin combo. + report +
  • + Raw console output was doing XML escaping for '&' and '<' but it shouldn't. +
  • + Manually wiping out a workspace from GUI can cause NPE with some SCM plugins. +
  • + Fixed ClassCastException in JavaMail with some application servers. + (issue 1261) +
  • + Fixed a bug in the tabular display of matrix projects. + (issue 4245) +
  • + Avoid division by zero error in swap space monitor. + (issue 4284) +
  • + Avoid duplicate My Views links after Reload configuration from disk. + (issue 4272) +
  • + Removed need for hack that lowered build health scores by one, so now 4/5 is reported as 80 instead of 79. + (issue 4286) +
  • + Fixed renaming a job to a name that includes a + character. +
  • + Matrix project did not properly handle axis values with some special characters such as slash. + (issue 2670) +
  • + Added validation for axis names in Matrix project. +
  • + Ajax validator for name of a new job now warns about invalid characters. +
  • + Maven builder in freestyle projects now supports "Use private repository" option. + (issue 4205) +
  • + Maven incremental builds now rebuild failed/unstable modules from previous builds, even if they are unchanged. + (issue 4152) +
  • + Labels are listed in lexicographic order. + (report) +
  • + Labels for nodes are shown in a tag cloud style. + (patch) +
  • + Exposing load statistics to the remote API. + (report) +
  • + Make dynamic labelling of nodes clearer and easier to work with. +
  • + Plugins can mark themselves as incompatible with earlier versions to notify users during upgrade. + (issue 4056) +
  • + Footer now includes a timestamp. +
  • + Advanced option now available for all project types to keep builds in queue while upstream projects are building. Off by default. + (issue 1938) +
  • + Fixed a bug in Winstone that hides the root cause of exceptions. +
+

What's new in 1.322 (2009/08/28)

+
    +
  • + NPE in Subversion polling problem. + (issue 4299) +
  • + Changing credential in Subversion can still result in "svn authentication cancelled" + (issue 3936) +
  • + Debian init script now uses "su" to properly initialize the environment. + (issue 4304) +
+

What's new in 1.321 (2009/08/21)

+
    +
  • + "Tag this build" was failing. + (issue 4018) +
  • + Build history AJAX update was buggy. +
  • + Failed Junit tests will display error message and stacktrace even when no + additional TestDataPublishers are attached to the project. + (issue 4257) +
  • + Maven test failures will again properly mark a build as unstable, + even if later task segments are successful. + (issue 4177) +
  • + Matrix permissions with LDAP now properly validates group names using configured + prefix and case settings; added help text about these settings. + (issue 3459) +
  • + Improved the debian package to set USER and HOME. + (report) +
  • + Failed to look up an e-mail address for LDAP users shouldn't cause a build to fail. + (report) +
  • + Fixed a possible NPE in Hudson.removeNode + (report) +
  • + Debian start-up script should inherit LANG and other key environment variables. +
  • + Dynamic label computation wasn't re-done properly for the master node. + (issue 4235) +
  • + Form validation for the remote FS root of slaves was not functioning. +
  • + Privilege escalation on Solaris without username was not working. +
  • + Hudson can make mistakes in binding plugins to their right /plugin/NAME/ URLs. + (report) +
  • + Hudson wasn't working on WebLogic on Windows. + (report) +
  • + Fix New Job and Edit View links when default view is not "All" jobs. + (issue 4212) +
  • + Revert logger settings when a log recorder is deleted. + (issue 4201) +
  • + Add xml header on RSS/atom feeds and fix RSS URLs in header for non-default views. + (issue 4080, + issue 4081) +
  • + Plugin installation / Hudson upgrade are made more robust in the face of possible connection abortion. + (report) +
  • + Global and per-node environment vars are made available to SCM checkout. + (issue 4124) +
  • + You can designate certain combinations in a matrix project as "touchstone builds". These will + be run first, and the rest of the combinations will run if the touchstone builds are successful. + (issue 1613) +
  • + Added BUILD_URL and JOB_URL to the exposed environment variables. + (request) +
  • + Added restart CLI command. +
+

What's new in 1.320 (2009/08/14)

+
    +
  • + Fixed an encoding problem in CVS changelog calculation. + (issue 3979) +
  • + Environment variables are considered in test paths. + (issue 3451) +
  • + A failing test is recorded when JUnit XML is invalid + (issue 3149) +
  • + Fixed possible Unable to call getCredential. Invalid object ID race problem. + (issue 4176) +
  • + If the timing coincides between polling and build, Hudson ended up creating multiple workspaces for the same job, + even when concurrent build is off. + (issue 4202) +
  • + Fixed a "Releasing unallocated workspace" assertion error. + (issue 4206) +
  • + Fixed NPE in various Maven reporters caused by Hudson core problem. + (issue 4192) +
  • + Show warning if zero value entered for #builds/#days to save for discarding old builds + (issue 4110) +
  • + Added create-job CLI command. +
  • + Hudson now tracks why a slave is put offline. + (issue 2431) +
  • + User-settable descriptions for tests. +
  • + A history page with test count and duration charts. + (issue 2228) +
  • + A collapsible panel with test error details on the overview pages. +
  • + Skipped tests counts are included in tables. + (issue 1820) +
  • + New tests are shown in bold. + (issue 2046) +
  • + JUnit report improvements: A new extension point for contributing to test reports. +
+

What's new in 1.319 (2009/08/08)

+
    +
  • + Improved the start up error handling with slave.jar -jnlpUrl option. + (report) +
  • + Made hetero-list's include of descriptor config pages optional, so + that descriptors without config.jelly files don't break page rendering. + (See + here for background. +
  • + Moved Maven help files to maven-plugin. + (issue 3527) +
  • + Hudson shouldn't immediately launch a slave newly created via copy. + report +
  • + Added support for optional alternate Maven settings file for use + in embedded Maven for POM parsing as well as actual Maven + execution. + (issue 2575) +
  • + Added a test button to the PAM configuration to make sure Hudson has read access to + /etc/shadow + (report) +
  • + Users can define their own views +
  • + Added a /me url that points to the current user +
  • + Added a new password parameter type to the parameterized builds. + (report) +
  • + Matrix projects can now run sequentially + (issue 3028) +
  • + Hudson now allows builds of a single project to execute concurrently. +
+

What's new in 1.318 (2009/07/31)

+
    +
  • + Removed a problematic MIME type entry that prevents Hudson from deploying on JOnAS. + (report) +
  • + Hudson can't restart itself on Mac, so don't pretend that it can. + (report) +
  • + Fixed Maven plugin to properly use private repository (when + specified) when parsing POMs. + (issue 4102) +
  • + Edit Description worked incorrectly when default view is changed from All jobs. + (issue 4070) +
  • + Fixed a bug in JDK auto-installation to Windows with directories with whitespaces. + (issue 4118) +
  • + Added support for incremental Maven project builds, + using Maven's + make-like reactor mode. +
  • + Script console can now see classes from all the plugins, not just core. + (issue 4086) +
  • + slave.jar now has the -auth option to specify the credential for accessing Hudson + (report) +
  • + Debian package now depends on java2-runtime-headless instead of java2-runtime +
  • + Actions can now contribute environment variables. + (report) +
  • + Modified the reconnection logic for slaves connecting via JNLP so that it works better with protected Hudson. + (report) +
+

What's new in 1.317 (2009/07/24)

+
    +
  • + Fixed a bug in inferring root DN in non-anonymous LDAP environment. + (report) +
  • + Fixed a MissingResourceException for "Ajp13Listener.ShortPacket" + (issue 4053) +
  • + Fixed 500 error when requesting the zip URL. + (issue 4039) +
  • + Debian package now has 750 permission on /var/run/hudson and /var/lib/hudson to make ssh work + (issue 4047) +
  • + Fixed LinkageError in PAM authentication on Solaris. + (issue 3546) +
  • + Fixed a JDK path separator issue between Windows master and Unix slaves. +
  • + Fixed a memory leak in the remoting layer. + (issue 4045) +
  • + Fixed Maven dependency build order logic. + (issue 2736) +
  • + Renaming views and jobs, and deleting jobs should use POST instead of GET. + (discussion) +
  • + Improved the error diagnosis of "Processing failed due to a bug in the code" +
  • + Slaves expose more information via the remote API now. +
  • + Exported BUILD_ID to the remote API. + (report) +
  • + Don't let the slave TCP/IP connection port failure to prevent Hudson start up. + (report) +
  • + If the user sets up "Hudson's own" security realm, UI now asks the first admin user to be created. +
  • + Windows service now does log rotation and handles whitespace in path correctly. + (This is only applicable to newly installed services.) + (report) +
+

What's new in 1.316 (2009/07/17)

+
    +
  • + Matrix configuration should show a test trend. + (issue 840) +
  • + Fixed a possible NPE in installing Windows service. + (report) +
  • + Fixed a possible NPE in CrumbFilter.getCrumbIssuer. + (issue 3986) +
  • + Login may result in 403 if the user realm is delegated to container. + (issue 1235) +
  • + The --logfile option stopped working on Windows. + (issue 3272) +
  • + On-demand retention policy almost immediately turns off slaves. + (issue 3972) +
  • + Fixed "incomplete LifecycleExecutor" warning with Maven 2.2 + (issue 2373) +
  • + Fixed a bug in Winstone that may result in "unable to create new native thread" error + (report) +
  • + Fixed a possible NPEs with the slavestatus plugin. + (report) +
  • + Fixed a possible StringIndexOutOfBoundsException with Windows process execution. + (issue 4034) +
  • + Fixed an NPE when environment variables are enabled but no variables are set. + (issue 4032) +
  • + Added ibm-web-bnd.xmi to simplify the automated deployment with WebSphere. + (issue 3270) +
  • + When deleting the workspace of a matrix project, do so for all configurations. + (issue 3087) +
  • + Enclose URLs in angle brackets when sending mail. + (issue 3647) +
  • + Plugins can now hide classes in the core so that they can ship their own versions. + (report) +
  • + The default view is now configurable. +
  • + Tentatively added additional extension points to control queue behaviors. + (patch) +
  • + Added support for proxy authentication on non-NTLM systems + (issue 1920) +
  • + Added MIME type mapping for several well-known file extensions so that it works everywhere. + (issue 3803) +
+

What's new in 1.315 (2009/07/10)

+
    +
  • + Hudson failed to notice a build result status change if aborted builds + were in the middle. + (report) +
  • + TCP/IP hostname calculation of slaves may fail due in high latency network. + (issue 3981) +
  • + Expose MAVEN_OPTS as env. var, in addition to set it to Maven JVM. + (issue 3644) +
  • + Fixed winp.dll load problem on WebSphere + (report) +
  • + Subversion checkouts created files for symlinks + (issue 3949) +
  • + Hudson CLI now tries to connect to Hudson via plain TCP/IP, then fall back to tunneling over HTTP. +
  • + Added ability to exclude by author and revision property with Subversion polling trigger. +
  • + CLI slave agents show details of how it failed to connect. + (report) +
+

What's new in 1.314 (2009/07/02)

+
    +
  • + Fixed a possible "Cannot create a file when that file already exists" error in managed Windows slave launcher. + report +
  • + Made Hudson more robust in parsing CVS/Entries + report +
  • + Fixed a regression in the groovy CLI command + report +
  • + Fixed regression in handling of usernames containing <, often used by Mercurial. + (issue 3964) +
  • + Allow Maven projects to have their own artifact archiver settings. + (issue 3289) +
+

What's new in 1.313 (2009/06/26)

+
    +
  • + Added copy-job, delete-job, enable-job, and disable-job command. +
  • + Fixed a bug in the non-ASCII character handling in remote bulk file copy. + (report) +
  • + Supported self restart on all containers in Unix + (report) +
  • + Added Retry Logic to SCM Checkout +
  • + Fix bug in crumb validation when client is coming through a proxy. + (issue 3854) +
  • + Replaced "appears to be stuck" with an icon. + (issue 3891) +
  • + WebDAV deployment from Maven was failing with VerifyError. +
  • + Subversion checkout/update gets in an infinite loop when a previously valid password goes invalid. + (issue 2909) +
+

What's new in 1.312 (2009/06/23)

+
    +
  • + 1.311 jars were not properly signed +
  • + Subversion SCM browsers were not working. + (report) +
+

What's new in 1.311 (2009/06/19)

+
    +
  • + Gracefully handle IBM JVMs on PowerPC. + (issue 3875) +
  • + Fixed NPE with GlassFish v3 when CSRF protection is on. + (issue 3878) +
  • + Fixed a bug in CLI where the state of command executions may interfere with each other. +
  • + CLI should handle the situation gracefully if the server doesn't use crumb. +
  • + Fixed a performance problem in CLI execution. +
  • + Don't populate the default value of the Subversion local directory name. + (report) +
  • + Integrated SVNKit 1.3.0 +
  • + Implemented more intelligent polling assisted by commit-hook from SVN repository. + (details) +
  • + Subversion support is moved into a plugin to isolate SVNKit that has GPL-like license. +
  • + Fixed a performance problem in master/slave file copy. + (issue 3799) +
  • + Set time out to avoid infinite hang when SMTP servers don't respond in time. + (report) +
+

What's new in 1.310 (2009/06/14)

+
    +
  • + Ant/Maven installers weren't setting the file permissions on Unix. + (issue 3850) +
  • + Fixed cross-site scripting vulnerabilities, thanks to Steve Milner. +
  • + Changing number of executors for master node required Hudson restart. + (issue 3092) +
  • + Improved validation and help text regarding when number of executors setting may be zero. + (issue 2110) +
  • + NPE fix in the remote API if @xpath is used without @exclude. + (patch) +
  • + Expose the node name as 'NODE_NAME' environment varilable to build. +
  • + Added a CLI command to clear the job queue. + (report) +
  • + Sundry improvements to automatic tool installation. You no longer need to configure an absolute tool home directory. Also some Unix-specific fixes. +
  • + Generate nonce values to prevent cross site request forgeries. Extension point to customize the nonce generation algorithm. +
+

What's new in 1.309 (2009/05/31)

+
    +
  • + Reimplemented JDK auto installer to reduce Hudson footprint by 5MB. This also fix a failure to run on JBoss. + (report) +
+

What's new in 1.308 (2009/05/28)

+
    +
  • + Unit test trend graph was not displayed if there's no successful build. + (report) +
  • + init script ($HUDSON_HOME/init.groovy) is now run with uber-classloader. +
  • + Maven2 projects may fail with "Cannot lookup required component". + (issue 3706) +
  • + Toned down the form validation of JDK, Maven, Ant installations given that we can now auto-install them. +
  • + Ant can now be automatically installed from ant.apache.org. +
  • + Maven can now be automatically installed from maven.apache.org. +
+

What's new in 1.307 (2009/05/22)

+
    +
  • + AbstractProject.doWipeOutWorkspace() wasn't calling SCM.processWorkspaceBeforeDeletion. + (issue 3506) +
  • + X-Hudson header was sent for all views, not just the top page. + (report) +
  • + Remote API served incorrect absolute URLs when Hudson is run behind a reverse proxy. + (report) +
  • + Further improved the JUnit report parsing. + (report) +
  • + External job monitoring was ignoring the possible encoding difference between Hudson and the remote machine that executed the job. + (report) +
  • + Slave launch log was doing extra buffering that can prevent error logs (and so on) from showing up instantly. + (report) +
  • + Some failures in Windows batch files didn't cause Hudson to fail the build. + (report) +
+

What's new in 1.306 (2009/05/16)

+
    +
  • + Maven 2.1 support was not working on slaves. + (report) +
+

What's new in 1.305 (2009/05/16)

+
    +
  • + Fixed a bug that caused Hudson to delete slave workspaces too often. + (issue 3653) +
  • + If distributed build isn't enabled, slave selection drop-down shouldn't be displayed in the job config. +
  • + Added support for Svent 2.x SCM browsers. + (issue 3357) +
  • + Fixed unexpanded rootURL in CLI. + (report) +
  • + Trying to see the generated maven site results in 404. + (issue 3497) +
  • + Long lines in console output are now wrapped in most browsers. +
  • + Hudson can now automatically install JDKs from java.sun.com +
  • + The native m2 mode now works with Maven 2.1 + (issue 2373) +
+

What's new in 1.304 (2009/05/08)

+
    +
  • + CLI didn't work with "java -jar hudson.war" + (report) +
  • + Link to the jar file in the CLI usage page is made more robust. + (issue 3621) +
  • + "Build after other projects are built" wasn't loading the proper setting. + (issue 3284) +
  • + Hudson started as "java -jar hudson.war" can now restart itself on all Unix flavors. +
  • + When run on GlassFish, Hudson configures GF correctly to handle URI encoding always in UTF-8 +
  • + Added a new extension point to contribute fragment to UDP-based auto discovery. +
  • + Rolled back changes for HUDSON-3580 - workspace is once again deleted on svn checkout. + (issue 3580) +
+

What's new in 1.303 (2009/05/03)

+
    +
  • + Fixed a binary incompatibility in UpstreamCause that results in NoSuchMethodError. Regression in 1.302. + (report) +
  • + The "groovysh" CLI command puts "println" to server stdout, instead of CLI stdout. +
+

What's new in 1.302 (2009/05/01)

+
    +
  • + The elusive 'Not in GZIP format' exception is finally fixed thanks to cristiano_k's great detective work + (issue 2154) +
  • + Hudson kept relaunching the slave under the "on-demand" retention strategy. + (report) +
  • + Extra slash (/) included in path to workspace copy of svn external. + (issue 3533) +
  • + NPE prevents Hudson from starting up on some environments + (report) +
  • + Workspace deleted when subversion checkout happens. + (issue 3580) +
  • + Hudson now handles unexpected failures in trigger plugins more gracefully. +
  • + Use 8K buffer to improve remote file copy performance. + (issue 3524) +
  • + Hudson now has a CLI +
  • + Hudson's start up performance is improved by loading data concurrently. +
+

What's new in 1.301 (2009/04/25)

+
    +
  • + When a SCM plugin is uninstalled, projects using it should fall back to "No SCM". +
  • + When polling SCMs, boolean parameter sets default value collectly. +
  • + Sidebar build descriptions will not have "..." appended unless they have been truncated. + (issue 3541) +
  • + Workspace with symlink causes svn exception when updating externals. + (issue 3532) +
  • + Hudson now started bundling ssh-slaves plugin out of the box. +
  • + Added an extension point to programmatically contribute a Subversion authentication credential. + (report) +
  • + You can now configure which columns are displayed in a view. + "Last Stable" was also added as an optional column (not displayed by default). + (issue 3465) +
  • + Preventive node monitoring like /tmp size check, swap space size check can be now disabled selectively. + (issue 2596, + issue 2552) +
  • + Per-project read permission support. + (issue 2324) +
+ +

+Older changelogs can be found in a separate file + + + From c06e84a49e6413ace76aee47deda90f5742979db Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 25 Nov 2010 08:08:01 -0800 Subject: [PATCH 185/220] updated changelog --- changelog.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/changelog.html b/changelog.html index 2ad5713f34..a46a2ebd50 100644 --- a/changelog.html +++ b/changelog.html @@ -40,16 +40,18 @@ Upcoming changes

What's new in 1.386 (2010/11/19)

    From 9904974c0cd09c827f1a89c87a71b7d1dc9f5543 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 25 Nov 2010 08:12:33 -0800 Subject: [PATCH 186/220] updated with changes --- changelog.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/changelog.html b/changelog.html index a46a2ebd50..72a08ae9ae 100644 --- a/changelog.html +++ b/changelog.html @@ -48,9 +48,19 @@ Upcoming changes

    What's new in 1.386 (2010/11/19)

    From 39d905763b4da67dd7e7452531ae6193761c0b44 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 25 Nov 2010 09:09:44 -0800 Subject: [PATCH 187/220] marking the supported version --- .../main/java/hudson/model/TransientViewActionFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/TransientViewActionFactory.java b/core/src/main/java/hudson/model/TransientViewActionFactory.java index ac041ef363..9087b7f669 100644 --- a/core/src/main/java/hudson/model/TransientViewActionFactory.java +++ b/core/src/main/java/hudson/model/TransientViewActionFactory.java @@ -1,6 +1,7 @@ package hudson.model; import hudson.ExtensionList; +import hudson.ExtensionPoint; import java.util.ArrayList; import java.util.List; @@ -8,8 +9,9 @@ import java.util.List; /** * Extension point for adding transient {@link Action}s to {@link View}s. * + * @since 1.388 */ -public abstract class TransientViewActionFactory { +public abstract class TransientViewActionFactory implements ExtensionPoint { /** * returns a list of (transient) actions never null, may be empty From 776008c8c4c02537f54b667487ab4261645fbc63 Mon Sep 17 00:00:00 2001 From: willemv Date: Fri, 26 Nov 2010 14:23:44 +0000 Subject: [PATCH 188/220] Fixed boundary check error, and made variable names clearer. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@37113 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/tasks/MailSender.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/hudson/tasks/MailSender.java b/core/src/main/java/hudson/tasks/MailSender.java index 770aa47c28..0318247aaf 100644 --- a/core/src/main/java/hudson/tasks/MailSender.java +++ b/core/src/main/java/hudson/tasks/MailSender.java @@ -358,20 +358,23 @@ public class MailSender { return msg; } - private void includeCulpritsOf(AbstractProject upstreamBuild, AbstractBuild currentBuild, BuildListener listener, Set recipientList) throws AddressException { - AbstractBuild pb = currentBuild.getPreviousBuild(); - AbstractBuild ub = currentBuild.getUpstreamRelationshipBuild(upstreamBuild); - AbstractBuild upb = pb!=null ? pb.getUpstreamRelationshipBuild(upstreamBuild) : null; - if(pb==null && ub==null && upb==null) { - listener.getLogger().println("Unable to compute the changesets in "+ upstreamBuild +". Is the fingerprint configured?"); + private void includeCulpritsOf(AbstractProject upstreamProject, AbstractBuild currentBuild, BuildListener listener, Set recipientList) throws AddressException { + AbstractBuild upstreamBuild = currentBuild.getUpstreamRelationshipBuild(upstreamProject); + AbstractBuild previousBuild = currentBuild.getPreviousBuild(); + AbstractBuild previousBuildUpstreamBuild = previousBuild!=null ? previousBuild.getUpstreamRelationshipBuild(upstreamProject) : null; + if(previousBuild==null && upstreamBuild==null && previousBuildUpstreamBuild==null) { + listener.getLogger().println("Unable to compute the changesets in "+ upstreamProject +". Is the fingerprint configured?"); return; } - if(pb==null || ub==null || upb==null) { - listener.getLogger().println("Unable to compute the changesets in "+ upstreamBuild); + if(previousBuild==null || upstreamBuild==null || previousBuildUpstreamBuild==null) { + listener.getLogger().println("Unable to compute the changesets in "+ upstreamProject); return; } - for( AbstractBuild b=upb; b!=ub && b!=null; b=b.getNextBuild()) - recipientList.addAll(buildCulpritList(listener,b.getCulprits())); + AbstractBuild b=previousBuildUpstreamBuild; + do { + recipientList.addAll( buildCulpritList( listener, b.getCulprits() ) ); + b = b.getNextBuild(); + } while ( b != upstreamBuild && b != null ); } private Set buildCulpritList(BuildListener listener, Set culprits) throws AddressException { From b4929066c5eec5835bf3a77ce2016632c13fdd57 Mon Sep 17 00:00:00 2001 From: Seiji Sogabe Date: Fri, 26 Nov 2010 23:43:10 +0900 Subject: [PATCH 189/220] updated i18n(ja) --- .../main/resources/hudson/model/Job/index_ja.properties | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/main/resources/hudson/model/Job/index_ja.properties b/core/src/main/resources/hudson/model/Job/index_ja.properties index 293fe9dee3..977c6b4ab1 100644 --- a/core/src/main/resources/hudson/model/Job/index_ja.properties +++ b/core/src/main/resources/hudson/model/Job/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-2010, 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,5 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -This\ project\ is\ currently\ disabled=\u73FE\u5728\u3001\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F\u7121\u52B9\u3067\u3059\u3002 -Enable=\u6709\u52B9\u5316 \ No newline at end of file +This\ project\ is\ currently\ disabled=\u73fe\u5728\u3001\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u7121\u52b9\u3067\u3059\u3002 +Enable=\u6709\u52b9\u5316 +Disable\ Project=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u7121\u52b9\u5316 \ No newline at end of file From ab80dd2bf9f0cd8712eccd6e37530ce0426390f7 Mon Sep 17 00:00:00 2001 From: Alexandre Garnier Date: Fri, 26 Nov 2010 20:55:49 +0100 Subject: [PATCH 190/220] Add build number in tooltip of test results graph in job view. --- .../java/hudson/tasks/test/AbstractTestResultAction.java | 6 +++--- .../main/resources/hudson/tasks/test/Messages.properties | 6 +++--- .../main/resources/hudson/tasks/test/Messages_da.properties | 4 ++-- .../main/resources/hudson/tasks/test/Messages_de.properties | 6 +++--- .../main/resources/hudson/tasks/test/Messages_es.properties | 6 +++--- .../main/resources/hudson/tasks/test/Messages_fr.properties | 4 ++++ .../main/resources/hudson/tasks/test/Messages_ja.properties | 6 +++--- 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java b/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java index 304ce56c86..c84b096887 100644 --- a/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java +++ b/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java @@ -311,11 +311,11 @@ public abstract class AbstractTestResultAction Date: Fri, 26 Nov 2010 16:43:11 -0800 Subject: [PATCH 191/220] preparing for a release --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5804c7155a..3938f1dc41 100644 --- a/pom.xml +++ b/pom.xml @@ -56,10 +56,9 @@ THE SOFTWARE. http://hudson.glassfish.org/job/hudson-trunk - - scm:svn:https://guest@svn.dev.java.net/svn/hudson/branches/rc/ - scm:svn:https://svn.dev.java.net/svn/hudson/branches/rc/ - https://hudson.dev.java.net/source/browse/hudson/branches/rc/ + scm:git:git://github.com/hudson/hudson.git + scm:git:ssh://git@github.com/hudson/hudson.git + https://github.com/hudson/hudson From 3979d159e736834b7c8ad406ccb8c40bdead14b2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 26 Nov 2010 17:19:05 -0800 Subject: [PATCH 192/220] [maven-release-plugin] prepare release hudson-1_387 --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index f6e74eaf0e..fa99a56d8f 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.387-SNAPSHOT + 1.387 cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 750f23ed4a..126eaf679a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387-SNAPSHOT + 1.387 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index aac4500d23..d109661f9f 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387-SNAPSHOT + 1.387 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 106953a2f1..b23bc7e79c 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387-SNAPSHOT + 1.387 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 34fb4bfc69..26a9947885 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387-SNAPSHOT + 1.387 maven-plugin diff --git a/pom.xml b/pom.xml index 3938f1dc41..c8778b9370 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387-SNAPSHOT + 1.387 pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index d33d44615b..6fb1d0686c 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387-SNAPSHOT + 1.387 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index f3f503f5dd..5a2a338662 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.387-SNAPSHOT + 1.387 4.0.0 org.jvnet.hudson.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index f51b96960d..b0e97566ef 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387-SNAPSHOT + 1.387 ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 3b64e05d90..75683e036f 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387-SNAPSHOT + 1.387 ../pom.xml From 9f419cecee9da61fd68bbd50f87c6a3ae2d3b9d2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 26 Nov 2010 17:19:16 -0800 Subject: [PATCH 193/220] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index fa99a56d8f..28e9ca2cbb 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.387 + 1.388-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 126eaf679a..179041e7fc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387 + 1.388-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index d109661f9f..d03a8806c0 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387 + 1.388-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index b23bc7e79c..a3e01d8a02 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387 + 1.388-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 26a9947885..7c39418134 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387 + 1.388-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index c8778b9370..e9b06b864b 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387 + 1.388-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 6fb1d0686c..24c987d515 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387 + 1.388-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 5a2a338662..2e410f81a3 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.387 + 1.388-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index b0e97566ef..608e1416b4 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387 + 1.388-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 75683e036f..99f5585300 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.387 + 1.388-SNAPSHOT ../pom.xml From eb417cf67b8ea3784431e9152e085f799fde8719 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 27 Nov 2010 08:06:38 -0800 Subject: [PATCH 194/220] updated changelog for release --- changelog.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog.html b/changelog.html index 72a08ae9ae..e1a4219d50 100644 --- a/changelog.html +++ b/changelog.html @@ -46,7 +46,10 @@ Upcoming changes +

    What's new in 1.387 (2010/11/27)

    • Avoid AbstractMethodError in the executors rendering. @@ -62,7 +65,6 @@ Upcoming changes
    • "Restart Hudson" button should appear when a plugin is manually installed.
    -

    What's new in 1.386 (2010/11/19)

    • From 4451a9347d313f06efa4714a7f3f117c878621e6 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 27 Nov 2010 08:31:16 -0800 Subject: [PATCH 195/220] 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 588bd32c91..5942cff722 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.387) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Sat, 27 Nov 2010 08:24:52 -0800 + hudson (1.385) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. From 99ccaa860f316928cdb7b361a05cc20b81d099d5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 27 Nov 2010 09:02:27 -0800 Subject: [PATCH 196/220] Revert "1.387 special" This reverts commit 00e7372823917e77ab11929f6fbd7430c6ab96b7. --- core/src/main/java/hudson/Functions.java | 9 +-------- core/src/main/resources/lib/layout/layout.jelly | 2 +- war/src/main/webapp/images/i387.jpg | Bin 16015 -> 0 bytes 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 war/src/main/webapp/images/i387.jpg diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index 9cd32a36ad..1098c5add6 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -1298,11 +1298,4 @@ public class Functions { return Boolean.getBoolean("hudson.security.ArtifactsPermission"); } - /** - * 1.387 special - */ - public static String getBackgroundImage() { - // for one week. - return System.currentTimeMillis() < 1291363200000L ? "i387.jpg" : "hudson.png"; - } -} \ No newline at end of file +} diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly index 258f41eece..b4b51ad409 100644 --- a/core/src/main/resources/lib/layout/layout.jelly +++ b/core/src/main/resources/lib/layout/layout.jelly @@ -209,7 +209,7 @@ THE SOFTWARE.
      diff --git a/war/src/main/webapp/images/i387.jpg b/war/src/main/webapp/images/i387.jpg deleted file mode 100644 index 77acdc36536b8c535f6f433dc8422e7c2337088c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16015 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 Date: Sat, 27 Nov 2010 14:23:56 -0800 Subject: [PATCH 197/220] failure to UDP broadcast shouldn't kill Hudson --- core/src/main/java/hudson/model/Hudson.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index ea844812c7..4c650d5504 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -644,8 +644,12 @@ public final class Hudson extends Node implements ItemGroup, Stapl } else tcpSlaveAgentListener = null; - udpBroadcastThread = new UDPBroadcastThread(this); - udpBroadcastThread.start(); + try { + udpBroadcastThread = new UDPBroadcastThread(this); + udpBroadcastThread.start(); + } catch (IOException e) { + LOGGER.log(Level.WARNING, "Faild to broadcast over UDP",e); + } dnsMultiCast = new DNSMultiCast(this); updateComputerList(); From 1573ae80dc6d6d8d82bc934364375da6bfa630c1 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Dec 2010 11:04:14 -0500 Subject: [PATCH 198/220] Recording the previous commit. --- changelog.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index e1a4219d50..1abec5ddcf 100644 --- a/changelog.html +++ b/changelog.html @@ -40,7 +40,8 @@ Upcoming changes From 14d17c551a9c8229b59ee1cf702a7e30731764fb Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Dec 2010 11:05:29 -0500 Subject: [PATCH 199/220] [FIXED HUDSON-8106] fixed an abstract error. --- changelog.html | 3 +++ core/src/main/java/hudson/model/Executor.java | 22 +++++++++---------- core/src/main/java/hudson/model/Queue.java | 2 +- .../java/hudson/model/queue/Executables.java | 21 ++++++++++++++++++ 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/changelog.html b/changelog.html index 1abec5ddcf..8799b040db 100644 --- a/changelog.html +++ b/changelog.html @@ -42,6 +42,9 @@ Upcoming changes
      • Failure to UDP broadcast shouldn't kill the Hudson bootup process. +
      • + Fixed an AbstractMethodError in listing up executors. + (issue 8106)
      diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java index 58b5d02561..8263bc595e 100644 --- a/core/src/main/java/hudson/model/Executor.java +++ b/core/src/main/java/hudson/model/Executor.java @@ -26,6 +26,7 @@ package hudson.model; import hudson.model.Queue.Executable; import hudson.Util; import hudson.FilePath; +import hudson.model.queue.Executables; import hudson.model.queue.SubTask; import hudson.model.queue.Tasks; import hudson.model.queue.WorkUnit; @@ -269,7 +270,7 @@ public class Executor extends Thread implements ModelObject { public int getProgress() { Queue.Executable e = executable; if(e==null) return -1; - long d = getEstimatedDurationFor(e); + long d = Executables.getEstimatedDurationFor(e); if(d<0) return -1; int num = (int)(getElapsedTime()*100/d); @@ -290,7 +291,7 @@ public class Executor extends Thread implements ModelObject { if(e==null) return false; long elapsed = getElapsedTime(); - long d = getEstimatedDurationFor(e); + long d = Executables.getEstimatedDurationFor(e); if(d>=0) { // if it's taking 10 times longer than ETA, consider it stuck return d*10 < elapsed; @@ -322,7 +323,7 @@ public class Executor extends Thread implements ModelObject { Queue.Executable e = executable; if(e==null) return Messages.Executor_NotAvailable(); - long d = getEstimatedDurationFor(e); + long d = Executables.getEstimatedDurationFor(e); if(d<0) return Messages.Executor_NotAvailable(); long eta = d-getElapsedTime(); @@ -339,7 +340,7 @@ public class Executor extends Thread implements ModelObject { Queue.Executable e = executable; if(e==null) return -1; - long d = getEstimatedDurationFor(e); + long d = Executables.getEstimatedDurationFor(e); if(d<0) return -1; long eta = d-getElapsedTime(); @@ -379,7 +380,7 @@ public class Executor extends Thread implements ModelObject { if (isIdle()) return Math.max(finishTime, owner.getConnectTime()); else { - return Math.max(startTime + Math.max(0, getEstimatedDurationFor(executable)), + return Math.max(startTime + Math.max(0, Executables.getEstimatedDurationFor(executable)), System.currentTimeMillis() + 15000); } } @@ -421,14 +422,13 @@ public class Executor extends Thread implements ModelObject { /** * Returns the estimated duration for the executable. * Protects against {@link AbstractMethodError}s if the {@link Executable} implementation - * was compiled against Hudson < 1.383 + * was compiled against Hudson < 1.383 + * + * @deprecated as of 1.388 + * Use {@link Executables#getEstimatedDurationFor(Executable)} */ public static long getEstimatedDurationFor(Executable e) { - try { - return e.getEstimatedDuration(); - } catch (AbstractMethodError error) { - return e.getParent().getEstimatedDuration(); - } + return Executables.getEstimatedDurationFor(e); } /** diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index c41289241f..3d821747c6 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -1116,7 +1116,7 @@ public class Queue extends ResourceController implements Saveable { * Estimate of how long will it take to execute this executable. * Measured in milliseconds. * - * Please, consider using {@link Executor#getEstimatedDurationFor(Executable)} + * Please, consider using {@link Executables#getEstimatedDurationFor(Executable)} * to protected against AbstractMethodErrors! * * @return -1 if it's impossible to estimate. diff --git a/core/src/main/java/hudson/model/queue/Executables.java b/core/src/main/java/hudson/model/queue/Executables.java index e8533ad5e9..efa041203e 100644 --- a/core/src/main/java/hudson/model/queue/Executables.java +++ b/core/src/main/java/hudson/model/queue/Executables.java @@ -65,4 +65,25 @@ public class Executables { private static SubTask _getParentOf(Executable e) { return e.getParent(); } + + /** + * Returns the estimated duration for the executable. + * Protects against {@link AbstractMethodError}s if the {@link Executable} implementation + * was compiled against Hudson < 1.383 + */ + public static long getEstimatedDurationFor(Executable e) { + try { + return _getEstimatedDuration(e); + } catch (AbstractMethodError error) { + return e.getParent().getEstimatedDuration(); + } + } + + /** + * A pointless function to work around what appears to be a HotSpot problem. See HUDSON-5756 and bug 6933067 + * on BugParade for more details. + */ + private static long _getEstimatedDuration(Executable e) { + return e.getEstimatedDuration(); + } } From 7984e31026a05a2585a149bc6ad55158e0ea6a6b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Dec 2010 11:20:46 -0500 Subject: [PATCH 200/220] [FIXED HUDSON-8060] Slaves launched by JNLP fail to reprot their version numbers. --- changelog.html | 3 +++ remoting/src/main/java/hudson/remoting/Launcher.java | 7 +++---- remoting/src/main/java/hudson/remoting/jnlp/Main.java | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/changelog.html b/changelog.html index 8799b040db..a428ba597d 100644 --- a/changelog.html +++ b/changelog.html @@ -45,6 +45,9 @@ Upcoming changes
    • Fixed an AbstractMethodError in listing up executors. (issue 8106) +
    • + Slaves launched by JNLP fail to reprot their version numbers. + (issue 8060) diff --git a/remoting/src/main/java/hudson/remoting/Launcher.java b/remoting/src/main/java/hudson/remoting/Launcher.java index 57658594c5..9cddcdc336 100644 --- a/remoting/src/main/java/hudson/remoting/Launcher.java +++ b/remoting/src/main/java/hudson/remoting/Launcher.java @@ -159,7 +159,6 @@ public class Launcher { } public static void main(String... args) throws Exception { - computeVersion(); Launcher launcher = new Launcher(); CmdLineParser parser = new CmdLineParser(launcher); try { @@ -439,7 +438,7 @@ public class Launcher { return File.pathSeparatorChar==';'; } - private static void computeVersion() { + private static String computeVersion() { Properties props = new Properties(); try { InputStream is = Launcher.class.getResourceAsStream("hudson-version.properties"); @@ -448,11 +447,11 @@ public class Launcher { } catch (IOException e) { e.printStackTrace(); } - VERSION = props.getProperty("version", "?"); + return props.getProperty("version", "?"); } /** * Version number of Hudson this slave.jar is from. */ - public static String VERSION = "?"; + public static final String VERSION = computeVersion(); } diff --git a/remoting/src/main/java/hudson/remoting/jnlp/Main.java b/remoting/src/main/java/hudson/remoting/jnlp/Main.java index b80638f8e0..18cc59f62c 100644 --- a/remoting/src/main/java/hudson/remoting/jnlp/Main.java +++ b/remoting/src/main/java/hudson/remoting/jnlp/Main.java @@ -23,6 +23,7 @@ */ package hudson.remoting.jnlp; +import hudson.remoting.Launcher; import org.kohsuke.args4j.Option; import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.Argument; From 1168ddff5da6e2f84065949200b1ce92fd207d1d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Dec 2010 11:44:34 -0500 Subject: [PATCH 201/220] [FIXED HUDSON-7937] Restarting Hudson via debian init script didn't wait for the process to really terminate. --- changelog.html | 3 +++ debian/debian/hudson.init | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/changelog.html b/changelog.html index a428ba597d..1835a269f7 100644 --- a/changelog.html +++ b/changelog.html @@ -48,6 +48,9 @@ Upcoming changes
    • Slaves launched by JNLP fail to reprot their version numbers. (issue 8060) +
    • + Restarting Hudson via debian init script didn't wait for the process to really terminate. + (issue 7937) diff --git a/debian/debian/hudson.init b/debian/debian/hudson.init index ceb1c3c6cb..45a2e2879a 100644 --- a/debian/debian/hudson.init +++ b/debian/debian/hudson.init @@ -146,6 +146,12 @@ do_stop() case "$?" in 0) $DAEMON $DAEMON_ARGS --stop || return 2 + # wait for the process to really terminate + while true; + do + sleep 1 + $DAEMON $DAEMON_ARGS --running || break + done ;; *) force_stop || return 3 From 35ddff19e02edf4c2ecf607faa6997a69669eadd Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Dec 2010 11:51:25 -0500 Subject: [PATCH 202/220] recording changes merged in 768abac9b1c6c83c6f56a62fa162b52900d14905 --- changelog.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/changelog.html b/changelog.html index 1835a269f7..95658630bb 100644 --- a/changelog.html +++ b/changelog.html @@ -51,6 +51,17 @@ Upcoming changes
    • Restarting Hudson via debian init script didn't wait for the process to really terminate. (issue 7937) +
    • + Test history with long build records had a scalability problem. + (issue 4621) +
    • + Added the build number to the test result graph tooltip. +
    • + Added a new extension point to contribute transient View actions. +
    • + Added "disable project" button. +
    • + Added "set-build-description" CLI command. From 2244e683625d4d5a1992f257ad2f0f68bf123644 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Dec 2010 11:54:43 -0500 Subject: [PATCH 203/220] creating a new RC branch --- changelog.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/changelog.html b/changelog.html index 95658630bb..12074e5972 100644 --- a/changelog.html +++ b/changelog.html @@ -39,6 +39,14 @@ Upcoming changes + + + - - -

      What's new in 1.387 (2010/11/27)

        From a449d6e2e8aa9e8248eff3eb0f24f1658112d270 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Dec 2010 12:00:16 -0500 Subject: [PATCH 204/220] noting the i387 image in changelog since we see many reports --- changelog.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.html b/changelog.html index 12074e5972..d78da85fe5 100644 --- a/changelog.html +++ b/changelog.html @@ -87,6 +87,10 @@ Upcoming changes "Install as a service" now supports Vista and Windows 7.
      • "Restart Hudson" button should appear when a plugin is manually installed. +
      • + In this release only the background is changed until Dec 5th to i387 chip, + to celebrate our 1.387 release (the feature is time bombed and will revert + to the butler after that date.)

      What's new in 1.386 (2010/11/19)

        From e605d33c74d309e74cd2ef614a788e44a6272daf Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Dec 2010 16:36:17 -0500 Subject: [PATCH 205/220] made more comprehensive --- .gitignore | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.gitignore b/.gitignore index d9916aad36..3103ffd691 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,19 @@ work *.iml *.iws *.ipr +war/images/16x16 +war/images/24x24 +war/images/32x32 +war/images/48x48 +hudson.war +RPMS +SRPMS +debian/binary +debian/debian/hudson +debian/debian/hudson.substvars +debian/debian/files +debian/build-stamp +debian/configure-stamp +*.debhelper +*.debhelper.log + From ea06f60c1abe408ccb45c700421c0456ce00ef6d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Dec 2010 16:39:37 -0500 Subject: [PATCH 206/220] importing plugin POM from rev.37164. Since this file is controlled by the core release process, better to put it here --- plugins/pom.xml | 410 ++++++++++++++++++++ plugins/update-dependency-hudson-version.rb | 15 + 2 files changed, 425 insertions(+) create mode 100644 plugins/pom.xml create mode 100755 plugins/update-dependency-hudson-version.rb diff --git a/plugins/pom.xml b/plugins/pom.xml new file mode 100644 index 0000000000..a63ca7577b --- /dev/null +++ b/plugins/pom.xml @@ -0,0 +1,410 @@ + + + 4.0.0 + + org.jvnet.hudson + hudson + 1.7 + ../pom.xml + + + org.jvnet.hudson.plugins + plugin + Hudson plugin POM + 1.387 + pom + + + + ${user.name} + + + + + scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/plugins/ + scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/plugins/ + https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/plugins + + + + JIRA + http://issues.hudson-ci.org/ + + + + + + org.jvnet.hudson.main + maven-plugin + 1.387 + + + + + + + org.jvnet.hudson.main + hudson-war + war + 1.387 + test + + + org.jvnet.hudson.main + hudson-core + 1.387 + provided + + + org.jvnet.hudson.main + hudson-test-harness + 1.387 + test + + + org.jvnet.hudson.main + ui-samples-plugin + 1.387 + test + + + junit + junit + 4.3.1 + test + + + + javax.servlet + servlet-api + 2.4 + provided + + + + + + + ${project.artifactId} + + package + + + org.jvnet.hudson.tools + maven-hpi-plugin + 1.54 + true + + true + + + + org.kohsuke.stapler + maven-stapler-plugin + 1.12 + true + + + maven-release-plugin + 2.0-beta-9 + + + deploy hpi:upload hpi:announce + + + + org.jvnet.localizer + maven-localizer-plugin + 1.8 + + + + generate + + + Messages.properties + target/generated-sources/localizer + + + + + + + maven-javadoc-plugin + 2.2 + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0-rc-5 + + + test-in-groovy + + + generateTestStubs + testCompile + + + + + + ant + ant + 1.6.5 + + + + + maven-surefire-plugin + + + + hudson.udp + 33849 + + + + + + + + + + + + + + + accurev + active-directory + analysis-core + analysis-collector + analysis-pom + analysis-test + audit-trail + backup + batch-task + bazaar + bitkeeper + build-publisher + bugzilla + build-timeout + cccc + checkstyle + changelog-history + chucknorris + ci-game + claim + clearcase + clover + cmakebuilder + cmvc + codeplex + cobertura + copyarchiver + copyartifact + cppcheck + cpptest + cppunit + crap4j + crowd + cvs-tag + cygpath + deploy + description-setter + disk-usage + doclinks + downstream-buildview + downstream-ext + doxygen + dry + easyant + ec2 + email-ext + emma + emotional-hudson + extended-read-permission + findbugs + gallio + gant + gcal + gnat + googleanalytics + googlecode + gradle + grails + greenballs + grinder + groovy + hadoop + hello-world + harvest + htmlpublisher + hudsontrayapp + instant-messaging + ircbot + ivy + jabber + japex + javatest-report + javancss + javanet + javanet-uploader + javanet-trigger-installer + + jira + jmx + jobConfigHistory + jobrevision + join + jprt + jsunit + jswidgets + jwsdp-sqe + kagemai + lastfailureversioncolumn + lastsuccessversioncolumn + locked-files-report + locks-and-latches + mantis + maven1-snapshot-plugin + m2release + measurement-plots + mercurial + mibsr + msbuild + mstest + multiline-tabbar-plugin + mysql-auth + nant + naginator + nested-view + network-monitor + next-build-number + nunit + plot + perforce + phing + platformlabeler + polarion + port-allocator + powershell + pmd + promoted-builds + promoted-builds-simple + pvcs_scm + pview + pxe + qmakebuilder + rake + redmine + release + rotatews + ruby + rubyMetrics + sametime + schedule-failed-builds + scons + scp + secret + sectioned-view + seleniumhq + setenv + sidebar-link + sloccount + sonar + sourcemonitor + ssh + ssh-slaves + sfee + svncompat13 + svncompat14 + svn-tag + swarm + tasks + testabilityexplorer + text-finder + tfs + toolenv + trac + translation + tusarnotifier + twitter + url-change-trigger + URLSCM + validating-string-parameter + viewVC + violations + virtualbox + vmware + vss + warnings + webtestpresenter + ws7 + wsclean + xunit + xvnc + zentimestamp + terminal + + + + + m.g.o-public + http://maven.glassfish.org/content/groups/public/ + + true + + + false + + + + + + + m.g.o-public + http://maven.glassfish.org/content/groups/public/ + + true + + + false + + + + + diff --git a/plugins/update-dependency-hudson-version.rb b/plugins/update-dependency-hudson-version.rb new file mode 100755 index 0000000000..e220626f55 --- /dev/null +++ b/plugins/update-dependency-hudson-version.rb @@ -0,0 +1,15 @@ +#!/usr/bin/ruby +# update the version of Hudson that this POM depends on from $1 +require "rexml/document" +require "rexml/xpath" + +# version to update to +v=ARGV.shift + +pom = REXML::Document.new $stdin +pom.elements.each("//dependency[groupId='org.jvnet.hudson.main']") { |dep| + dep.elements["version"].text = v +} +pom.write $stdout + + From f3116222be07bb002bfef719492ec9614bff8c55 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Dec 2010 16:40:09 -0500 Subject: [PATCH 207/220] not practical to build all the modules anyway --- plugins/pom.xml | 180 ------------------------------------------------ 1 file changed, 180 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index a63ca7577b..87ff60f2ec 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -201,186 +201,6 @@ - - - - - - - - accurev - active-directory - analysis-core - analysis-collector - analysis-pom - analysis-test - audit-trail - backup - batch-task - bazaar - bitkeeper - build-publisher - bugzilla - build-timeout - cccc - checkstyle - changelog-history - chucknorris - ci-game - claim - clearcase - clover - cmakebuilder - cmvc - codeplex - cobertura - copyarchiver - copyartifact - cppcheck - cpptest - cppunit - crap4j - crowd - cvs-tag - cygpath - deploy - description-setter - disk-usage - doclinks - downstream-buildview - downstream-ext - doxygen - dry - easyant - ec2 - email-ext - emma - emotional-hudson - extended-read-permission - findbugs - gallio - gant - gcal - gnat - googleanalytics - googlecode - gradle - grails - greenballs - grinder - groovy - hadoop - hello-world - harvest - htmlpublisher - hudsontrayapp - instant-messaging - ircbot - ivy - jabber - japex - javatest-report - javancss - javanet - javanet-uploader - javanet-trigger-installer - - jira - jmx - jobConfigHistory - jobrevision - join - jprt - jsunit - jswidgets - jwsdp-sqe - kagemai - lastfailureversioncolumn - lastsuccessversioncolumn - locked-files-report - locks-and-latches - mantis - maven1-snapshot-plugin - m2release - measurement-plots - mercurial - mibsr - msbuild - mstest - multiline-tabbar-plugin - mysql-auth - nant - naginator - nested-view - network-monitor - next-build-number - nunit - plot - perforce - phing - platformlabeler - polarion - port-allocator - powershell - pmd - promoted-builds - promoted-builds-simple - pvcs_scm - pview - pxe - qmakebuilder - rake - redmine - release - rotatews - ruby - rubyMetrics - sametime - schedule-failed-builds - scons - scp - secret - sectioned-view - seleniumhq - setenv - sidebar-link - sloccount - sonar - sourcemonitor - ssh - ssh-slaves - sfee - svncompat13 - svncompat14 - svn-tag - swarm - tasks - testabilityexplorer - text-finder - tfs - toolenv - trac - translation - tusarnotifier - twitter - url-change-trigger - URLSCM - validating-string-parameter - viewVC - violations - virtualbox - vmware - vss - warnings - webtestpresenter - ws7 - wsclean - xunit - xvnc - zentimestamp - terminal - - m.g.o-public From 87756c19f0ccfc4225f2beef82256cbd895a7111 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Dec 2010 16:41:15 -0500 Subject: [PATCH 208/220] java.net migration means these services are no longer available. We can recreate them from Maven repository --- plugins/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index 87ff60f2ec..ddb38c4026 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -136,9 +136,8 @@ maven-release-plugin 2.0-beta-9 - - deploy hpi:upload hpi:announce + deploy From e30e2ea4f996b880a48ecab47043fb6c8e0d0323 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Dec 2010 16:43:49 -0500 Subject: [PATCH 209/220] corrected the Subversion repository --- plugins/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index ddb38c4026..b8aabd1978 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -24,9 +24,9 @@ Maven infers the wrong value if I don't specify it explicitly. --> - scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/plugins/ - scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/plugins/ - https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/plugins + scm:svn:https://guest@svn.java.net/svn/hudson~svn/trunk/hudson/plugins/ + scm:svn:https://svn.java.net/svn/hudson~svn/trunk/hudson/plugins/ + https://svn.java.net/svn/hudson~svn/trunk/hudson/plugins/ From 6e011bc7d3df0e4d3768c1f77e29babd27b52137 Mon Sep 17 00:00:00 2001 From: jtnord Date: Thu, 2 Dec 2010 22:24:49 +0000 Subject: [PATCH 210/220] Update .gitignore to ignore eclipse files. Correct (incorrect) comment in CronTabTest --- .gitignore | 5 +++++ core/src/test/java/hudson/scheduler/CronTabTest.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d9916aad36..b621f219cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,10 @@ target work +# IntelliJ project files *.iml *.iws *.ipr +# eclipse project file +.settings +.classpath +.project \ No newline at end of file diff --git a/core/src/test/java/hudson/scheduler/CronTabTest.java b/core/src/test/java/hudson/scheduler/CronTabTest.java index f6824496cf..89ed0456ca 100644 --- a/core/src/test/java/hudson/scheduler/CronTabTest.java +++ b/core/src/test/java/hudson/scheduler/CronTabTest.java @@ -84,7 +84,7 @@ public class CronTabTest extends TestCase { } public void testFloor3() throws Exception { - // conflict between DoM and DoW. In this we need to find a day that's the last day of a month and Sunday in 2010 + // conflict between DoM and DoW. In this we need to find a day that's the first day of a month and Sunday in 2010 CronTab x = new CronTab("0 0 1 * 0"); Calendar c = new GregorianCalendar(2011,0,1,15,55); // the last such day in 2010 is Aug 1st From 63ff1a9a6dfa36125a398d2889cf92e35fec5c7b Mon Sep 17 00:00:00 2001 From: alanharder Date: Thu, 2 Dec 2010 15:05:50 -0800 Subject: [PATCH 211/220] Merge r37113 from https://svn.java.net/svn/hudson~svn by willemv: Fixed boundary check error, and made variable names clearer. --- .../main/java/hudson/tasks/MailSender.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/hudson/tasks/MailSender.java b/core/src/main/java/hudson/tasks/MailSender.java index 770aa47c28..0d861774c3 100644 --- a/core/src/main/java/hudson/tasks/MailSender.java +++ b/core/src/main/java/hudson/tasks/MailSender.java @@ -358,20 +358,23 @@ public class MailSender { return msg; } - private void includeCulpritsOf(AbstractProject upstreamBuild, AbstractBuild currentBuild, BuildListener listener, Set recipientList) throws AddressException { - AbstractBuild pb = currentBuild.getPreviousBuild(); - AbstractBuild ub = currentBuild.getUpstreamRelationshipBuild(upstreamBuild); - AbstractBuild upb = pb!=null ? pb.getUpstreamRelationshipBuild(upstreamBuild) : null; - if(pb==null && ub==null && upb==null) { - listener.getLogger().println("Unable to compute the changesets in "+ upstreamBuild +". Is the fingerprint configured?"); + private void includeCulpritsOf(AbstractProject upstreamProject, AbstractBuild currentBuild, BuildListener listener, Set recipientList) throws AddressException { + AbstractBuild upstreamBuild = currentBuild.getUpstreamRelationshipBuild(upstreamProject); + AbstractBuild previousBuild = currentBuild.getPreviousBuild(); + AbstractBuild previousBuildUpstreamBuild = previousBuild!=null ? previousBuild.getUpstreamRelationshipBuild(upstreamProject) : null; + if(previousBuild==null && upstreamBuild==null && previousBuildUpstreamBuild==null) { + listener.getLogger().println("Unable to compute the changesets in "+ upstreamProject +". Is the fingerprint configured?"); return; } - if(pb==null || ub==null || upb==null) { - listener.getLogger().println("Unable to compute the changesets in "+ upstreamBuild); + if(previousBuild==null || upstreamBuild==null || previousBuildUpstreamBuild==null) { + listener.getLogger().println("Unable to compute the changesets in "+ upstreamProject); return; } - for( AbstractBuild b=upb; b!=ub && b!=null; b=b.getNextBuild()) + AbstractBuild b=previousBuildUpstreamBuild; + do { recipientList.addAll(buildCulpritList(listener,b.getCulprits())); + b = b.getNextBuild(); + } while ( b != upstreamBuild && b != null ); } private Set buildCulpritList(BuildListener listener, Set culprits) throws AddressException { From 47c61e03007f0808406aebe7b0658600fa4e43e6 Mon Sep 17 00:00:00 2001 From: Seiji Sogabe Date: Sat, 4 Dec 2010 21:04:05 +0900 Subject: [PATCH 212/220] throw AccessDeniedException if "Authentication Token" is invalid. --- changelog.html | 4 +++- core/src/main/java/hudson/model/BuildAuthorizationToken.java | 2 ++ core/src/main/resources/hudson/model/Messages.properties | 2 ++ core/src/main/resources/hudson/model/Messages_ja.properties | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index 12074e5972..c20f211091 100644 --- a/changelog.html +++ b/changelog.html @@ -40,7 +40,9 @@ Upcoming changes diff --git a/core/src/main/java/hudson/model/BuildAuthorizationToken.java b/core/src/main/java/hudson/model/BuildAuthorizationToken.java index 2af173ca7e..af45008204 100644 --- a/core/src/main/java/hudson/model/BuildAuthorizationToken.java +++ b/core/src/main/java/hudson/model/BuildAuthorizationToken.java @@ -30,6 +30,7 @@ import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import java.io.IOException; +import org.acegisecurity.AccessDeniedException; /** * Authorization token to allow projects to trigger themselves under the secured environment. @@ -66,6 +67,7 @@ public final class BuildAuthorizationToken { String providedToken = req.getParameter("token"); if (providedToken != null && providedToken.equals(token.token)) return; + throw new AccessDeniedException(Messages.BuildAuthorizationToken_InvalidTokenProvided()); } project.checkPermission(AbstractProject.BUILD); diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties index 3879d4231b..970c833070 100644 --- a/core/src/main/resources/hudson/model/Messages.properties +++ b/core/src/main/resources/hudson/model/Messages.properties @@ -283,3 +283,5 @@ CLI.keep-build.shortDescription=Mark the build to keep the build forever. CLI.quiet-down.shortDescription=Quiet down Hudson, in preparation for a restart. Don''t start any builds. CLI.cancel-quiet-down.shortDescription=Cancel the effect of the "quiet-down" command. CLI.reload-configuration.shortDescription=Discard all the loaded data in memory and reload everything from file system. Useful when you modified config files directly on disk. + +BuildAuthorizationToken.InvalidTokenProvided=Invalid token provided. \ No newline at end of file diff --git a/core/src/main/resources/hudson/model/Messages_ja.properties b/core/src/main/resources/hudson/model/Messages_ja.properties index 35e5c40900..ec1b766b56 100644 --- a/core/src/main/resources/hudson/model/Messages_ja.properties +++ b/core/src/main/resources/hudson/model/Messages_ja.properties @@ -267,3 +267,4 @@ CLI.connect-node.shortDescription=\u30ce\u30fc\u30c9\u3068\u518d\u63a5\u7d9a\u30 CLI.online-node.shortDescription=\u76f4\u524d\u306b\u5b9f\u884c\u3057\u305f"online-node"\u30b3\u30de\u30f3\u30c9\u3092\u53d6\u308a\u6d88\u3057\u3001\u30d3\u30eb\u30c9\u3092\u5b9f\u884c\u3059\u308b\u30ce\u30fc\u30c9\u306e\u4f7f\u7528\u3092\u518d\u958b\u3057\u307e\u3059\u3002 CLI.offline-node.shortDescription="online-node"\u30b3\u30de\u30f3\u30c9\u304c\u5b9f\u884c\u3055\u308c\u308b\u307e\u3067\u3001\u30d3\u30eb\u30c9\u3092\u5b9f\u884c\u3059\u308b\u30ce\u30fc\u30c9\u306e\u4f7f\u7528\u3092\u4e00\u6642\u7684\u306b\u505c\u6b62\u3057\u307e\u3059\u3002 +BuildAuthorizationToken.InvalidTokenProvided=\u8a8d\u8a3c\u30c8\u30fc\u30af\u30f3\u304c\u9593\u9055\u3063\u3066\u3044\u307e\u3059\u3002 \ No newline at end of file From 6cd98231049803905f39c492303e6d8680507a17 Mon Sep 17 00:00:00 2001 From: Seiji Sogabe Date: Sat, 4 Dec 2010 22:25:13 +0900 Subject: [PATCH 213/220] Removed unused import. --- core/src/main/java/hudson/model/AbstractProject.java | 1 - core/src/main/java/hudson/model/Hudson.java | 1 - core/src/main/java/hudson/model/JDK.java | 1 - core/src/main/java/hudson/model/Run.java | 2 -- core/src/main/java/hudson/security/ACL.java | 2 +- core/src/main/java/hudson/slaves/ComputerLauncher.java | 3 --- core/src/main/java/hudson/tasks/junit/History.java | 3 +-- 7 files changed, 2 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 869c2d8245..21026297a1 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -26,7 +26,6 @@ */ package hudson.model; -import java.util.regex.Matcher; import java.util.regex.Pattern; import antlr.ANTLRException; import hudson.AbortException; diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 4c650d5504..7b056b5570 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -2459,7 +2459,6 @@ public final class Hudson extends Node implements ItemGroup, Stapl } public synchronized void doTestPost( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException { - JSONObject form = req.getSubmittedForm(); rsp.sendRedirect("foo"); } diff --git a/core/src/main/java/hudson/model/JDK.java b/core/src/main/java/hudson/model/JDK.java index 3c2401e4e3..a32c421d01 100644 --- a/core/src/main/java/hudson/model/JDK.java +++ b/core/src/main/java/hudson/model/JDK.java @@ -29,7 +29,6 @@ import hudson.util.FormValidation; import hudson.Launcher; import hudson.Extension; import hudson.EnvVars; -import hudson.Util; import hudson.slaves.NodeSpecific; import hudson.tools.ToolInstallation; import hudson.tools.ToolDescriptor; diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index f2514b93e0..1617d06076 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -61,8 +61,6 @@ import hudson.util.ProcessTree; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FilterOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/core/src/main/java/hudson/security/ACL.java b/core/src/main/java/hudson/security/ACL.java index 5f4be83c9a..596a706abf 100644 --- a/core/src/main/java/hudson/security/ACL.java +++ b/core/src/main/java/hudson/security/ACL.java @@ -35,7 +35,7 @@ import hudson.model.Executor; * Gate-keeper that controls access to Hudson's model objects. * * @author Kohsuke Kawaguchi - * @see http://hudson.gotdns.com/wiki/display/HUDSON/Making+your+plugin+behave+in+secured+Hudson + * @see http://wiki.hudson-ci.org/display/HUDSON/Making+your+plugin+behave+in+secured+Hudson */ public abstract class ACL { /** diff --git a/core/src/main/java/hudson/slaves/ComputerLauncher.java b/core/src/main/java/hudson/slaves/ComputerLauncher.java index 99fe69366f..9307a5e355 100644 --- a/core/src/main/java/hudson/slaves/ComputerLauncher.java +++ b/core/src/main/java/hudson/slaves/ComputerLauncher.java @@ -30,13 +30,10 @@ import hudson.model.Computer; import hudson.model.Hudson; import hudson.model.TaskListener; import hudson.remoting.Channel; -import hudson.remoting.Channel.Listener; import hudson.util.DescriptorList; import hudson.util.StreamTaskListener; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; /** * Extension point to allow control over how {@link Computer}s are "launched", diff --git a/core/src/main/java/hudson/tasks/junit/History.java b/core/src/main/java/hudson/tasks/junit/History.java index 29e00f73b2..fe95268141 100644 --- a/core/src/main/java/hudson/tasks/junit/History.java +++ b/core/src/main/java/hudson/tasks/junit/History.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Tom Huybrechts, Yahoo!, Inc. + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Tom Huybrechts, Yahoo!, Inc., 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 @@ -50,7 +50,6 @@ import org.jfree.chart.renderer.category.StackedAreaRenderer; import org.jfree.data.category.CategoryDataset; import org.jfree.ui.RectangleInsets; import org.kohsuke.stapler.Stapler; -import org.kohsuke.stapler.StaplerRequest; /** * History of {@link hudson.tasks.test.TestObject} over time. From f06890e12756366e0852f84b8ef727b7dba361a9 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 4 Dec 2010 19:20:59 -0800 Subject: [PATCH 214/220] [maven-release-plugin] prepare release hudson-1_388 --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 28e9ca2cbb..ea3e5b03ef 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.388-SNAPSHOT + 1.388 cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 179041e7fc..4bb058fb78 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388-SNAPSHOT + 1.388 ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index d03a8806c0..3d5155f160 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388-SNAPSHOT + 1.388 ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index a3e01d8a02..2426b168af 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388-SNAPSHOT + 1.388 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 7c39418134..0d63b7e5d5 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388-SNAPSHOT + 1.388 maven-plugin diff --git a/pom.xml b/pom.xml index e9b06b864b..872c77ecac 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388-SNAPSHOT + 1.388 pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 24c987d515..5d30a994c9 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388-SNAPSHOT + 1.388 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 2e410f81a3..bdf13f7426 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.388-SNAPSHOT + 1.388 4.0.0 org.jvnet.hudson.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 608e1416b4..bd51ac0b7d 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388-SNAPSHOT + 1.388 ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 99f5585300..1f6d870aa1 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388-SNAPSHOT + 1.388 ../pom.xml From fac80b9a4f1cc70706d08006d728984fcb1952d4 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 4 Dec 2010 19:21:09 -0800 Subject: [PATCH 215/220] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index ea3e5b03ef..2deea1f357 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.388 + 1.389-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 4bb058fb78..c147b4c088 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388 + 1.389-SNAPSHOT ../pom.xml diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 3d5155f160..e3448e8440 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388 + 1.389-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 2426b168af..0bad3dce61 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388 + 1.389-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 0d63b7e5d5..711bda68a1 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388 + 1.389-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 872c77ecac..9c75aa0a2c 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388 + 1.389-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 5d30a994c9..29d9b59fcc 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388 + 1.389-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index bdf13f7426..b1dcc97405 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.388 + 1.389-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index bd51ac0b7d..e4be200bc8 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388 + 1.389-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 1f6d870aa1..72663f438b 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.388 + 1.389-SNAPSHOT ../pom.xml From 38fe8a64c6f8ceabf18df2cbc3a5cb7f0ef53487 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 4 Dec 2010 21:53:54 -0800 Subject: [PATCH 216/220] updated changelog for release --- changelog.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog.html b/changelog.html index d78da85fe5..3c8167fc83 100644 --- a/changelog.html +++ b/changelog.html @@ -46,7 +46,10 @@ Upcoming changes +

        What's new in 1.388 (2010/12/04)

        • Failure to UDP broadcast shouldn't kill the Hudson bootup process. @@ -71,7 +74,6 @@ Upcoming changes
        • Added "set-build-description" CLI command.
        -

        What's new in 1.387 (2010/11/27)

        • From 06cec8b035fc7c5c68a8e136392de358c9c4b293 Mon Sep 17 00:00:00 2001 From: Seiji Sogabe Date: Sun, 5 Dec 2010 22:41:18 +0900 Subject: [PATCH 217/220] i18n & l10n(ja). --- .../hudson/security/HudsonPrivateSecurityRealm/index.jelly | 4 ++-- .../HudsonPrivateSecurityRealm/index_ja.properties | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly index 77553dd122..8a391a69d3 100644 --- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly @@ -1,7 +1,7 @@ org.jvnet.hudson.main maven-plugin - 1.387 + 1.388 @@ -49,25 +49,25 @@ org.jvnet.hudson.main hudson-war war - 1.387 + 1.388 test org.jvnet.hudson.main hudson-core - 1.387 + 1.388 provided org.jvnet.hudson.main hudson-test-harness - 1.387 + 1.388 test org.jvnet.hudson.main ui-samples-plugin - 1.387 + 1.388 test @@ -98,7 +98,7 @@ org.jvnet.hudson.main maven-plugin - 1.387 + 1.388 From 56ebe8ffeb54995b23a7b9b51414b520f90461fb Mon Sep 17 00:00:00 2001 From: James Nord Date: Mon, 6 Dec 2010 13:37:50 +0000 Subject: [PATCH 220/220] Add enforcer version to the pom so we don't try and get 1.1-SNAPSHOT (as we want reproduceable builds!) --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 9c75aa0a2c..6e23c7d8ad 100644 --- a/pom.xml +++ b/pom.xml @@ -197,6 +197,7 @@ THE SOFTWARE. maven-enforcer-plugin + 1.0