MID-2096 build timestamp for about page, fix for git-describe

Evolveum · Feb 25, 2016 · 80f0a44 · 80f0a44
1 parent fd6c548
commit 80f0a44
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 25 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -41,6 +41,10 @@
         <ansi.color>true</ansi.color>
         <verbose.jaxb2>false</verbose.jaxb2>
         <verbose.jaxws>false</verbose.jaxws>
+
+        <git.describe>${describe}</git.describe>
+        <timestamp>${maven.build.timestamp}</timestamp>
+        <maven.build.timestamp.format>EEE, d MMM yyyy HH:mm:ss Z</maven.build.timestamp.format>
         <!-- Dependencies global versions -->
         <aspectj.version>1.7.3</aspectj.version>
         <commons.io.version>2.0.1</commons.io.version>
@@ -1017,7 +1021,7 @@
                             <archive>
                                 <manifestEntries>
                                     <Version-Number>${project.version}</Version-Number>
-                                    <SCM-Revision>${describe}</SCM-Revision>
+                                    <SCM-Revision>${git.describe}</SCM-Revision>
                                     <Organization>Evolveum</Organization>
                                     <Organization-URL>http://www.evolveum.com</Organization-URL>
                                     <Bugtracking-System>http://jira.evolveum.com</Bugtracking-System>
@@ -1035,7 +1039,7 @@
                             <archive>
                                 <manifestEntries>
                                     <Version-Number>${project.version}</Version-Number>
-                                    <SCM-Revision>${describe}</SCM-Revision>
+                                    <SCM-Revision>${git.describe}</SCM-Revision>
                                     <Organization>Evolveum</Organization>
                                     <Organization-URL>http://www.evolveum.com</Organization-URL>
                                     <Bugtracking-System>http://jira.evolveum.com</Bugtracking-System>

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.html b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.html
@@ -37,6 +37,10 @@ <h3 class="box-title"><wicket:message key="PageAbout.title.basic"/></h3>
                                     <td><wicket:message key="PageAbout.midPointRevisionTitle" /></td>
                                     <td><span wicket:id="revision" /></td>
                                 </tr>
+                                <tr>
+                                    <td><wicket:message key="PageAbout.builtAt" /></td>
+                                    <td><span wicket:id="build" /></td>
+                                </tr>
                             </table>
                         </div>
                     </div>

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
@@ -66,6 +66,7 @@ public class PageAbout extends PageAdminConfiguration {
     private static final String OPERATION_GET_REPO_DIAG = DOT_CLASS + "getRepoDiag";
     private static final String OPERATION_GET_PROVISIONING_DIAG = DOT_CLASS + "getProvisioningDiag";
 
+    private static final String ID_BUILD = "build";
     private static final String ID_REVISION = "revision";
     private static final String ID_PROPERTY = "property";
     private static final String ID_VALUE = "value";
@@ -117,6 +118,10 @@ private void initLayout() {
         revision.setRenderBodyOnly(true);
         add(revision);
 
+        Label build = new Label(ID_BUILD, createStringResource("PageAbout.build"));
+        build.setRenderBodyOnly(true);
+        add(build);
+
         ListView<SystemItem> listSystemItems = new ListView<SystemItem>(ID_LIST_SYSTEM_ITEMS, getItems()) {
 
             @Override

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -1038,7 +1038,9 @@ PageAbout.button.testProvisioning=Provisioning self test
 PageAbout.button.testRepositoryCheckOrgClosure=Check and repair org closure consistency
 PageAbout.button.testRepository=Repository self test
 PageAbout.message.couldntObtainJvmParams=Couldn't obtain JVM parameters from JMX.
-PageAbout.midPointRevision=${describe}
+PageAbout.midPointRevision=${git.describe}
+PageAbout.builtAt=Build at
+PageAbout.build=${timestamp}
 PageAbout.midPointRevisionTitle=Git describe
 PageAbout.midPointVersion=${pom.version}
 PageAbout.midPointVersionTitle=Version
@@ -1245,7 +1247,7 @@ PageBase.button.search=Search
 PageBase.button.send=Send
 PageBase.button.update=Update
 PageBase.clearCssCache=Clear less/js cache
-pageBase.midPointVersion=${pom.version}, ${describe}
+pageBase.midPointVersion=${pom.version}, ${git.describe}
 pageBase.unknownBuildNumber=unknown
 PageBulkAction.async=Asynchronous
 PageBulkAction.button.start=Start

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
@@ -981,7 +981,7 @@ PageAbout.button.testProvisioning=Provisioning self test
 PageAbout.button.testRepositoryCheckOrgClosure=Zkontrolovat a opravit konzistenci org. struktury
 PageAbout.button.testRepository=Repository self test
 PageAbout.message.couldntObtainJvmParams=Nemohu získat parametry JVM z JMX.
-PageAbout.midPointRevision=${describe}
+PageAbout.midPointRevision=${git.describe}
 PageAbout.midPointRevisionTitle=Git popis
 PageAbout.midPointVersion=${pom.version}
 PageAbout.midPointVersionTitle=Verze
@@ -1176,7 +1176,7 @@ PageBase.button.search=Hledat
 PageBase.button.send=Odeslat
 PageBase.button.update=Aktualizovat
 PageBase.clearCssCache=Vyčistit less/js cache
-pageBase.midPointVersion=${pom.version}, ${describe}
+pageBase.midPointVersion=${pom.version}, ${git.describe}
 pageBase.unknownBuildNumber=neznámý
 PageBulkAction.async=Asynchronní
 PageBulkAction.button.start=Start

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
@@ -981,7 +981,7 @@ OriginType.RECONCILIATION=Abgleich
 # PageAbout.button.testRepositoryCheckOrgClosure=Check and repair org closure consistency
 # PageAbout.button.testRepository=Repository self test
 # PageAbout.message.couldntObtainJvmParams=Couldn't obtain JVM parameters from JMX.
-# PageAbout.midPointRevision=${describe}
+# PageAbout.midPointRevision=${git.describe}
 # PageAbout.midPointRevisionTitle=Git describe
 # PageAbout.midPointVersion=${pom.version}
 # PageAbout.midPointVersionTitle=Version
@@ -1176,7 +1176,7 @@ PageBase.button.search=Suche
 # PageBase.button.send=Send
 # PageBase.button.update=Update
 # PageBase.clearCssCache=Clear less/js cache
-# pageBase.midPointVersion=${pom.version}, ${describe}
+# pageBase.midPointVersion=${pom.version}, ${git.describe}
 # pageBase.unknownBuildNumber=unknown
 # PageBulkAction.async=Asynchronous
 # PageBulkAction.button.start=Start

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
@@ -1008,7 +1008,7 @@ PageAbout.button.testProvisioning=Provisioning self test
 PageAbout.button.testRepositoryCheckOrgClosure=Check and repair org closure consistency
 PageAbout.button.testRepository=Repository self test
 PageAbout.message.couldntObtainJvmParams=Couldn't obtain JVM parameters from JMX.
-PageAbout.midPointRevision=${describe}
+PageAbout.midPointRevision=${git.describe}
 PageAbout.midPointRevisionTitle=Git describe
 PageAbout.midPointVersion=${pom.version}
 PageAbout.midPointVersionTitle=Version
@@ -1216,7 +1216,7 @@ PageBase.button.search=Search
 PageBase.button.send=Send
 PageBase.button.update=Update
 PageBase.clearCssCache=Clear less/js cache
-pageBase.midPointVersion=${pom.version}, ${describe}
+pageBase.midPointVersion=${pom.version}, ${git.describe}
 pageBase.unknownBuildNumber=unknown
 PageBulkAction.async=Asynchronous
 PageBulkAction.button.start=Start

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
@@ -981,7 +981,7 @@
 # PageAbout.button.testRepositoryCheckOrgClosure=Check and repair org closure consistency
 # PageAbout.button.testRepository=Repository self test
 # PageAbout.message.couldntObtainJvmParams=Couldn't obtain JVM parameters from JMX.
-# PageAbout.midPointRevision=${describe}
+# PageAbout.midPointRevision=${git.describe}
 # PageAbout.midPointRevisionTitle=Git describe
 # PageAbout.midPointVersion=${pom.version}
 # PageAbout.midPointVersionTitle=Version
@@ -1176,7 +1176,7 @@
 # PageBase.button.send=Send
 # PageBase.button.update=Update
 # PageBase.clearCssCache=Clear less/js cache
-# pageBase.midPointVersion=${pom.version}, ${describe}
+# pageBase.midPointVersion=${pom.version}, ${git.describe}
 # pageBase.unknownBuildNumber=unknown
 # PageBulkAction.async=Asynchronous
 # PageBulkAction.button.start=Start

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
@@ -981,7 +981,7 @@ PageAbout.button.testProvisioning=Autocomprobación de aprovisionamiento
 # PageAbout.button.testRepositoryCheckOrgClosure=Check and repair org closure consistency
 PageAbout.button.testRepository=Autocomprobación del repositorio
 PageAbout.message.couldntObtainJvmParams=No se pudo obtener los parámetros JVM desde JMX.
-PageAbout.midPointRevision=${describe}
+PageAbout.midPointRevision=${git.describe}
 PageAbout.midPointRevisionTitle=Descripción Git
 PageAbout.midPointVersion=${pom.version}
 PageAbout.midPointVersionTitle=Versión
@@ -1176,7 +1176,7 @@ PageBase.button.search=Search
 PageBase.button.send=Enviar
 PageBase.button.update=Update
 PageBase.clearCssCache=Limpiar el cache less/js
-# pageBase.midPointVersion=${pom.version}, ${describe}
+# pageBase.midPointVersion=${pom.version}, ${git.describe}
 pageBase.unknownBuildNumber=unknown
 PageBulkAction.async=Asíncrono
 PageBulkAction.button.start=Iniciar

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
@@ -981,7 +981,7 @@
 # PageAbout.button.testRepositoryCheckOrgClosure=Check and repair org closure consistency
 # PageAbout.button.testRepository=Repository self test
 # PageAbout.message.couldntObtainJvmParams=Couldn't obtain JVM parameters from JMX.
-# PageAbout.midPointRevision=${describe}
+# PageAbout.midPointRevision=${git.describe}
 # PageAbout.midPointRevisionTitle=Git describe
 # PageAbout.midPointVersion=${pom.version}
 # PageAbout.midPointVersionTitle=Version
@@ -1176,7 +1176,7 @@
 # PageBase.button.send=Send
 # PageBase.button.update=Update
 # PageBase.clearCssCache=Clear less/js cache
-# pageBase.midPointVersion=${pom.version}, ${describe}
+# pageBase.midPointVersion=${pom.version}, ${git.describe}
 # pageBase.unknownBuildNumber=unknown
 # PageBulkAction.async=Asynchronous
 # PageBulkAction.button.start=Start

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
@@ -981,7 +981,7 @@
 # PageAbout.button.testRepositoryCheckOrgClosure=Check and repair org closure consistency
 # PageAbout.button.testRepository=Repository self test
 # PageAbout.message.couldntObtainJvmParams=Couldn't obtain JVM parameters from JMX.
-# PageAbout.midPointRevision=${describe}
+# PageAbout.midPointRevision=${git.describe}
 # PageAbout.midPointRevisionTitle=Git describe
 # PageAbout.midPointVersion=${pom.version}
 # PageAbout.midPointVersionTitle=Version
@@ -1176,7 +1176,7 @@
 # PageBase.button.send=Send
 # PageBase.button.update=Update
 # PageBase.clearCssCache=Clear less/js cache
-# pageBase.midPointVersion=${pom.version}, ${describe}
+# pageBase.midPointVersion=${pom.version}, ${git.describe}
 # pageBase.unknownBuildNumber=unknown
 # PageBulkAction.async=Asynchronous
 # PageBulkAction.button.start=Start

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
@@ -981,7 +981,7 @@ PageAbout.button.testProvisioning=Auto - test provizií
 PageAbout.button.testRepositoryCheckOrgClosure=Skontrolovať a opraviť konzistenciu
 PageAbout.button.testRepository=Auto - test repozitára
 PageAbout.message.couldntObtainJvmParams=Nebolo možné získať JVM parametre z JMX.
-PageAbout.midPointRevision=${describe}
+PageAbout.midPointRevision=${git.describe}
 PageAbout.midPointRevisionTitle=Git popis
 PageAbout.midPointVersion=${pom.version}
 PageAbout.midPointVersionTitle=Verzia
@@ -1176,7 +1176,7 @@ PageBase.button.search=Vyhľadať
 PageBase.button.send=Poslať
 PageBase.button.update=Aktualizovať
 PageBase.clearCssCache=Vyčistiť js cache
-pageBase.midPointVersion=Verzia\: ${pom.version}, ${describe}
+pageBase.midPointVersion=Verzia\: ${pom.version}, ${git.describe}
 pageBase.unknownBuildNumber=neznáme
 PageBulkAction.async=Asynchrónny
 PageBulkAction.button.start=Štart

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
@@ -981,7 +981,7 @@ PageAbout.button.testProvisioning=Provizyonlama testi
 # PageAbout.button.testRepositoryCheckOrgClosure=Check and repair org closure consistency
 PageAbout.button.testRepository=Depo testi
 PageAbout.message.couldntObtainJvmParams=JMX'ten JVM parametreleri alınamadı.
-PageAbout.midPointRevision=${describe}
+PageAbout.midPointRevision=${git.describe}
 PageAbout.midPointRevisionTitle=Git açıklaması
 PageAbout.midPointVersion=${pom.version}
 PageAbout.midPointVersionTitle=Versiyon
@@ -1176,7 +1176,7 @@ PageBase.button.search=Ara
 PageBase.button.send=Gönder
 PageBase.button.update=Güncelle
 PageBase.clearCssCache=less/js önbellegini temizle
-pageBase.midPointVersion=Versiyon\: ${pom.version}, ${describe}
+pageBase.midPointVersion=Versiyon\: ${pom.version}, ${git.describe}
 pageBase.unknownBuildNumber=bilinmeyen
 # PageBulkAction.async=Asynchronous
 PageBulkAction.button.start=Başlat

diff --git a/icf-connectors/dummy-connector-fake/pom.xml b/icf-connectors/dummy-connector-fake/pom.xml
@@ -56,7 +56,7 @@
 					<archive>
 						<manifestEntries>
 							<Version-Number>${project.version}</Version-Number>
-							<SCM-Revision>${describe}</SCM-Revision>
+							<SCM-Revision>${git.describe}</SCM-Revision>
 							<Organization>Evolveum</Organization>
 							<Organization-URL>http://www.evolveum.com</Organization-URL>
 							<Bugtracking-System>http://jira.evolveum.com</Bugtracking-System>

diff --git a/icf-connectors/dummy-connector/pom.xml b/icf-connectors/dummy-connector/pom.xml
@@ -61,7 +61,7 @@
 					<archive>
 						<manifestEntries>
 							<Version-Number>${project.version}</Version-Number>
-							<SCM-Revision>${describe}</SCM-Revision>
+							<SCM-Revision>${git.describe}</SCM-Revision>
 							<Organization>Evolveum</Organization>
 							<Organization-URL>http://www.evolveum.com</Organization-URL>
 							<Bugtracking-System>http://jira.evolveum.com</Bugtracking-System>

diff --git a/repo/system-init/src/main/resources/midpoint.info b/repo/system-init/src/main/resources/midpoint.info
@@ -1,5 +1,5 @@
 midpoint.version=${project.version}
-midpoint.build=${describe}
+midpoint.build=${git.describe}
 midpoint.branch=${scmBranch}
 midpoint.timestamp=${timestamp}
 midpoint.scm=${project.scm.connection}