add opengrok version to the main page (#2576)

Author: tulinkry

opengrok-indexer/pom.xml

@@ -202,7 +202,7 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
                 <version>2.2.4</version>
                 <configuration>
                     <includeOnlyProperties>
-                        <includeOnlyProperty>^git.commit.id$</includeOnlyProperty>
+                        <includeOnlyProperty>^git.commit.id</includeOnlyProperty>
                     </includeOnlyProperties>
                 </configuration>
                 <executions>
@@ -257,6 +257,10 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
                                 ${project.build.outputDirectory}/org/opengrok/indexer/info.properties
                             </filesToInclude>
                             <replacements>
+                                <replacement>
+                                    <token>git.commit.id.abbrev</token>
+                                    <value>changeset_short</value>
+                                </replacement>
                                 <replacement>
                                     <token>git.commit.id</token>
                                     <value>changeset</value>

opengrok-indexer/src/main/java/org/opengrok/indexer/Info.java

@@ -37,6 +37,7 @@ public final class Info {
 
     private static final String VERSION;
     private static final String REVISION;
+    private static final String REVISION_SHORT;
 
     static {
         try (InputStream in = Info.class.getResourceAsStream("info.properties")) {
@@ -45,13 +46,15 @@ public final class Info {
             }
             VERSION = properties.getProperty("version", "unknown");
             REVISION = properties.getProperty("changeset", "unknown");
+            REVISION_SHORT = properties.getProperty("changeset_short", "unknown");
         } catch (IOException ioe) {
             throw new RuntimeException(ioe);
         }
     }
 
     /**
      * get major version
+     *
      * @return major version
      */
     public static String getVersion() {
@@ -60,6 +63,7 @@ public static String getVersion() {
 
     /**
      * get full version (product vMajor revMinor)
+     *
      * @return full version
      */
     public static String getFullVersion() {
@@ -68,12 +72,24 @@ public static String getFullVersion() {
 
     /**
      * get minor version
+     *
      * @return minor version
      */
     public static String getRevision() {
         return REVISION;
     }
 
+
+    /**
+     * get short minor version
+     *
+     * @return short minor version
+     */
+    public static String getShortRevision() {
+        return REVISION_SHORT;
+    }
+
+
     private Info() {
     }
 }

opengrok-indexer/src/main/java/org/opengrok/indexer/web/Util.java

@@ -65,7 +65,6 @@
 import javax.servlet.http.HttpServletRequest;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
-import org.opengrok.indexer.Info;
 import org.opengrok.indexer.configuration.Group;
 import org.opengrok.indexer.configuration.Project;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
@@ -372,19 +371,6 @@ private static boolean needsHtmlize(CharSequence q, boolean pre) {
         return false;
     }
 
-    private static final String versionP = htmlize(Info.getRevision());
-
-    /**
-     * used by BUI - CSS needs this parameter for proper cache refresh (per
-     * changeset) in client browser TODO jel: but useless, since the page cached
-     * anyway.
-     *
-     * @return html escaped version (hg changeset)
-     */
-    public static String versionParameter() {
-        return versionP;
-    }
-
     /**
      * Convenience method for {@code breadcrumbPath(urlPrefix, path, PATH_SEPARATOR)}.
      *

opengrok-web/src/main/webapp/foot.jspf

@@ -20,12 +20,14 @@ Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
 
 Portions Copyright 2011 Jens Elkner.
 --%><%@page import="
-java.util.EnumSet,
 java.util.Date,
+java.util.EnumSet,
 
+org.opengrok.indexer.Info,
 org.opengrok.indexer.web.PageConfig,
 org.opengrok.indexer.web.Prefix"
-%><%!
+%>
+<%!
 /* ---------------------- foot.jspf members start --------------------- */
     private static EnumSet<Prefix> needAddDiv = EnumSet.of(
         Prefix.HIST_L, Prefix.XREF_P, Prefix.DIFF_P, Prefix.MORE_P,
@@ -41,7 +43,7 @@ org.opengrok.indexer.web.Prefix"
         %>
     <div id="footer">
 <p><a href="http://opengrok.github.com/OpenGrok/"
- title="Served by OpenGrok"><span id="fti"></span></a></p>
+ title="Served by OpenGrok (<%= Info.getVersion() %> - <%= Info.getShortRevision() %>)"><span id="fti"></span></a></p>
 <% if(dateForLastIndexRun != null) { %>
 <p>Last Index update <%= dateForLastIndexRun %></p>
 <%}%>