diff --git a/xdoc/maven.xml b/xdoc/maven.xml
index 2cba226d..6e21910d 100644
--- a/xdoc/maven.xml
+++ b/xdoc/maven.xml
@@ -39,7 +39,10 @@
     <!-- Remove SNAPSHOT -->
     <j:choose>
       <j:when test="${pom.currentVersion.endsWith('-SNAPSHOT')}">
-        <j:set var="currentRelease" value="${pom.currentVersion.substring(0,pom.currentVersion.length()-9)}"/>
+        <j:invokeStatic className="org.apache.commons.lang.StringUtils" method="substringBeforeLast" var="currentRelease">
+          <j:arg value="${pom.currentVersion}" type="java.lang.String"/>
+          <j:arg value="-SNAPSHOT" type="java.lang.String"/>
+        </j:invokeStatic>
       </j:when>
       <j:otherwise>
         <j:set var="currentRelease" value="${pom.currentVersion}"/>