2PackVersionWithSuffix.patch

diff -r 3637cc3297eb org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/Incremental2PackActivator.java
--- a/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/Incremental2PackActivator.java  Wed Nov 13 14:55:29 2019 +0100
+++ b/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/Incremental2PackActivator.java  Thu Nov 14 12:14:07 2019 +0100
@@ -201,6 +201,8 @@
                String p = u.getPath();
                int upos=p.lastIndexOf("2Pack_");
                int dpos=p.lastIndexOf(".");
+               if (p.indexOf("_") != p.lastIndexOf("_"))
+                       dpos=p.lastIndexOf("_");
                String v = p.substring(upos+"2Pack_".length(), dpos);
                return v;
        }
diff -r 3637cc3297eb org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/Version2PackActivator.java
--- a/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/Version2PackActivator.java      Wed Nov 13 14:55:29 2019 +0100
+++ b/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/Version2PackActivator.java      Thu Nov 14 12:14:07 2019 +0100
@@ -170,6 +170,8 @@
                String p = u.getPath();
                int upos=p.lastIndexOf("_");
                int dpos=p.lastIndexOf(".");
+               if (p.indexOf("_") != p.lastIndexOf("_"))
+                       dpos=p.lastIndexOf("_");
                String v = p.substring(upos+1, dpos);
                return v;
        }