From d72d4023504e3273b3b65284e4255acffd30ddfc Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 21 Oct 2019 16:35:25 +0200 Subject: [PATCH] Fix issue when artifact name contains a '-'. --- .../src/org/argeo/osgi/boot/a2/FsA2Source.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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); // } -- 2.30.2