X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=org.argeo.osgi.boot%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fboot%2Fa2%2FFsA2Source.java;h=c0e721941b1a82c8385d43c7dba170b1e5b5490e;hp=6fc25c1127f98d8adf93d390b6e072d99ae15b8f;hb=d72d4023504e3273b3b65284e4255acffd30ddfc;hpb=972b68a2bccfe4ef01d27a449998bcb9d093fc3a diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java index 6fc25c112..c0e721941 100644 --- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java +++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java @@ -43,9 +43,11 @@ public class FsA2Source extends ProvisioningSource { if (!"jar".equals(ext)) continue modules; String moduleName = moduleFileName.substring(0, lastDot); - int firstDash = moduleName.indexOf('-'); - String versionStr = moduleName.substring(firstDash + 1); - String componentName = moduleName.substring(0, firstDash); + if (moduleName.endsWith("-SNAPSHOT")) + moduleName = moduleName.substring(0, moduleName.length() - "-SNAPSHOT".length()); + int lastDash = moduleName.lastIndexOf('-'); + String versionStr = moduleName.substring(lastDash + 1); + String componentName = moduleName.substring(0, lastDash); // if(versionStr.endsWith("-SNAPSHOT")) { // versionStr = readVersionFromModule(modulePath); // }