From 527eee53e0a97e88ddc709a684cc5ba39f9a611a Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 18 Mar 2009 22:38:09 +0000 Subject: [PATCH 01/70] 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 02/70] 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 03/70] 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 04/70] [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 05/70] [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 06/70] 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 07/70] 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 08/70] [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 09/70] [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 10/70] 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 11/70] 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 12/70] 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 13/70] [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 14/70] [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 15/70] 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 16/70] [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 17/70] [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 18/70] [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 19/70] [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 20/70] 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 21/70] 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 22/70] [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 23/70] [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 24/70] 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 25/70] [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 26/70] [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 27/70] 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 28/70] [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 29/70] [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 30/70] 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 31/70] 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 32/70] 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 33/70] [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 34/70] [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 35/70] 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 36/70] 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 37/70] [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 38/70] [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 39/70] 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 40/70] [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 41/70] 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 42/70] 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 43/70] 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 44/70] [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 45/70] [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 46/70] 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 47/70] 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 48/70] 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 49/70] 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 50/70] [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 51/70] [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 52/70] 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 53/70] 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 54/70] 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 55/70] 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 56/70] [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 57/70] [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 58/70] 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 59/70] 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 60/70] 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 61/70] [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 62/70] 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 63/70] 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 64/70] 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 65/70] 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 66/70] [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 67/70] [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 68/70] 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 92a302b52f86acf62a36c05af74d3a1572561ac6 Mon Sep 17 00:00:00 2001 From: mindless Date: Sat, 20 Nov 2010 00:44:12 +0000 Subject: [PATCH 69/70] Fix bug from r36972 that caused some test failures.. that change wrote PRE/POSTAMBLE to Base64 encoded stream, so no preambles are found when the console bytes are scanned (as they got encoded). Fix this, and also apply the atomic-write change to encodeTo(Writer). git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@37064 71c3de6d-444a-0410-be80-ed276b4c234a --- .../src/main/java/hudson/console/ConsoleNote.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/hudson/console/ConsoleNote.java b/core/src/main/java/hudson/console/ConsoleNote.java index a0450aa59f..03fdffb572 100644 --- a/core/src/main/java/hudson/console/ConsoleNote.java +++ b/core/src/main/java/hudson/console/ConsoleNote.java @@ -157,18 +157,20 @@ public abstract class ConsoleNote implements Serializable, Describable implements Serializable, Describable implements Serializable, Describable Date: Sat, 20 Nov 2010 01:48:23 +0000 Subject: [PATCH 70/70] fixed test failures git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@37069 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/console/ConsoleNote.java | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/core/src/main/java/hudson/console/ConsoleNote.java b/core/src/main/java/hudson/console/ConsoleNote.java index 03fdffb572..e49a9ef537 100644 --- a/core/src/main/java/hudson/console/ConsoleNote.java +++ b/core/src/main/java/hudson/console/ConsoleNote.java @@ -151,26 +151,10 @@ public abstract class ConsoleNote implements Serializable, Describable implements Serializable, Describable