diff --git a/plugin/plugin.jelly b/plugin/plugin.jelly
index 285dd6a3..c76b4f67 100644
--- a/plugin/plugin.jelly
+++ b/plugin/plugin.jelly
@@ -119,7 +119,10 @@
     <!-- Remove SNAPSHOT -->
     <j:choose>
       <j:when test="${minRelease.endsWith('-SNAPSHOT')}">
-        <j:set var="minReleaseToHave" value="${minRelease.substring(0,minRelease.length()-9)}"/>
+        <j:invokeStatic className="org.apache.commons.lang.StringUtils" method="substringBeforeLast" var="minReleaseToHave">
+            <j:arg value="${minRelease}" type="java.lang.String"/>
+            <j:arg value="-SNAPSHOT" type="java.lang.String"/>
+        </j:invokeStatic>
       </j:when>
       <j:otherwise>
         <j:set var="minReleaseToHave" value="${minRelease}"/>
@@ -136,7 +139,10 @@
         <!-- Remove SNAPSHOT -->
         <j:choose>
           <j:when test="${installedPlugin.currentVersion.endsWith('-SNAPSHOT')}">
-            <j:set var="installedRelease" value="${installedPlugin.currentVersion.substring(0,installedPlugin.currentVersion.length()-9)}"/>
+            <j:invokeStatic className="org.apache.commons.lang.StringUtils" method="substringBeforeLast" var="installedRelease">
+                <j:arg value="${installedPlugin.currentVersion}" type="java.lang.String"/>
+                <j:arg value="-SNAPSHOT" type="java.lang.String"/>
+            </j:invokeStatic>
           </j:when>
           <j:otherwise>
             <j:set var="installedRelease" value="${installedPlugin.currentVersion}"/>