From dd808e1f1e1d79f72d3bb2b0d75596c829280ef6 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 2 Jul 2009 04:17:46 +0000 Subject: [PATCH] Merged revisions 19167-19168,19178,19183-19187,19190,19193-19194,19207,19209,19223,19236,19248,19254,19257,19338 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r19167 | kohsuke | 2009-06-23 16:08:06 -0700 (Tue, 23 Jun 2009) | 1 line merged back the changes in the RC branch ........ r19168 | kohsuke | 2009-06-23 16:12:46 -0700 (Tue, 23 Jun 2009) | 1 line fixed the bug ........ r19178 | swiest | 2009-06-24 02:43:21 -0700 (Wed, 24 Jun 2009) | 1 line Updated German localization of core module. ........ r19183 | kohsuke | 2009-06-24 08:57:07 -0700 (Wed, 24 Jun 2009) | 1 line forgot to update this ........ r19184 | kohsuke | 2009-06-24 09:06:59 -0700 (Wed, 24 Jun 2009) | 1 line fixed and improved the retry logic ........ r19185 | kohsuke | 2009-06-24 09:07:49 -0700 (Wed, 24 Jun 2009) | 1 line I think this is better ........ r19186 | kohsuke | 2009-06-24 09:08:02 -0700 (Wed, 24 Jun 2009) | 1 line fixed import statements ........ r19187 | kohsuke | 2009-06-24 09:57:52 -0700 (Wed, 24 Jun 2009) | 3 lines WebDAV deployment from Maven was failing with VerifyError. A test case requires a webdav server, I tried Milton but couldn't make it work without the source code. ........ r19190 | swiest | 2009-06-24 12:07:50 -0700 (Wed, 24 Jun 2009) | 1 line Deprecated Util.combine(long,String) method and rewrote its callers to use localizable resources. ........ r19193 | sogabe | 2009-06-24 14:53:02 -0700 (Wed, 24 Jun 2009) | 2 lines Updated Japanese localization. ........ r19194 | kohsuke | 2009-06-24 15:20:15 -0700 (Wed, 24 Jun 2009) | 1 line added default value support ........ r19207 | kohsuke | 2009-06-24 19:50:48 -0700 (Wed, 24 Jun 2009) | 1 line recording HUDSON-2909 for 1.313 ........ r19209 | kohsuke | 2009-06-24 19:52:21 -0700 (Wed, 24 Jun 2009) | 1 line creating a new RC branch ........ r19223 | kohsuke | 2009-06-25 10:43:06 -0700 (Thu, 25 Jun 2009) | 7 lines Replaced the icon with the one that came from the same icon set, plus hyperlinking the icon to Hudson Wiki so that we can be more informative. Tooltip on the icon doesn't work very well because the TD itself sets a tooltip, and we end up seeing the overlapped 2 tooltips (at least on my Firefox 3.0 on Ubuntu) ........ r19236 | kohsuke | 2009-06-25 18:06:50 -0700 (Thu, 25 Jun 2009) | 1 line applied a patch from Jeremy (or id:endolf). See http://www.nabble.com/Build-publisher-patch-svn-access-td24164282.html ........ r19248 | kohsuke | 2009-06-26 14:42:40 -0700 (Fri, 26 Jun 2009) | 1 line [maven-release-plugin] prepare release hudson-1_313 ........ r19254 | kohsuke | 2009-06-26 17:28:12 -0700 (Fri, 26 Jun 2009) | 1 line [maven-release-plugin] prepare for next development iteration ........ r19257 | kohsuke | 2009-06-26 18:20:24 -0700 (Fri, 26 Jun 2009) | 1 line updated changelog as a part of the release ........ r19338 | kohsuke | 2009-06-30 18:48:25 -0700 (Tue, 30 Jun 2009) | 1 line added maven-versions-plugin to pick up ones that got out of sync ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@19354 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- core/src/main/java/hudson/model/Run.java | 9 +++++++++ core/src/main/resources/lib/hudson/queue.jelly | 7 ++++--- debian/changelog | 6 ++++++ maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- push-m2-repo.rb | 5 ++++- remoting/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- war/resources/images/16x16/hourglass.gif | Bin 546 -> 1045 bytes war/resources/images/24x24/hourglass.gif | Bin 1065 -> 0 bytes 15 files changed, 32 insertions(+), 13 deletions(-) delete mode 100644 war/resources/images/24x24/hourglass.gif diff --git a/cli/pom.xml b/cli/pom.xml index b3ca038565..3d58aa1d4a 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.313-SNAPSHOT + 1.314-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 7ad3b67b08..d94cb065c0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.313-SNAPSHOT + 1.314-SNAPSHOT ../pom.xml diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index 65efd55d2c..43b92ef41f 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -581,6 +581,15 @@ public abstract class Run ,RunT extends Run - -   - +   + + + diff --git a/debian/changelog b/debian/changelog index efef147e98..1c8cb54c89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.313) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 26 Jun 2009 18:20:52 -0700 + hudson (1.312) 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 334ce6d873..7a8d609e68 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.313-SNAPSHOT + 1.314-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index cc42e9076d..7d617859ac 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.313-SNAPSHOT + 1.314-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 43c991afc5..8d151f0013 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.313-SNAPSHOT + 1.314-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 1e0e05197b..afda3c1fa8 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.313-SNAPSHOT + 1.314-SNAPSHOT pom Hudson main module diff --git a/push-m2-repo.rb b/push-m2-repo.rb index cf25c848cb..7edc2fdeeb 100644 --- a/push-m2-repo.rb +++ b/push-m2-repo.rb @@ -70,6 +70,9 @@ Dir.chdir("../plugins") do next unless File.exists?(name+"/pom.xml") updatePom(name+"/pom.xml",prev,ver) end + # in case anyone gets out of sync, this will bring them back to the current version, + # except that this only works for children nominated in the section. + system "mvn -N versions:update-child-modules" or fail system "svn commit -m 'bumping up POM version'" or fail system "mvn -N deploy" or fail -end \ No newline at end of file +end diff --git a/remoting/pom.xml b/remoting/pom.xml index 53516386c6..c3f3db8b6b 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.313-SNAPSHOT + 1.314-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index a5ad13f900..259a43f887 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.313-SNAPSHOT + 1.314-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 26e86e1b28..b03fdb9ee4 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.313-SNAPSHOT + 1.314-SNAPSHOT ../pom.xml diff --git a/war/resources/images/16x16/hourglass.gif b/war/resources/images/16x16/hourglass.gif index aa2d78f5fc8814f0b48027d69c23f4c72c3ad3ab..0b16a93e7670b4c1983428cd0accb40cdeafcc4b 100644 GIT binary patch literal 1045 zcmV+w1nT=oNk%w1VGsZi0Ou+I000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW3IP59EC2ui01yBW000Q`0RIX6mkZAk7f0~q8pu%Hm>4*WKtZxY z#u#-CZ`gHldYJTV49d{o||own`2g6<6KqcQd{HFQ19H+Ek1dY_{ zc=5ueOP4HLwru5!W$V|k-?m}N&drPWY+brx!-fMp79ZTP9eO# zoKf|h8|u=Uo5Y)&*<&}se9(knX_iinmc#yqWLq|t(?1c_2g}9rfgd~ZTq_Eo7c|YxncJ1 zO>_2ap0{AZf<=oKEnmKT#flZHR;}8ye$k%I3-)eZv~TO8O`A4t-@bj%t}T1_?mc^K z+qvW0&!60R@ZiD2hYue)a^(2&JkoIQHs?6FJdPh7up_WIRxH?N$$ zeeKkR3l}b3x^(&S<*QdNUcYwv%9SfuuU@@z?edN5mv7#@dH2rEJ9qBfy?giGy?YPu zUVeD@%7c4%9zA;W`0?YXPoF+}_U!rd=Wkv=fBEv|+c&S@zJ2@t{o8l%-o1bS{=

du|Ns9CqkysyQ2faPHb4hNg7O3d$3F(qGZGfg zZafnDQ5!rI6B@eZ1gbyWSjc>wSK2g#!JuKGavQgpPRIg-#6wL?%3`KLTb3{Np04aB zk#*$7)6?dTyK*wGbo8H{rorJ`G-0{GY@_rG3p^LMoe=SwBIB8ntk!u|#i!4ukxMkN z*)(8{m7r3qcDRSb4xODsO+7caM@`^q{JiZQr*P@(K81