Revert workarounds

[cc0/argeo-build.git] / src / org / argeo / build / Repackage.java

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index ca5242e415d49bb2e767100efdaddf2594f5d679..6f5fbf83e9083b250c793fea6adabaa023bc3401 100644 (file)
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -1045,13 +1045,8 @@ public class Repackage {
                                nameVersion = new NameVersion(ourSymbolicName, ourVersion);
                        } else {
                                nameVersion = nameVersionFromManifest(manifest);
-                               if (nameVersion == null) {
-                                       logger.log(WARNING, file + " has no symbolic name, trying name/version based on its name");
-                                       // hack for weird issue with JNA jar in Eclipse
-                                       String[] arr_ = file.getFileName().toString().split("_");
-                                       String v = arr_[1].substring(0, arr_[1].length() - 4);// remove .jar
-                                       nameVersion = new NameVersion(arr_[0], v);
-                               }
+                               if (nameVersion == null)
+                                       throw new IllegalStateException("Could not compute name/version from Manifest");
                                if (ourVersion != null && !nameVersion.getVersion().equals(ourVersion)) {
                                        logger.log(WARNING,
                                                        "Original version is " + nameVersion.getVersion() + " while new version is " + ourVersion);