From d69c7f678edad36ca685cbe6f23e765b32b38379 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 28 Sep 2009 19:58:53 +0000 Subject: [PATCH] Merged revisions 22140,22200,22202,22205,22237,22240,22242,22245 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r22140 | kohsuke | 2009-09-24 16:41:50 -0700 (Thu, 24 Sep 2009) | 1 line updating to a new version ........ r22200 | kohsuke | 2009-09-25 16:33:50 -0700 (Fri, 25 Sep 2009) | 1 line [maven-release-plugin] prepare release hudson-1_325 ........ r22202 | kohsuke | 2009-09-25 16:34:05 -0700 (Fri, 25 Sep 2009) | 1 line [maven-release-plugin] prepare for next development iteration ........ r22205 | kohsuke | 2009-09-25 17:09:38 -0700 (Fri, 25 Sep 2009) | 1 line updated changelog as a part of the release ........ r22237 | kohsuke | 2009-09-28 09:51:38 -0700 (Mon, 28 Sep 2009) | 1 line [HUDSON-4353] My fix had a crucial bug that prevents plugin updates from failing. ........ r22240 | kohsuke | 2009-09-28 10:37:51 -0700 (Mon, 28 Sep 2009) | 1 line [maven-release-plugin] prepare release hudson-1_326 ........ r22242 | kohsuke | 2009-09-28 10:39:05 -0700 (Mon, 28 Sep 2009) | 1 line [maven-release-plugin] prepare for next development iteration ........ r22245 | kohsuke | 2009-09-28 11:24:40 -0700 (Mon, 28 Sep 2009) | 1 line updated changelog as a part of the release ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22250 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- core/src/main/java/hudson/ClassicPluginStrategy.java | 2 +- debian/changelog | 12 ++++++++++++ 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 | 4 ++-- 11 files changed, 23 insertions(+), 11 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 1f0b82fa14..b9423570f3 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.325-SNAPSHOT + 1.327-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index bc9888a2af..e0167687bc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.325-SNAPSHOT + 1.327-SNAPSHOT ../pom.xml diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index 7fde835e87..c0c93e2c04 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -324,7 +324,7 @@ public class ClassicPluginStrategy implements PluginStrategy { // timestamp check File explodeTime = new File(destDir,".timestamp"); - if(explodeTime.exists() && explodeTime.lastModified()!=archive.lastModified()) + if(explodeTime.exists() && explodeTime.lastModified()==archive.lastModified()) return; // no need to expand LOGGER.info("Extracting "+archive); diff --git a/debian/changelog b/debian/changelog index e7b92dcbe7..bc66ec9754 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +hudson (1.326) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Mon, 28 Sep 2009 11:25:11 -0700 + +hudson (1.325) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 25 Sep 2009 17:10:07 -0700 + hudson (1.324) 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 189d1f8c73..a41d4ba403 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.325-SNAPSHOT + 1.327-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 790a623ee2..2b57e317d3 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.325-SNAPSHOT + 1.327-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 11d0ee8214..d02d06a390 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.325-SNAPSHOT + 1.327-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 470a50f14c..2e73a3852c 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.325-SNAPSHOT + 1.327-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 296da28b75..a908f3b8f9 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.325-SNAPSHOT + 1.327-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 4b6655e03c..12e58c86f0 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.325-SNAPSHOT + 1.327-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index a4339d493b..3ffe2cf099 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.325-SNAPSHOT + 1.327-SNAPSHOT ../pom.xml @@ -113,7 +113,7 @@ THE SOFTWARE. - +