OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-10-26 19:15:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 19167-19168,19178,19183-19187,19190,19193-19194,19207,19209,19223,19236,19248,19254,19257,19338 via svnmerge from

Browse Source 
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
This commit is contained in:
kohsuke committed 2009-07-02 04:17:46 +00:00
1 parent e950c0e93c
commit dd808e1f1e
15 files changed
+32 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cli/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>pom</artifactId>
<groupId>org.jvnet.hudson.main</groupId>
<version>1.313-SNAPSHOT</version>
<version>1.314-SNAPSHOT</version>
</parent>
<artifactId>cli</artifactId>
<name>Hudson CLI</name>
core/pom.xml
+1 -1
View File
@@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.313-SNAPSHOT</version>
<version>1.314-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
core/src/main/java/hudson/model/Run.java
+9
View File
@@ -581,6 +581,15 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
public String getId() {
return ID_FORMATTER.get().format(new Date(timestamp));
}
/**
* Get the date formatter used to convert the directory name in to a timestamp
* This is nasty exposure of private data, but needed all the time the directory
* containing the build is used as it's timestamp.
*/
public static DateFormat getIDFormatter() {
return ID_FORMATTER.get();
}
public Descriptor getDescriptorByName(String className) {
return Hudson.getInstance().getDescriptorByName(className);
core/src/main/resources/lib/hudson/queue.jelly
+4 -3
View File
@@ -65,9 +65,10 @@ THE SOFTWARE.
${item.task.fullDisplayName}
</a>
<j:if test="${stuck}">
<span title="${%Starving for a free executor. Time to add more slaves!}">
&#160;<img src="${imagesURL}/${subIconSize}/hourglass.gif" />
</span>
&#160;
<a href="http://wiki.hudson-ci.org/display/HUDSON/Executor+Starvation">
<img src="${imagesURL}/16x16/hourglass.gif" />
</a>
</j:if>
</j:when>
<j:otherwise>
debian/changelog
Vendored
+6
View File
@@ -1,3 +1,9 @@
hudson (1.313) unstable; urgency=low
* See http://hudson.dev.java.net/changelog.html for more details.
-- Kohsuke Kawaguchi <kk@kohsuke.org> 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.
maven-agent/pom.xml
+1 -1
View File
@@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.313-SNAPSHOT</version>
<version>1.314-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
maven-interceptor/pom.xml
+1 -1
View File
@@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.313-SNAPSHOT</version>
<version>1.314-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
maven-plugin/pom.xml
+1 -1
View File
@@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.313-SNAPSHOT</version>
<version>1.314-SNAPSHOT</version>
</parent>
<artifactId>maven-plugin</artifactId>
pom.xml
+1 -1
View File
@@ -33,7 +33,7 @@ THE SOFTWARE.
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.313-SNAPSHOT</version>
<version>1.314-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Hudson main module</name>
push-m2-repo.rb
+4 -1
View File
@@ -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 <module> 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
end
remoting/pom.xml
+1 -1
View File
@@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.313-SNAPSHOT</version>
<version>1.314-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
test/pom.xml
+1 -1
View File
@@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<artifactId>pom</artifactId>
<groupId>org.jvnet.hudson.main</groupId>
<version>1.313-SNAPSHOT</version>
<version>1.314-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jvnet.hudson.main</groupId>
war/pom.xml
+1 -1
View File
@@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.313-SNAPSHOT</version>
<version>1.314-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
war/resources/images/16x16/hourglass.gif
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 546 B

After

Width:  |  Height:  |  Size: 1.0 KiB

war/resources/images/24x24/hourglass.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB