diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java index 4cf118e5eb..f2682e4b46 100644 --- a/core/src/main/java/hudson/WebAppMain.java +++ b/core/src/main/java/hudson/WebAppMain.java @@ -96,8 +96,9 @@ public class WebAppMain implements ServletContextListener { } catch (IOException e) { e.printStackTrace(); // if the version properties is missing, that's OK. } - Object ver = props.get("version"); + String ver = props.getProperty("version"); if(ver==null) ver="?"; + Hudson.VERSION = ver; context.setAttribute("version",ver); Trigger.init(); // start running trigger diff --git a/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java b/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java index af0735e337..ea11af7f75 100644 --- a/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java +++ b/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java @@ -8,6 +8,7 @@ import hudson.maven.MojoInfo; import hudson.maven.MavenBuild; import hudson.maven.MavenBuildProxy.BuildCallable; import hudson.model.BuildListener; +import hudson.model.Hudson; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; @@ -42,6 +43,7 @@ public class BuildInfoRecorder extends MavenReporter { Map r = new HashMap(); r.put("Hudson-Build-Number",String.valueOf(build.getNumber())); r.put("Hudson-Project",build.getParent().getParent().getName()); + r.put("Hudson-Version",Hudson.VERSION); return r; } }); diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index f8ce0a635e..5e1b9fba16 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -1531,6 +1531,11 @@ public final class Hudson extends View implements ItemGroup, Node */ private static final XStream XSTREAM = new XStream2(); + /** + * Version number of this Hudson. + */ + public static String VERSION; + static { XSTREAM.alias("hudson",Hudson.class); XSTREAM.alias("slave",Slave.class);