Merged revisions...

Merged revisions 17298-17300,17306-17307,17313,17320,17323,17326,17328-17330,17335,17337,17339,17348,17352,17358,17360-17361,17363-17364,17366,17368-17370,17384,17388,17390-17396,17398,17436-17437,17497,17499,17502,17505-17506,17508,17515 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ................ r17298 | kohsuke | 2009-04-20 11:06:05 -0700 (Mon, 20 Apr 2009) | 174 lines Merged revisions 17056,17060-17062,17064-17065,17083,17093,17097-17098,17104-17105,17107,17113,17115-17116,17121-17122,17124-17125,17155,17160,17174-17178,17184,17189-17190,17192,17249,17251,17254 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ................ r17056 | kohsuke | 2009-04-11 11:31:50 -0700 (Sat, 11 Apr 2009) | 29 lines Merged revisions 17033,17035-17037,17039,17041 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r17033 | kohsuke | 2009-04-10 15:22:13 -0700 (Fri, 10 Apr 2009) | 1 line [maven-release-plugin] prepare release hudson-1_298 ........ r17035 | kohsuke | 2009-04-10 15:22:42 -0700 (Fri, 10 Apr 2009) | 1 line [maven-release-plugin] prepare for next development iteration ........ r17036 | kohsuke | 2009-04-10 17:52:13 -0700 (Fri, 10 Apr 2009) | 1 line remove JDK6 dependency ........ r17037 | kohsuke | 2009-04-10 18:21:37 -0700 (Fri, 10 Apr 2009) | 1 line [maven-release-plugin] prepare release hudson-1_299 ........ r17039 | kohsuke | 2009-04-10 18:27:36 -0700 (Fri, 10 Apr 2009) | 1 line [maven-release-plugin] prepare for next development iteration ........ r17041 | kohsuke | 2009-04-10 19:14:19 -0700 (Fri, 10 Apr 2009) | 1 line updated changelog as a part of the release ........ ................ r17060 | kohsuke | 2009-04-11 12:04:54 -0700 (Sat, 11 Apr 2009) | 1 line doc improvement ................ r17061 | kohsuke | 2009-04-11 12:05:29 -0700 (Sat, 11 Apr 2009) | 1 line added a new utility method to build a classpath ................ r17062 | kohsuke | 2009-04-11 12:07:05 -0700 (Sat, 11 Apr 2009) | 1 line doc improvement ................ r17064 | kohsuke | 2009-04-11 14:17:15 -0700 (Sat, 11 Apr 2009) | 1 line supported the zip file as well ................ r17065 | kohsuke | 2009-04-11 14:18:57 -0700 (Sat, 11 Apr 2009) | 1 line added a convenience factory method to fork a connected JVM ................ r17083 | kohsuke | 2009-04-11 15:59:51 -0700 (Sat, 11 Apr 2009) | 1 line added a method to compute the host name. ................ r17093 | kohsuke | 2009-04-11 22:27:40 -0700 (Sat, 11 Apr 2009) | 1 line bug fix ................ r17097 | kohsuke | 2009-04-11 23:52:49 -0700 (Sat, 11 Apr 2009) | 1 line Added more hack to make Which.jarFile work on JDK6u10. ................ r17098 | kohsuke | 2009-04-11 23:55:55 -0700 (Sat, 11 Apr 2009) | 1 line ping is default now, so this message is rather pointless ................ r17104 | mindless | 2009-04-12 09:22:07 -0700 (Sun, 12 Apr 2009) | 5 lines [FIXED HUDSON-3444] Fix javadoc browsing. Stapler does not seem to call "<Type> doDynamic()" (though it does call "<Type> doSomethingElse()"), so reverted to "void doDynamic(req,rsp)". Could change this back after fix in Stapler.. ................ r17105 | kohsuke | 2009-04-12 13:59:53 -0700 (Sun, 12 Apr 2009) | 1 line simplified a bit ................ r17107 | kohsuke | 2009-04-12 14:27:03 -0700 (Sun, 12 Apr 2009) | 1 line fixed the type parameterization bug. This should be both binary and source compatible. ................ r17113 | sogabe | 2009-04-13 07:13:28 -0700 (Mon, 13 Apr 2009) | 1 line added @ExportedBean so that Remote API /computer/api/ works. ................ r17115 | kohsuke | 2009-04-13 09:15:03 -0700 (Mon, 13 Apr 2009) | 1 line added asynchronous execution support ................ r17116 | kohsuke | 2009-04-13 09:20:08 -0700 (Mon, 13 Apr 2009) | 1 line fixed parameterization ................ r17121 | kohsuke | 2009-04-13 11:47:12 -0700 (Mon, 13 Apr 2009) | 1 line improved error diagnostics ................ r17122 | kohsuke | 2009-04-13 12:04:49 -0700 (Mon, 13 Apr 2009) | 1 line added one more initialization hook. ................ r17124 | kohsuke | 2009-04-13 14:03:01 -0700 (Mon, 13 Apr 2009) | 1 line revised the abstraction. I feel better now. ................ r17125 | kohsuke | 2009-04-13 14:03:57 -0700 (Mon, 13 Apr 2009) | 3 lines I want the Plugin.postInitialize() to see all the other plugins, namely PluginManager.uberClassLoader. So this code needs to be in a separate method. ................ r17155 | kohsuke | 2009-04-14 14:12:15 -0700 (Tue, 14 Apr 2009) | 1 line Fixed a Jelly bug in CVS after-the-fact tagging ................ r17160 | kohsuke | 2009-04-14 14:38:29 -0700 (Tue, 14 Apr 2009) | 1 line added a 48x48 terminal.gif ................ r17174 | sogabe | 2009-04-14 19:19:01 -0700 (Tue, 14 Apr 2009) | 1 line added Japanese localization ................ r17175 | sogabe | 2009-04-14 19:20:04 -0700 (Tue, 14 Apr 2009) | 1 line fixed encoding... ................ r17176 | huybrechts | 2009-04-15 03:05:52 -0700 (Wed, 15 Apr 2009) | 1 line parameters should be serializable ................ r17177 | sogabe | 2009-04-15 03:58:56 -0700 (Wed, 15 Apr 2009) | 1 line updated Japanese localzation... orz ................ r17178 | jglick | 2009-04-15 06:55:33 -0700 (Wed, 15 Apr 2009) | 2 lines Picking up fix of STAPLER-5, which affected DirectoryBrowserSupport. Cf.: http://www.netbeans.org/nonav/issues/show_bug.cgi?id=162543 ................ r17184 | kohsuke | 2009-04-15 12:30:30 -0700 (Wed, 15 Apr 2009) | 1 line bumped up to 1.2.2-hudson-4 to improve diagnostics for http://www.nabble.com/Builds-don%27t-work%21%21-td23058973.html ................ r17189 | jglick | 2009-04-15 13:33:31 -0700 (Wed, 15 Apr 2009) | 1 line Warnings. ................ r17190 | kohsuke | 2009-04-15 14:04:25 -0700 (Wed, 15 Apr 2009) | 1 line further toning down this error message ................ r17192 | kohsuke | 2009-04-15 14:06:07 -0700 (Wed, 15 Apr 2009) | 1 line creating a new RC branch ................ r17249 | kohsuke | 2009-04-17 16:14:36 -0700 (Fri, 17 Apr 2009) | 1 line [maven-release-plugin] prepare release hudson-1_300 ................ r17251 | kohsuke | 2009-04-17 16:15:01 -0700 (Fri, 17 Apr 2009) | 1 line [maven-release-plugin] prepare for next development iteration ................ r17254 | kohsuke | 2009-04-17 17:48:04 -0700 (Fri, 17 Apr 2009) | 1 line updated changelog as a part of the release ................ ................ r17299 | kohsuke | 2009-04-20 11:09:45 -0700 (Mon, 20 Apr 2009) | 8 lines added a defensive check in case plugins fail to compute the changelog. This causes a Jelly error in the following line because the "set" variable is null. <j:set var="set" value="${it.changeSet}" /> <t:summary icon="notepad.gif"> <j:choose> <j:when test="${it.hasChangeSetComputed()}"> --> <st:include it="${set}" page="digest.jelly" /> ................ r17300 | kohsuke | 2009-04-20 11:14:12 -0700 (Mon, 20 Apr 2009) | 1 line When a SCM plugin is uninstalled, projects using it should fall back to "No SCM". ................ r17306 | kohsuke | 2009-04-20 15:05:05 -0700 (Mon, 20 Apr 2009) | 1 line control the version of antrun from one place, since Maven has a bug that prevents one reactor from using different versions of the same plugin ................ r17307 | jglick | 2009-04-20 15:07:24 -0700 (Mon, 20 Apr 2009) | 1 line Better capitalization. ................ r17313 | jglick | 2009-04-20 15:43:18 -0700 (Mon, 20 Apr 2009) | 2 lines Updating SezPoz to 1.4. ................ r17320 | kohsuke | 2009-04-20 17:13:54 -0700 (Mon, 20 Apr 2009) | 1 line [HUDSON-2154] Adding more error diagnostic report in an attempt to find out a root cause. This change should let us see what's in the stream. ................ r17323 | jglick | 2009-04-20 17:44:04 -0700 (Mon, 20 Apr 2009) | 5 lines [FIXED HUDSON-3502] Maven builds were not correctly using build wrappers. Module set builds were running wrappers but ignoring any environment variables they tried to set. Individual module builds (e.g. "Run in parallel" checked, or just click Build Now on a module) were ignoring wrappers altogether. Either way, $DISPLAY was not being set when the XVNC plugin was used. Note: there is a certain amount of code duplication in the various doRun implementations which could perhaps be factored out somewhere. ................ r17326 | redsolo | 2009-04-21 01:10:15 -0700 (Tue, 21 Apr 2009) | 1 line [FIXED HUDSON-3530] Put the argument for HUDSON_ARGS within quotation marks ................ r17328 | sogabe | 2009-04-21 06:16:01 -0700 (Tue, 21 Apr 2009) | 1 line override getDefaultParameterValue so that Boolean Parameter sets default value when polling SCMs. ................ r17329 | sogabe | 2009-04-21 08:04:40 -0700 (Tue, 21 Apr 2009) | 2 lines Added Japanese localization ................ r17330 | sogabe | 2009-04-21 09:00:16 -0700 (Tue, 21 Apr 2009) | 1 line Updated Japanese localization ................ r17335 | kohsuke | 2009-04-21 11:13:31 -0700 (Tue, 21 Apr 2009) | 1 line no need to propagate "isUnix" value. ................ r17337 | kohsuke | 2009-04-21 14:33:31 -0700 (Tue, 21 Apr 2009) | 5 lines with the introduction of Item.READ, I believe this test data now needs to grant that permission to anonymous. This change also implies that existing user will see regressions with this new change. Without the explicit access given to Item.READ, the users who were able to see everything before will suddenly not see any projects at all, until the permission is explicitly granted on Item.READ. OTOH, if I inherit Item.READ from Hudson.READ, the per-project permission won't work, becaues Hudson.READ is necessary to see the top page. ................ r17339 | kohsuke | 2009-04-21 15:11:07 -0700 (Tue, 21 Apr 2009) | 1 line the permission should be reset, or this breaks the test harness, and probably also harmful for other embedded usage. ................ r17348 | kohsuke | 2009-04-21 16:07:03 -0700 (Tue, 21 Apr 2009) | 3 lines Added an extension point to programmatically contribute a Subversion authentication credential. (<a href="http://www.nabble.com/Subversion-credentials-extension-point-td23159323.html">report</a>) ................ r17352 | jglick | 2009-04-21 17:29:43 -0700 (Tue, 21 Apr 2009) | 5 lines [FIXED HUDSON-3465] Permit configurable column lists in views, and add optional Last Stable column. Currently no columns have configurable data, but this can be added if desired (see issue report for demo). API changes: type change in ListView.columns and getColumns; ListViewColumn.shownByDefault added. [merged https://hudson.dev.java.net/svn/hudson/branches/configurable-view-columns-3465] ................ r17358 | kohsuke | 2009-04-21 18:19:38 -0700 (Tue, 21 Apr 2009) | 1 line adding no-op instance that's convenient sometimes ................ r17360 | kohsuke | 2009-04-21 18:32:40 -0700 (Tue, 21 Apr 2009) | 1 line forgot to put the copyright header ................ r17361 | kohsuke | 2009-04-21 18:47:03 -0700 (Tue, 21 Apr 2009) | 1 line [FIXED HUDSON-2596] Preventive node monitoring of slave health metrics can be now configured individually. This will be in Hudson 1.301. ................ r17363 | kohsuke | 2009-04-21 19:07:14 -0700 (Tue, 21 Apr 2009) | 1 line added help ................ r17364 | kohsuke | 2009-04-21 19:08:21 -0700 (Tue, 21 Apr 2009) | 1 line Stapler gets confused which one to invoke for .../script ................ r17366 | abayer | 2009-04-22 07:09:36 -0700 (Wed, 22 Apr 2009) | 1 line [FIXED HUDSON-3541] - ending appended to truncated descriptions no longer appended to all descriptions regardless of length. ................ r17368 | sogabe | 2009-04-22 07:37:57 -0700 (Wed, 22 Apr 2009) | 1 line added japanese help file and fix typo ................ r17369 | jglick | 2009-04-22 08:06:05 -0700 (Wed, 22 Apr 2009) | 1 line Removing redundant modifiers. ................ r17370 | jglick | 2009-04-22 08:07:03 -0700 (Wed, 22 Apr 2009) | 1 line Using new Saveable.NOOP. ................ r17384 | kaxelson | 2009-04-22 11:29:24 -0700 (Wed, 22 Apr 2009) | 2 lines HUDSON-3532: [FIXED HUDSON-3532] Changed getAbsolutePath to getCanonicalPath so it would handle symlinks. Also added necessary exception handling since getCanonicalPath throws IOException. ................ r17388 | kohsuke | 2009-04-22 11:45:03 -0700 (Wed, 22 Apr 2009) | 1 line added a workaround for SCM-406 ................ r17390 | kohsuke | 2009-04-22 13:21:12 -0700 (Wed, 22 Apr 2009) | 1 line [HUDSON-2324] Added an automatic migration of the data ................ r17391 | kohsuke | 2009-04-22 13:35:26 -0700 (Wed, 22 Apr 2009) | 1 line compilation problem. sorry. ................ r17392 | kohsuke | 2009-04-22 13:36:01 -0700 (Wed, 22 Apr 2009) | 1 line bumped up to 1.103 ................ r17393 | jglick | 2009-04-22 13:51:22 -0700 (Wed, 22 Apr 2009) | 1 line More helpful diagnostic. ................ r17394 | jglick | 2009-04-22 13:53:14 -0700 (Wed, 22 Apr 2009) | 1 line Possibly clearer presentation of options, and showing how to run a headless slave. ................ r17395 | kohsuke | 2009-04-22 14:09:46 -0700 (Wed, 22 Apr 2009) | 1 line [HUDSON-2324] Added an automatic migration of the data ................ r17396 | jglick | 2009-04-22 14:11:42 -0700 (Wed, 22 Apr 2009) | 1 line Strategy of trying multiple URLs was broken - gave up after the first. ................ r17398 | kohsuke | 2009-04-22 14:11:47 -0700 (Wed, 22 Apr 2009) | 1 line creating a new RC branch ................ r17436 | kohsuke | 2009-04-23 11:16:10 -0700 (Thu, 23 Apr 2009) | 1 line bug fix for the auto upgrade handling for HUDSON-2324. ................ r17437 | kohsuke | 2009-04-23 11:31:35 -0700 (Thu, 23 Apr 2009) | 1 line bug fix for the auto upgrade handling for HUDSON-2324. ................ r17497 | kohsuke | 2009-04-24 19:31:56 -0700 (Fri, 24 Apr 2009) | 1 line [maven-release-plugin] prepare release hudson-1_301 ................ r17499 | kohsuke | 2009-04-24 19:32:05 -0700 (Fri, 24 Apr 2009) | 1 line [maven-release-plugin] prepare for next development iteration ................ r17502 | kohsuke | 2009-04-24 23:55:10 -0700 (Fri, 24 Apr 2009) | 1 line adding an error check for releasing SNAPSHOT ................ r17505 | kohsuke | 2009-04-25 00:00:02 -0700 (Sat, 25 Apr 2009) | 1 line rolling back botched 1.301 release ................ r17506 | kohsuke | 2009-04-25 00:23:28 -0700 (Sat, 25 Apr 2009) | 1 line [maven-release-plugin] prepare release hudson-1_301 ................ r17508 | kohsuke | 2009-04-25 00:23:42 -0700 (Sat, 25 Apr 2009) | 1 line [maven-release-plugin] prepare for next development iteration ................ r17515 | kohsuke | 2009-04-25 02:24:08 -0700 (Sat, 25 Apr 2009) | 1 line updated changelog as a part of the release ................ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@17520 71c3de6d-444a-0410-be80-ed276b4c234a

Merged revisions...
Merged revisions 17298-17300,17306-17307,17313,17320,17323,17326,17328-17330,17335,17337,17339,17348,17352,17358,17360-17361,17363-17364,17366,17368-17370,17384,17388,17390-17396,17398,17436-17437,17497,17499,17502,17505-17506,17508,17515 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ................ r17298 | kohsuke | 2009-04-20 11:06:05 -0700 (Mon, 20 Apr 2009) | 174 lines Merged revisions 17056,17060-17062,17064-17065,17083,17093,17097-17098,17104-17105,17107,17113,17115-17116,17121-17122,17124-17125,17155,17160,17174-17178,17184,17189-17190,17192,17249,17251,17254 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ................ r17056 | kohsuke | 2009-04-11 11:31:50 -0700 (Sat, 11 Apr 2009) | 29 lines Merged revisions 17033,17035-17037,17039,17041 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r17033 | kohsuke | 2009-04-10 15:22:13 -0700 (Fri, 10 Apr 2009) | 1 line [maven-release-plugin] prepare release hudson-1_298 ........ r17035 | kohsuke | 2009-04-10 15:22:42 -0700 (Fri, 10 Apr 2009) | 1 line [maven-release-plugin] prepare for next development iteration ........ r17036 | kohsuke | 2009-04-10 17:52:13 -0700 (Fri, 10 Apr 2009) | 1 line remove JDK6 dependency ........ r17037 | kohsuke | 2009-04-10 18:21:37 -0700 (Fri, 10 Apr 2009) | 1 line [maven-release-plugin] prepare release hudson-1_299 ........ r17039 | kohsuke | 2009-04-10 18:27:36 -0700 (Fri, 10 Apr 2009) | 1 line [maven-release-plugin] prepare for next development iteration ........ r17041 | kohsuke | 2009-04-10 19:14:19 -0700 (Fri, 10 Apr 2009) | 1 line updated changelog as a part of the release ........ ................ r17060 | kohsuke | 2009-04-11 12:04:54 -0700 (Sat, 11 Apr 2009) | 1 line doc improvement ................ r17061 | kohsuke | 2009-04-11 12:05:29 -0700 (Sat, 11 Apr 2009) | 1 line added a new utility method to build a classpath ................ r17062 | kohsuke | 2009-04-11 12:07:05 -0700 (Sat, 11 Apr 2009) | 1 line doc improvement ................ r17064 | kohsuke | 2009-04-11 14:17:15 -0700 (Sat, 11 Apr 2009) | 1 line supported the zip file as well ................ r17065 | kohsuke | 2009-04-11 14:18:57 -0700 (Sat, 11 Apr 2009) | 1 line added a convenience factory method to fork a connected JVM ................ r17083 | kohsuke | 2009-04-11 15:59:51 -0700 (Sat, 11 Apr 2009) | 1 line added a method to compute the host name. ................ r17093 | kohsuke | 2009-04-11 22:27:40 -0700 (Sat, 11 Apr 2009) | 1 line bug fix ................ r17097 | kohsuke | 2009-04-11 23:52:49 -0700 (Sat, 11 Apr 2009) | 1 line Added more hack to make Which.jarFile work on JDK6u10. ................ r17098 | kohsuke | 2009-04-11 23:55:55 -0700 (Sat, 11 Apr 2009) | 1 line ping is default now, so this message is rather pointless ................ r17104 | mindless | 2009-04-12 09:22:07 -0700 (Sun, 12 Apr 2009) | 5 lines [FIXED HUDSON-3444] Fix javadoc browsing. Stapler does not seem to call "<Type> doDynamic()" (though it does call "<Type> doSomethingElse()"), so reverted to "void doDynamic(req,rsp)". Could change this back after fix in Stapler.. ................ r17105 | kohsuke | 2009-04-12 13:59:53 -0700 (Sun, 12 Apr 2009) | 1 line simplified a bit ................ r17107 | kohsuke | 2009-04-12 14:27:03 -0700 (Sun, 12 Apr 2009) | 1 line fixed the type parameterization bug. This should be both binary and source compatible. ................ r17113 | sogabe | 2009-04-13 07:13:28 -0700 (Mon, 13 Apr 2009) | 1 line added @ExportedBean so that Remote API /computer/api/ works. ................ r17115 | kohsuke | 2009-04-13 09:15:03 -0700 (Mon, 13 Apr 2009) | 1 line added asynchronous execution support ................ r17116 | kohsuke | 2009-04-13 09:20:08 -0700 (Mon, 13 Apr 2009) | 1 line fixed parameterization ................ r17121 | kohsuke | 2009-04-13 11:47:12 -0700 (Mon, 13 Apr 2009) | 1 line improved error diagnostics ................ r17122 | kohsuke | 2009-04-13 12:04:49 -0700 (Mon, 13 Apr 2009) | 1 line added one more initialization hook. ................ r17124 | kohsuke | 2009-04-13 14:03:01 -0700 (Mon, 13 Apr 2009) | 1 line revised the abstraction. I feel better now. ................ r17125 | kohsuke | 2009-04-13 14:03:57 -0700 (Mon, 13 Apr 2009) | 3 lines I want the Plugin.postInitialize() to see all the other plugins, namely PluginManager.uberClassLoader. So this code needs to be in a separate method. ................ r17155 | kohsuke | 2009-04-14 14:12:15 -0700 (Tue, 14 Apr 2009) | 1 line Fixed a Jelly bug in CVS after-the-fact tagging ................ r17160 | kohsuke | 2009-04-14 14:38:29 -0700 (Tue, 14 Apr 2009) | 1 line added a 48x48 terminal.gif ................ r17174 | sogabe | 2009-04-14 19:19:01 -0700 (Tue, 14 Apr 2009) | 1 line added Japanese localization ................ r17175 | sogabe | 2009-04-14 19:20:04 -0700 (Tue, 14 Apr 2009) | 1 line fixed encoding... ................ r17176 | huybrechts | 2009-04-15 03:05:52 -0700 (Wed, 15 Apr 2009) | 1 line parameters should be serializable ................ r17177 | sogabe | 2009-04-15 03:58:56 -0700 (Wed, 15 Apr 2009) | 1 line updated Japanese localzation... orz ................ r17178 | jglick | 2009-04-15 06:55:33 -0700 (Wed, 15 Apr 2009) | 2 lines Picking up fix of STAPLER-5, which affected DirectoryBrowserSupport. Cf.: http://www.netbeans.org/nonav/issues/show_bug.cgi?id=162543 ................ r17184 | kohsuke | 2009-04-15 12:30:30 -0700 (Wed, 15 Apr 2009) | 1 line bumped up to 1.2.2-hudson-4 to improve diagnostics for http://www.nabble.com/Builds-don%27t-work%21%21-td23058973.html ................ r17189 | jglick | 2009-04-15 13:33:31 -0700 (Wed, 15 Apr 2009) | 1 line Warnings. ................ r17190 | kohsuke | 2009-04-15 14:04:25 -0700 (Wed, 15 Apr 2009) | 1 line further toning down this error message ................ r17192 | kohsuke | 2009-04-15 14:06:07 -0700 (Wed, 15 Apr 2009) | 1 line creating a new RC branch ................ r17249 | kohsuke | 2009-04-17 16:14:36 -0700 (Fri, 17 Apr 2009) | 1 line [maven-release-plugin] prepare release hudson-1_300 ................ r17251 | kohsuke | 2009-04-17 16:15:01 -0700 (Fri, 17 Apr 2009) | 1 line [maven-release-plugin] prepare for next development iteration ................ r17254 | kohsuke | 2009-04-17 17:48:04 -0700 (Fri, 17 Apr 2009) | 1 line updated changelog as a part of the release ................ ................ r17299 | kohsuke | 2009-04-20 11:09:45 -0700 (Mon, 20 Apr 2009) | 8 lines added a defensive check in case plugins fail to compute the changelog. This causes a Jelly error in the following line because the "set" variable is null. <j:set var="set" value="${it.changeSet}" /> <t:summary icon="notepad.gif"> <j:choose> <j:when test="${it.hasChangeSetComputed()}"> --> <st:include it="${set}" page="digest.jelly" /> ................ r17300 | kohsuke | 2009-04-20 11:14:12 -0700 (Mon, 20 Apr 2009) | 1 line When a SCM plugin is uninstalled, projects using it should fall back to "No SCM". ................ r17306 | kohsuke | 2009-04-20 15:05:05 -0700 (Mon, 20 Apr 2009) | 1 line control the version of antrun from one place, since Maven has a bug that prevents one reactor from using different versions of the same plugin ................ r17307 | jglick | 2009-04-20 15:07:24 -0700 (Mon, 20 Apr 2009) | 1 line Better capitalization. ................ r17313 | jglick | 2009-04-20 15:43:18 -0700 (Mon, 20 Apr 2009) | 2 lines Updating SezPoz to 1.4. ................ r17320 | kohsuke | 2009-04-20 17:13:54 -0700 (Mon, 20 Apr 2009) | 1 line [HUDSON-2154] Adding more error diagnostic report in an attempt to find out a root cause. This change should let us see what's in the stream. ................ r17323 | jglick | 2009-04-20 17:44:04 -0700 (Mon, 20 Apr 2009) | 5 lines [FIXED HUDSON-3502] Maven builds were not correctly using build wrappers. Module set builds were running wrappers but ignoring any environment variables they tried to set. Individual module builds (e.g. "Run in parallel" checked, or just click Build Now on a module) were ignoring wrappers altogether. Either way, $DISPLAY was not being set when the XVNC plugin was used. Note: there is a certain amount of code duplication in the various doRun implementations which could perhaps be factored out somewhere. ................ r17326 | redsolo | 2009-04-21 01:10:15 -0700 (Tue, 21 Apr 2009) | 1 line [FIXED HUDSON-3530] Put the argument for HUDSON_ARGS within quotation marks ................ r17328 | sogabe | 2009-04-21 06:16:01 -0700 (Tue, 21 Apr 2009) | 1 line override getDefaultParameterValue so that Boolean Parameter sets default value when polling SCMs. ................ r17329 | sogabe | 2009-04-21 08:04:40 -0700 (Tue, 21 Apr 2009) | 2 lines Added Japanese localization ................ r17330 | sogabe | 2009-04-21 09:00:16 -0700 (Tue, 21 Apr 2009) | 1 line Updated Japanese localization ................ r17335 | kohsuke | 2009-04-21 11:13:31 -0700 (Tue, 21 Apr 2009) | 1 line no need to propagate "isUnix" value. ................ r17337 | kohsuke | 2009-04-21 14:33:31 -0700 (Tue, 21 Apr 2009) | 5 lines with the introduction of Item.READ, I believe this test data now needs to grant that permission to anonymous. This change also implies that existing user will see regressions with this new change. Without the explicit access given to Item.READ, the users who were able to see everything before will suddenly not see any projects at all, until the permission is explicitly granted on Item.READ. OTOH, if I inherit Item.READ from Hudson.READ, the per-project permission won't work, becaues Hudson.READ is necessary to see the top page. ................ r17339 | kohsuke | 2009-04-21 15:11:07 -0700 (Tue, 21 Apr 2009) | 1 line the permission should be reset, or this breaks the test harness, and probably also harmful for other embedded usage. ................ r17348 | kohsuke | 2009-04-21 16:07:03 -0700 (Tue, 21 Apr 2009) | 3 lines Added an extension point to programmatically contribute a Subversion authentication credential. (<a href="http://www.nabble.com/Subversion-credentials-extension-point-td23159323.html">report</a>) ................ r17352 | jglick | 2009-04-21 17:29:43 -0700 (Tue, 21 Apr 2009) | 5 lines [FIXED HUDSON-3465] Permit configurable column lists in views, and add optional Last Stable column. Currently no columns have configurable data, but this can be added if desired (see issue report for demo). API changes: type change in ListView.columns and getColumns; ListViewColumn.shownByDefault added. [merged https://hudson.dev.java.net/svn/hudson/branches/configurable-view-columns-3465] ................ r17358 | kohsuke | 2009-04-21 18:19:38 -0700 (Tue, 21 Apr 2009) | 1 line adding no-op instance that's convenient sometimes ................ r17360 | kohsuke | 2009-04-21 18:32:40 -0700 (Tue, 21 Apr 2009) | 1 line forgot to put the copyright header ................ r17361 | kohsuke | 2009-04-21 18:47:03 -0700 (Tue, 21 Apr 2009) | 1 line [FIXED HUDSON-2596] Preventive node monitoring of slave health metrics can be now configured individually. This will be in Hudson 1.301. ................ r17363 | kohsuke | 2009-04-21 19:07:14 -0700 (Tue, 21 Apr 2009) | 1 line added help ................ r17364 | kohsuke | 2009-04-21 19:08:21 -0700 (Tue, 21 Apr 2009) | 1 line Stapler gets confused which one to invoke for .../script ................ r17366 | abayer | 2009-04-22 07:09:36 -0700 (Wed, 22 Apr 2009) | 1 line [FIXED HUDSON-3541] - ending appended to truncated descriptions no longer appended to all descriptions regardless of length. ................ r17368 | sogabe | 2009-04-22 07:37:57 -0700 (Wed, 22 Apr 2009) | 1 line added japanese help file and fix typo ................ r17369 | jglick | 2009-04-22 08:06:05 -0700 (Wed, 22 Apr 2009) | 1 line Removing redundant modifiers. ................ r17370 | jglick | 2009-04-22 08:07:03 -0700 (Wed, 22 Apr 2009) | 1 line Using new Saveable.NOOP. ................ r17384 | kaxelson | 2009-04-22 11:29:24 -0700 (Wed, 22 Apr 2009) | 2 lines HUDSON-3532: [FIXED HUDSON-3532] Changed getAbsolutePath to getCanonicalPath so it would handle symlinks. Also added necessary exception handling since getCanonicalPath throws IOException. ................ r17388 | kohsuke | 2009-04-22 11:45:03 -0700 (Wed, 22 Apr 2009) | 1 line added a workaround for SCM-406 ................ r17390 | kohsuke | 2009-04-22 13:21:12 -0700 (Wed, 22 Apr 2009) | 1 line [HUDSON-2324] Added an automatic migration of the data ................ r17391 | kohsuke | 2009-04-22 13:35:26 -0700 (Wed, 22 Apr 2009) | 1 line compilation problem. sorry. ................ r17392 | kohsuke | 2009-04-22 13:36:01 -0700 (Wed, 22 Apr 2009) | 1 line bumped up to 1.103 ................ r17393 | jglick | 2009-04-22 13:51:22 -0700 (Wed, 22 Apr 2009) | 1 line More helpful diagnostic. ................ r17394 | jglick | 2009-04-22 13:53:14 -0700 (Wed, 22 Apr 2009) | 1 line Possibly clearer presentation of options, and showing how to run a headless slave. ................ r17395 | kohsuke | 2009-04-22 14:09:46 -0700 (Wed, 22 Apr 2009) | 1 line [HUDSON-2324] Added an automatic migration of the data ................ r17396 | jglick | 2009-04-22 14:11:42 -0700 (Wed, 22 Apr 2009) | 1 line Strategy of trying multiple URLs was broken - gave up after the first. ................ r17398 | kohsuke | 2009-04-22 14:11:47 -0700 (Wed, 22 Apr 2009) | 1 line creating a new RC branch ................ r17436 | kohsuke | 2009-04-23 11:16:10 -0700 (Thu, 23 Apr 2009) | 1 line bug fix for the auto upgrade handling for HUDSON-2324. ................ r17437 | kohsuke | 2009-04-23 11:31:35 -0700 (Thu, 23 Apr 2009) | 1 line bug fix for the auto upgrade handling for HUDSON-2324. ................ r17497 | kohsuke | 2009-04-24 19:31:56 -0700 (Fri, 24 Apr 2009) | 1 line [maven-release-plugin] prepare release hudson-1_301 ................ r17499 | kohsuke | 2009-04-24 19:32:05 -0700 (Fri, 24 Apr 2009) | 1 line [maven-release-plugin] prepare for next development iteration ................ r17502 | kohsuke | 2009-04-24 23:55:10 -0700 (Fri, 24 Apr 2009) | 1 line adding an error check for releasing SNAPSHOT ................ r17505 | kohsuke | 2009-04-25 00:00:02 -0700 (Sat, 25 Apr 2009) | 1 line rolling back botched 1.301 release ................ r17506 | kohsuke | 2009-04-25 00:23:28 -0700 (Sat, 25 Apr 2009) | 1 line [maven-release-plugin] prepare release hudson-1_301 ................ r17508 | kohsuke | 2009-04-25 00:23:42 -0700 (Sat, 25 Apr 2009) | 1 line [maven-release-plugin] prepare for next development iteration ................ r17515 | kohsuke | 2009-04-25 02:24:08 -0700 (Sat, 25 Apr 2009) | 1 line updated changelog as a part of the release ................ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@17520 71c3de6d-444a-0410-be80-ed276b4c234a
1744f6c0 · kohsuke · 59a13bb6 · 1744f6c0 · 1744f6c0 · 1744f6c0
13 changed file
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jvnet.hudson.main</groupId>
    <artifactId>pom</artifactId>
-    <version>1.301-SNAPSHOT</version>
+    <version>1.302-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>


--- 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<TopLevelItem>, Stapl
     */
    private transient final Map<Node,Computer> computers = new CopyOnWriteMap.Hash<Node,Computer>();

+    /**
+     * 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.
+     *
+     * <p>
+     * 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<TopLevelItem>, 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.
-     *
-     * <p>
-     * 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<TopLevelItem>, Stapl
     * <p>
     * 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.
+     *
+     * <p>
+     * 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 {

--- 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<Permission,Set<String>> grantedPermissions) {
-        if(Hudson.getInstance().isUpgradedFromBefore(new VersionNumber("1.301"))) {
+        if(Hudson.getInstance().isUpgradedFromBefore(new VersionNumber("1.300.*"))) {
            Set<String> f = grantedPermissions.get(Hudson.READ);
            if(f!=null) {
                Set<String> t = grantedPermissions.get(Item.READ);

--- a/core/src/test/java/hudson/util/VersionNumberTest.java
+++ b/core/src/test/java/hudson/util/VersionNumberTest.java
@@ -48,5 +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").equals(new VersionNumber("1.11.*")));
+        assertTrue(new VersionNumber("1.11.*").isNewerThan(new VersionNumber("1.11.9")));
    }
 }
--- a/debian/changelog
+++ b/debian/changelog
+hudson (1.301) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  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.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  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.

--- a/maven-agent/pom.xml
+++ b/maven-agent/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jvnet.hudson.main</groupId>
    <artifactId>pom</artifactId>
-    <version>1.301-SNAPSHOT</version>
+    <version>1.302-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  

--- a/maven-interceptor/pom.xml
+++ b/maven-interceptor/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jvnet.hudson.main</groupId>
    <artifactId>pom</artifactId>
-    <version>1.301-SNAPSHOT</version>
+    <version>1.302-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  

--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jvnet.hudson.main</groupId>
    <artifactId>pom</artifactId>
-    <version>1.301-SNAPSHOT</version>
+    <version>1.302-SNAPSHOT</version>
  </parent>

  <artifactId>maven-plugin</artifactId>

--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
  
  <groupId>org.jvnet.hudson.main</groupId>
  <artifactId>pom</artifactId>
-  <version>1.301-SNAPSHOT</version>
+  <version>1.302-SNAPSHOT</version>
  <packaging>pom</packaging>
  
  <name>Hudson main module</name>

--- 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
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jvnet.hudson.main</groupId>
    <artifactId>pom</artifactId>
-    <version>1.301-SNAPSHOT</version>
+    <version>1.302-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  

--- a/test/pom.xml
+++ b/test/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <artifactId>pom</artifactId>
    <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.301-SNAPSHOT</version>
+    <version>1.302-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.jvnet.hudson.main</groupId>

--- a/war/pom.xml
+++ b/war/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jvnet.hudson.main</groupId>
    <artifactId>pom</artifactId>
-    <version>1.301-SNAPSHOT</version>
+    <version>1.302-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  
@@ -106,14 +106,11 @@ THE SOFTWARE.
                <!-- dependencies that goes to unusual locations -->
                <resolveArtifact artifactId="remoting" tofile="${basedir}/target/generated-resources/WEB-INF/remoting.jar" />
                <resolveArtifact artifactId="remoting" tofile="${basedir}/target/generated-resources/WEB-INF/slave.jar" />
-                <resolveArtifact groupId="org.jvnet.hudson.winstone" artifactId="winstone" version="0.9.10-hudson-9" type="jar"
-                                 tofile="${basedir}/target/generated-resources/winstone.jar" />
+                <resolveArtifact groupId="org.jvnet.hudson.winstone" artifactId="winstone" version="0.9.10-hudson-9" type="jar" tofile="${basedir}/target/generated-resources/winstone.jar" />

                <!-- bundled plugins -->
-                <resolveArtifact groupId="${project.groupId}" artifactId="maven-plugin" version="${project.version}" type="hpi"
-                                 tofile="${basedir}/target/generated-resources/WEB-INF/plugins/maven-plugin.hpi" />
-                <resolveArtifact groupId="org.jvnet.hudson.plugins" artifactId="ssh-slaves" version="0.4" type="hpi"
-                                 tofile="${basedir}/target/generated-resources/WEB-INF/plugins/ssh-slaves.hpi" />
+                <resolveArtifact groupId="${project.groupId}" artifactId="maven-plugin" version="${project.version}" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/maven-plugin.hpi" />
+                <resolveArtifact groupId="org.jvnet.hudson.plugins" artifactId="ssh-slaves" version="0.4" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/ssh-slaves.hpi" />
              </tasks>
            </configuration>
          </execution>