Merge branch 'issue804' into development

clarin-eric · Jan 12, 2016 · 8fb1b03 · 8fb1b03
2 parents 67f3599 + 83aa837
commit 8fb1b03
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/vlo-web-app/pom.xml b/vlo-web-app/pom.xml
@@ -275,28 +275,27 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>com.google.code.maven-svn-revision-number-plugin</groupId>
-                <artifactId>svn-revision-number-maven-plugin</artifactId>
-                <version>1.13</version> <!-- please use the latest version -->
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>2.2.0</version>
                 <executions>
                     <execution>
                         <goals>
                             <goal>revision</goal>
-                        </goals>
+                         </goals>
                     </execution>
                 </executions>
                 <configuration>
-                    <entries>
-                        <entry>
-                            <path>${project.basedir}</path>
-                            <prefix>vlo</prefix>
-                            <depth>infinity</depth>
-                            <reportUnversioned>true</reportUnversioned>
-                            <reportIgnored>false</reportIgnored>
-                            <reportOutOfDate>false</reportOutOfDate>
-                        </entry>
-                    </entries>
+                    <dotGitDirectory>${project.parent.basedir}/.git</dotGitDirectory>
+                    <prefix>git</prefix>
+                    <dateFormat>yyyy-dd-MM HH:mm:ss z</dateFormat>
+
+                    <verbose>false</verbose>
+                    <skip>false</skip>
+
+                    <abbrevLength>7</abbrevLength>
                 </configuration>
+
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/AboutPage.html b/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/AboutPage.html
@@ -125,7 +125,7 @@ <h2>Version information</h2>
                         <td><wicket:message key="vlo.version" /></td>
                     </tr>
                     <tr>
-                        <td>SVN revision number:</td>
+                        <td>Last commit id:</td>
                         <td><wicket:message key="vlo.revision" /></td>
                     </tr>
                     <tr>

diff --git a/vlo-web-app/src/main/resources/application.properties b/vlo-web-app/src/main/resources/application.properties
@@ -16,8 +16,8 @@
 # Application properties used in the about page. Filtered through Maven
 # so that actual values are available post-build time
 vlo.version=${version}
-vlo.revision=${vlo.revision}
-vlo.changeDate=${vlo.committedDate}
+vlo.revision=${git.commit.id.abbrev}
+vlo.changeDate=${git.commit.time}
 solr.version=${solr.version}
 wicket.version=${wicket.version}
 spring.version=${spring.version}